diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37a2e2fa..b70f9c21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,10 +107,10 @@ stages: # 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: @@ -122,10 +122,10 @@ stages: # 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: @@ -231,9 +231,9 @@ docker_centos-8-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: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:fedora-30-amd64 # build-fedora-31-amd64: # <<: *build-linux @@ -243,9 +243,9 @@ docker_centos-8-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 @@ -279,20 +279,20 @@ build-centos-8-amd64: # - freebsd # - i386 -build-birdlab: - stage: build - tags: - - birdlab - - amd64 - script: - - DIR=$(pwd) - - autoreconf - - ./configure - - make - - cd $TOOLS_DIR - - sudo git clean -fx - - git pull --ff-only - - mv $DIR/bird $DIR/birdc netlab/common +# build-birdlab: +# stage: build +# tags: +# - birdlab +# - amd64 +# script: +# - DIR=$(pwd) +# - autoreconf +# - ./configure +# - make +# - cd $TOOLS_DIR +# - sudo git clean -fx +# - git pull --ff-only +# - mv $DIR/bird $DIR/birdc netlab/common # .test: &test-base