From bdba98a7e003dc87e2cc833ba66a9cc4d0018b6b Mon Sep 17 00:00:00 2001 From: Matous Holinka Date: Tue, 19 Nov 2019 13:37:07 +0100 Subject: [PATCH] bird: all the lastest versions are active --- .gitlab-ci.yml | 230 +++++++++++++++++++++++++++---------------------- 1 file changed, 128 insertions(+), 102 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b39762c..01222753 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,15 +46,15 @@ stages: # IMG_NAME: "debian-9-amd64" # <<: *docker_build -# docker_debian-10-amd64: -# variables: -# IMG_NAME: "debian-10-amd64" -# <<: *docker_build +docker_debian-10-amd64: + variables: + IMG_NAME: "debian-10-amd64" + <<: *docker_build -# docker_debian-testing-amd64: -# variables: -# IMG_NAME: "debian-testing-amd64" -# <<: *docker_build +docker_debian-testing-amd64: + variables: + IMG_NAME: "debian-testing-amd64" + <<: *docker_build # docker_debian-7-i386: # variables: @@ -71,45 +71,45 @@ stages: # IMG_NAME: "debian-9-i386" # <<: *docker_build -# docker_debian-10-i386: +docker_debian-10-i386: + variables: + IMG_NAME: "debian-10-i386" + <<: *docker_build + +docker_debian-testing-i386: + variables: + IMG_NAME: "debian-testing-i386" + <<: *docker_build + +# docker_fedora-25-amd64: # variables: -# IMG_NAME: "debian-10-i386" +# IMG_NAME: "fedora-25-amd64" # <<: *docker_build -# docker_debian-testing-i386: +# docker_fedora-26-amd64: # variables: -# IMG_NAME: "debian-testing-i386" +# IMG_NAME: "fedora-26-amd64" # <<: *docker_build -# -docker_fedora-25-amd64: - variables: - IMG_NAME: "fedora-25-amd64" - <<: *docker_build -docker_fedora-26-amd64: - variables: - IMG_NAME: "fedora-26-amd64" - <<: *docker_build +# docker_fedora-27-amd64: +# variables: +# IMG_NAME: "fedora-27-amd64" +# <<: *docker_build -docker_fedora-27-amd64: - variables: - IMG_NAME: "fedora-27-amd64" - <<: *docker_build +# docker_fedora-28-amd64: +# variables: +# IMG_NAME: "fedora-28-amd64" +# <<: *docker_build -docker_fedora-28-amd64: - variables: - IMG_NAME: "fedora-28-amd64" - <<: *docker_build +# docker_fedora-29-amd64: +# variables: +# IMG_NAME: "fedora-29-amd64" +# <<: *docker_build -docker_fedora-29-amd64: - variables: - IMG_NAME: "fedora-29-amd64" - <<: *docker_build - -docker_fedora-30-amd64: - variables: - IMG_NAME: "fedora-30-amd64" - <<: *docker_build +# docker_fedora-30-amd64: +# variables: +# IMG_NAME: "fedora-30-amd64" +# <<: *docker_build docker_fedora-31-amd64: variables: @@ -121,40 +121,54 @@ docker_fedora-31-amd64: # IMG_NAME: "centos-7-amd64" # <<: *docker_build -# docker_centos-8-amd64: -# variables: -# IMG_NAME: "centos-8-amd64" -# <<: *docker_build +docker_centos-8-amd64: + variables: + IMG_NAME: "centos-8-amd64" + <<: *docker_build -# docker_opensuse-42_3-amd64: -# variables: -# IMG_NAME: "opensuse-42.3-amd64" -# <<: *docker_build +docker_opensuse-42_3-amd64: + variables: + IMG_NAME: "opensuse-42.3-amd64" + <<: *docker_build # docker_ubuntu-14_04-amd64: # variables: # IMG_NAME: "ubuntu-14.04-amd64" # <<: *docker_build - + # docker_ubuntu-16_04-amd64: # variables: # IMG_NAME: "ubuntu-16.04-amd64" # <<: *docker_build - + # docker_ubuntu-18_04-amd64: # variables: # IMG_NAME: "ubuntu-18.04-amd64" # <<: *docker_build + +docker_ubuntu-19_04-amd64: + variables: + IMG_NAME: "ubuntu-19.04-amd64" + <<: *docker_build -# docker_ubuntu-19_04-amd64: -# variables: -# IMG_NAME: "ubuntu-19.04-amd64" -# <<: *docker_build +# 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 + tags: + - freebsd + - i386 + #only: + #- master + #- triggers + #- tags + +.freebsd-11-amd64: &freebsd-11-amd64_env + tags: + - freebsd + - amd64 .build: &build-base stage: build script: - - dnf -y install make - autoreconf - ./configure CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" # Detect which make is available @@ -164,6 +178,11 @@ docker_fedora-31-amd64: # Run tests if they are available - $MAKE check +.build: &preprocessing-fedora + stage: build + script: + - dnf -y install make + .build-linux: &build-linux <<: *build-base tags: @@ -195,47 +214,54 @@ docker_fedora-31-amd64: # <<: *build-linux # image: registry.labs.nic.cz/labs/bird:debian-9-i386 -# build-debian-10-amd64: +build-debian-10-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-10-amd64 + +build-debian-10-i386: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-10-i386 + +build-debian-testing-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-testing-amd64 + +build-debian-testing-i386: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-testing-i386 + +# build-fedora-25-amd64: +# <<: *preprocessing-fedora # <<: *build-linux -# image: registry.labs.nic.cz/labs/bird:debian-10-amd64 +# image: registry.labs.nic.cz/labs/bird:fedora-25-amd64 -# build-debian-10-i386: +# build-fedora-26-amd64: +# <<: *preprocessing-fedora # <<: *build-linux -# image: registry.labs.nic.cz/labs/bird:debian-10-i386 +# image: registry.labs.nic.cz/labs/bird:fedora-26-amd64 -# build-debian-testing-amd64: +# build-fedora-27-amd64: +# <<: *preprocessing-fedora # <<: *build-linux -# image: registry.labs.nic.cz/labs/bird:debian-testing-amd64 +# image: registry.labs.nic.cz/labs/bird:fedora-27-amd64 -# build-debian-testing-i386: +# build-fedora-28-amd64: +# <<: *preprocessing-fedora # <<: *build-linux -# image: registry.labs.nic.cz/labs/bird:debian-testing-i386 +# image: registry.labs.nic.cz/labs/bird:fedora-28-amd64 -build-fedora-25-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:fedora-25-amd64 +# build-fedora-29-amd64: +# <<: *preprocessing-fedora +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:fedora-29-amd64 -build-fedora-26-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:fedora-26-amd64 - -build-fedora-27-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:fedora-27-amd64 - -build-fedora-28-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:fedora-28-amd64 - -build-fedora-29-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:fedora-29-amd64 - -build-fedora-30-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:fedora-30-amd64 +# build-fedora-30-amd64: +# <<: *preprocessing-fedora +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:fedora-30-amd64 build-fedora-31-amd64: + <<: *preprocessing-fedora <<: *build-linux image: registry.labs.nic.cz/labs/bird:fedora-31-amd64 @@ -243,13 +269,13 @@ build-fedora-31-amd64: # <<: *build-linux # image: registry.labs.nic.cz/labs/bird:centos-7-amd64 -# build-centos-8-amd64: -# <<: *build-linux -# image: registry.labs.nic.cz/labs/bird:centos-8-amd64 +build-centos-8-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:centos-8-amd64 - # build-opensuse-42_3-amd64: -# <<: *build-linux -# image: registry.labs.nic.cz/labs/bird:opensuse-42.3-amd64 + build-opensuse-42_3-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:opensuse-42.3-amd64 # build-ubuntu-14_04-amd64: # <<: *build-linux @@ -263,21 +289,21 @@ build-fedora-31-amd64: # <<: *build-linux # image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64 -# build-ubuntu-19_04-amd64: -# <<: *build-linux -# image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64 +build-ubuntu-19_04-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64 -# build-freebsd-11-amd64: -# <<: *build-base -# tags: -# - freebsd -# - amd64 +build-freebsd-11-amd64: + <<: *build-base + tags: + - freebsd + - amd64 -# build-freebsd-11-i386: -# <<: *build-base -# tags: -# - freebsd -# - i386 +build-freebsd-11-i386: + <<: *build-base + tags: + - freebsd + - i386 # build-birdlab: # stage: build