Commit 0adfa0ec authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

CI: Cleanup of job templates 

Env templates were used for separate IPv4/IPv6 build, that is no longer
needed.
parent 6a314d26

.gitlab-ci.yml

+55 −159
Original line number Original line Diff line number Diff line
@@ -101,124 +101,8 @@ docker_ubuntu-16_04-amd64: 
    IMG_NAME: "ubuntu-16.04-amd64"

    IMG_NAME: "ubuntu-16.04-amd64"

  <<: *docker_build

  <<: *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

.build: &build-base

  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: &centos-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

  stage: build

  stage: build

  script:

  script:

  - autoreconf

  - autoreconf
@@ -230,69 +114,80 @@ docker_ubuntu-16_04-amd64: 
  # Run tests if they are available

  # Run tests if they are available

  - $MAKE check

  - $MAKE check





.build-linux: &build-linux

  <<: *build-base

  tags:

    - docker

    - linux

    - amd64



build-debian-7-amd64:

build-debian-7-amd64:

  <<: *debian-7-amd64_env

  <<: *build-linux

  <<: *build_job

  image: registry.labs.nic.cz/labs/bird:debian-7-amd64



build-debian-7-i386:

  <<: *build-linux

  image: registry.labs.nic.cz/labs/bird:debian-7-i386





build-debian-8-amd64:

build-debian-8-amd64:

  <<: *debian-8-amd64_env

  <<: *build-linux

  <<: *build_job

  image: registry.labs.nic.cz/labs/bird:debian-8-amd64



build-debian-8-i386:

  <<: *build-linux

  image: registry.labs.nic.cz/labs/bird:debian-8-i386





build-debian-9-amd64:

build-debian-9-amd64:

  <<: *debian-9-amd64_env

  <<: *build-linux

  <<: *build_job

  image: registry.labs.nic.cz/labs/bird:debian-9-amd64



build-debian-9-i386:

  <<: *build-linux

  image: registry.labs.nic.cz/labs/bird:debian-9-i386





build-debian-testing-amd64:

build-debian-testing-amd64:

  <<: *debian-testing-amd64_env

  <<: *build-linux

  <<: *build_job

  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:

build-fedora-25-amd64:

  <<: *fedora-25-amd64_env

  <<: *build-linux

  <<: *build_job

  image: registry.labs.nic.cz/labs/bird:fedora-25-amd64





build-fedora-26-amd64:

build-fedora-26-amd64:

  <<: *fedora-26-amd64_env

  <<: *build-linux

  <<: *build_job

  image: registry.labs.nic.cz/labs/bird:fedora-26-amd64





build-centos-7-amd64:

build-centos-7-amd64:

  <<: *centos-7-amd64_env

  <<: *build-linux

  <<: *build_job

  image: registry.labs.nic.cz/labs/bird:centos-7-amd64





build-opensuse-42_3-amd64:

build-opensuse-42_3-amd64:

  <<: *opensuse-42_3-amd64_env

  <<: *build-linux

  <<: *build_job

  image: registry.labs.nic.cz/labs/bird:opensuse-42.3-amd64





build-ubuntu-14_04-amd64:

build-ubuntu-14_04-amd64:

  <<: *ubuntu-14_04-amd64_env

  <<: *build-linux

  <<: *build_job

  image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64





build-ubuntu-16_04-amd64:

build-ubuntu-16_04-amd64:

  <<: *ubuntu-16_04-amd64_env

  <<: *build-linux

  <<: *build_job

  image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64



build-debian-7-i386:

  <<: *debian-7-i386_env

  <<: *build_job



build-debian-8-i386:

  <<: *debian-8-i386_env

  <<: *build_job



build-debian-9-i386:

  <<: *debian-9-i386_env

  <<: *build_job



build-debian-testing-i386:

  <<: *debian-testing-i386_env

  <<: *build_job





build-freebsd-11-amd64:

build-freebsd-11-amd64:

  <<: *freebsd-11-amd64_env

  <<: *build-base

  <<: *build_job

  tags:

    - freebsd

    - amd64





build-freebsd-11-i386:

build-freebsd-11-i386:

  <<: *freebsd-11-i386_env

  <<: *build-base

  <<: *build_job

  tags:

    - freebsd

    - i386





build-birdlab:

build-birdlab:

  stage: build

  stage: build
@@ -309,7 +204,8 @@ build-birdlab: 
    - git pull --ff-only

    - git pull --ff-only

    - mv $DIR/bird $DIR/birdc netlab/common

    - mv $DIR/bird $DIR/birdc netlab/common





.test: &test_job



.test: &test-base

  stage: test

  stage: test

  needs: [build-birdlab]

  needs: [build-birdlab]

  tags:

  tags:
@@ -320,6 +216,6 @@ build-birdlab: 
    - sudo ./runtest -m check $TEST_NAME

    - sudo ./runtest -m check $TEST_NAME





test-ospf:

test-ospf:

  <<: *test-base

  variables:

  variables:

    TEST_NAME: cf-ospf
 
    TEST_NAME: cf-ospf
 
  <<: *test_job

CRA Git | Maintained and supported by SUSTech CRA and CCSE