Lib: Improve printf() tests

[thirdparty/bird.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9863a1c257324210bede458705e97041ebb13ed..ff11dda083946de41edd62d1190d6ee64b5c5670 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -211,9 +211,6 @@ docker_ubuntu-16_04-amd64:
 
 # TODO We want to copy these BSDs to our own virtual machines, to make sure someone doesn't update them by accident.
 .freebsd-11-i386: &freebsd-11-i386_env
-  variables:
-    CPPFLAGS: "-I/usr/local/include"
-    LDFLAGS: "-L/usr/local/lib"
   tags:
   - freebsd
   - i386
@@ -223,9 +220,6 @@ docker_ubuntu-16_04-amd64:
   #- tags
 
 .freebsd-11-amd64: &freebsd-11-amd64_env
-  variables:
-    CPPFLAGS: "-I/usr/local/include"
-    LDFLAGS: "-L/usr/local/lib"
   tags:
   - freebsd
   - amd64
@@ -238,214 +232,78 @@ docker_ubuntu-16_04-amd64:
   stage: build
   script:
   - autoreconf
-  - ./configure --enable-ipv6=$IPV6 CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
+  - ./configure CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
   # Detect which make is available
   - MAKE=make
   - which gmake 2>/dev/null >/dev/null && MAKE=gmake
   - $MAKE
-  # Run tests if they are available (eg. don't fail if "check" isn't a valid make target)
-  - $MAKE check || [ "$?" = 2 ]
+  # Run tests if they are available
+  - $MAKE check
 
 build-debian-7-amd64:
-  variables:
-    IPV6: "no"
   <<: *debian-7-amd64_env
   <<: *build_job
 
 build-debian-8-amd64:
-  variables:
-    IPV6: "no"
   <<: *debian-8-amd64_env
   <<: *build_job
 
 build-debian-9-amd64:
-  variables:
-    IPV6: "no"
   <<: *debian-9-amd64_env
   <<: *build_job
 
 build-debian-testing-amd64:
-  variables:
-    IPV6: "no"
-  <<: *debian-testing-amd64_env
-  <<: *build_job
-
-build-debian-7-amd64-v6:
-  variables:
-    IPV6: "yes"
-  <<: *debian-7-amd64_env
-  <<: *build_job
-
-build-debian-8-amd64-v6:
-  variables:
-    IPV6: "yes"
-  <<: *debian-8-amd64_env
-  <<: *build_job
-
-build-debian-9-amd64-v6:
-  variables:
-    IPV6: "yes"
-  <<: *debian-9-amd64_env
-  <<: *build_job
-
-build-debian-testing-amd64-v6:
-  variables:
-    IPV6: "yes"
   <<: *debian-testing-amd64_env
   <<: *build_job
 
 build-fedora-25-amd64:
-  variables:
-    IPV6: "no"
-  <<: *fedora-25-amd64_env
-  <<: *build_job
-
-build-fedora-25-amd64-v6:
-  variables:
-    IPV6: "yes"
   <<: *fedora-25-amd64_env
   <<: *build_job
 
 build-fedora-26-amd64:
-  variables:
-    IPV6: "no"
-  <<: *fedora-26-amd64_env
-  <<: *build_job
-
-build-fedora-26-amd64-v6:
-  variables:
-    IPV6: "yes"
   <<: *fedora-26-amd64_env
   <<: *build_job
 
 build-centos-6-amd64:
-  variables:
-    IPV6: "no"
-  <<: *centos-6-amd64_env
-  <<: *build_job
-
-build-centos-6-amd64-v6:
-  variables:
-    IPV6: "yes"
   <<: *centos-6-amd64_env
   <<: *build_job
 
 build-centos-7-amd64:
-  variables:
-    IPV6: "no"
-  <<: *centos-7-amd64_env
-  <<: *build_job
-
-build-centos-7-amd64-v6:
-  variables:
-    IPV6: "yes"
   <<: *centos-7-amd64_env
   <<: *build_job
 
 build-opensuse-42_3-amd64:
-  variables:
-    IPV6: "no"
-  <<: *opensuse-42_3-amd64_env
-  <<: *build_job
-
-build-opensuse-42_3-amd64-v6:
-  variables:
-    IPV6: "yes"
   <<: *opensuse-42_3-amd64_env
   <<: *build_job
 
 build-ubuntu-14_04-amd64:
-  variables:
-    IPV6: "no"
-  <<: *ubuntu-14_04-amd64_env
-  <<: *build_job
-
-build-ubuntu-14_04-amd64-v6:
-  variables:
-    IPV6: "yes"
   <<: *ubuntu-14_04-amd64_env
   <<: *build_job
 
 build-ubuntu-16_04-amd64:
-  variables:
-    IPV6: "no"
-  <<: *ubuntu-16_04-amd64_env
-  <<: *build_job
-
-build-ubuntu-16_04-amd64-v6:
-  variables:
-    IPV6: "yes"
   <<: *ubuntu-16_04-amd64_env
   <<: *build_job
 
 build-debian-7-i386:
-  variables:
-    IPV6: "no"
-  <<: *debian-7-i386_env
-  <<: *build_job
-
-build-debian-7-i386-v6:
-  variables:
-    IPV6: "yes"
   <<: *debian-7-i386_env
   <<: *build_job
 
 build-debian-8-i386:
-  variables:
-    IPV6: "no"
-  <<: *debian-8-i386_env
-  <<: *build_job
-
-build-debian-8-i386-v6:
-  variables:
-    IPV6: "yes"
   <<: *debian-8-i386_env
   <<: *build_job
 
 build-debian-9-i386:
-  variables:
-    IPV6: "no"
-  <<: *debian-9-i386_env
-  <<: *build_job
-
-build-debian-9-i386-v6:
-  variables:
-    IPV6: "yes"
   <<: *debian-9-i386_env
   <<: *build_job
 
 build-debian-testing-i386:
-  variables:
-    IPV6: "no"
-  <<: *debian-testing-i386_env
-  <<: *build_job
-
-build-debian-testing-i386-v6:
-  variables:
-    IPV6: "yes"
   <<: *debian-testing-i386_env
   <<: *build_job
 
 build-freebsd-11-amd64:
-  variables:
-    IPV6: "no"
-  <<: *freebsd-11-amd64_env
-  <<: *build_job
-
-build-freebsd-11-amd64-v6:
-  variables:
-    IPV6: "yes"
   <<: *freebsd-11-amd64_env
   <<: *build_job
 
 build-freebsd-11-i386:
-  variables:
-    IPV6: "no"
-  <<: *freebsd-11-i386_env
-  <<: *build_job
-
-build-freebsd-i386-v6:
-  variables:
-    IPV6: "yes"
   <<: *freebsd-11-i386_env
   <<: *build_job