From 0adfa0ec076196275a3cf034ba3ce82ffbcd2fbd Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Mon, 11 Nov 2019 00:24:07 +0100 Subject: [PATCH] CI: Cleanup of job templates Env templates were used for separate IPv4/IPv6 build, that is no longer needed. --- .gitlab-ci.yml | 234 ++++++++++++++----------------------------------- 1 file changed, 65 insertions(+), 169 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81e8d14e..41106974 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,124 +101,8 @@ docker_ubuntu-16_04-amd64: IMG_NAME: "ubuntu-16.04-amd64" <<: *docker_build -.debian-7-i386: &debian-7-i386_env - image: registry.labs.nic.cz/labs/bird:debian-7-i386 - tags: - - docker - - linux - - amd64 -.debian-8-i386: &debian-8-i386_env - image: registry.labs.nic.cz/labs/bird:debian-8-i386 - tags: - - docker - - linux - - amd64 - -.debian-9-i386: &debian-9-i386_env - image: registry.labs.nic.cz/labs/bird:debian-9-i386 - tags: - - docker - - linux - - amd64 - -.debian-testing-i386: &debian-testing-i386_env - image: registry.labs.nic.cz/labs/bird:debian-testing-i386 - tags: - - docker - - linux - - amd64 - -.debian-7-amd64: &debian-7-amd64_env - image: registry.labs.nic.cz/labs/bird:debian-7-amd64 - tags: - - docker - - linux - - amd64 - -.debian-8-amd64: &debian-8-amd64_env - image: registry.labs.nic.cz/labs/bird:debian-8-amd64 - tags: - - docker - - linux - - amd64 - -.debian-9-amd64: &debian-9-amd64_env - image: registry.labs.nic.cz/labs/bird:debian-9-amd64 - tags: - - docker - - linux - - amd64 - -.debian-testing-amd64: &debian-testing-amd64_env - image: registry.labs.nic.cz/labs/bird:debian-testing-amd64 - tags: - - docker - - linux - - amd64 - -.fedora-25-amd64: &fedora-25-amd64_env - image: registry.labs.nic.cz/labs/bird:fedora-25-amd64 - tags: - - docker - - linux - - amd64 - -.fedora-26-amd64: &fedora-26-amd64_env - image: registry.labs.nic.cz/labs/bird:fedora-26-amd64 - tags: - - docker - - linux - - amd64 - -.centos-7-amd64: ¢os-7-amd64_env - image: registry.labs.nic.cz/labs/bird:centos-7-amd64 - tags: - - docker - - linux - - amd64 - -.opensuse-42_3-amd64: &opensuse-42_3-amd64_env - image: registry.labs.nic.cz/labs/bird:opensuse-42.3-amd64 - tags: - - docker - - linux - - amd64 - -.ubuntu-14_04-amd64: &ubuntu-14_04-amd64_env - image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64 - tags: - - docker - - linux - - amd64 - -.ubuntu-16_04-amd64: &ubuntu-16_04-amd64_env - image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64 - tags: - - docker - - linux - - 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 - tags: - - freebsd - - i386 - #only: - #- master - #- triggers - #- tags - -.freebsd-11-amd64: &freebsd-11-amd64_env - tags: - - freebsd - - amd64 - #only: - #- master - #- triggers - #- tags - -.build: &build_job +.build: &build-base stage: build script: - autoreconf @@ -230,69 +114,80 @@ docker_ubuntu-16_04-amd64: # Run tests if they are available - $MAKE check +.build-linux: &build-linux + <<: *build-base + tags: + - docker + - linux + - amd64 + build-debian-7-amd64: - <<: *debian-7-amd64_env - <<: *build_job - -build-debian-8-amd64: - <<: *debian-8-amd64_env - <<: *build_job - -build-debian-9-amd64: - <<: *debian-9-amd64_env - <<: *build_job - -build-debian-testing-amd64: - <<: *debian-testing-amd64_env - <<: *build_job - -build-fedora-25-amd64: - <<: *fedora-25-amd64_env - <<: *build_job - -build-fedora-26-amd64: - <<: *fedora-26-amd64_env - <<: *build_job - -build-centos-7-amd64: - <<: *centos-7-amd64_env - <<: *build_job - -build-opensuse-42_3-amd64: - <<: *opensuse-42_3-amd64_env - <<: *build_job - -build-ubuntu-14_04-amd64: - <<: *ubuntu-14_04-amd64_env - <<: *build_job - -build-ubuntu-16_04-amd64: - <<: *ubuntu-16_04-amd64_env - <<: *build_job + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-7-amd64 build-debian-7-i386: - <<: *debian-7-i386_env - <<: *build_job + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-7-i386 + +build-debian-8-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-8-amd64 build-debian-8-i386: - <<: *debian-8-i386_env - <<: *build_job + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-8-i386 + +build-debian-9-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-9-amd64 build-debian-9-i386: - <<: *debian-9-i386_env - <<: *build_job + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-9-i386 + +build-debian-testing-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-testing-amd64 build-debian-testing-i386: - <<: *debian-testing-i386_env - <<: *build_job + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-testing-i386 + +build-fedora-25-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:fedora-25-amd64 + +build-fedora-26-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:fedora-26-amd64 + +build-centos-7-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:centos-7-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 + image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64 + +build-ubuntu-16_04-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64 build-freebsd-11-amd64: - <<: *freebsd-11-amd64_env - <<: *build_job + <<: *build-base + tags: + - freebsd + - amd64 build-freebsd-11-i386: - <<: *freebsd-11-i386_env - <<: *build_job + <<: *build-base + tags: + - freebsd + - i386 build-birdlab: stage: build @@ -309,7 +204,8 @@ build-birdlab: - git pull --ff-only - mv $DIR/bird $DIR/birdc netlab/common -.test: &test_job + +.test: &test-base stage: test needs: [build-birdlab] tags: @@ -320,6 +216,6 @@ build-birdlab: - sudo ./runtest -m check $TEST_NAME test-ospf: + <<: *test-base variables: TEST_NAME: cf-ospf - <<: *test_job