From bca12fb81bb168a432c6f63f0e8c42a61265efc1 Mon Sep 17 00:00:00 2001 From: Matous Holinka Date: Wed, 6 Nov 2019 08:50:48 +0100 Subject: [PATCH] bird: .gitlab-ci.yml was modified. Third stage was added --- .gitlab-ci.yml | 470 ++++++++++++++++++++++++------------------------- 1 file changed, 226 insertions(+), 244 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b502155e..96449334 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,218 +6,216 @@ variables: IMG_BASE: registry.labs.nic.cz/labs/bird stages: - - image +# - image - build - netlab_prep - - runtest - - cleanup -.docker: &docker_build - stage: image - allow_failure: true - script: - - $DOCKER_CMD login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz - # Make sure we refresh the base image if it updates (eg. security updates, etc) - # If we do just the build, cache is always reused and the freshness of the - # base image is never checked. However, pull always asks and updates the - # image only if it changed ‒ therefore, the cache is used unless there's a - # change. - - $DOCKER_CMD pull `sed -ne 's/^FROM //p' "misc/docker/$IMG_NAME/Dockerfile"` - - $DOCKER_CMD build -t "bird:$IMG_NAME" "misc/docker/$IMG_NAME" - - $DOCKER_CMD tag "bird:$IMG_NAME" "$IMG_BASE:$IMG_NAME" - - $DOCKER_CMD push "$IMG_BASE:$IMG_NAME" - after_script: - - rm -f "$HOME/.docker/$CI_JOB_ID/" # cleanup the credentials - tags: - # That's Docker in Docker - - dind +# .docker: &docker_build +# stage: image +# allow_failure: true +# script: +# - $DOCKER_CMD login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz +# # Make sure we refresh the base image if it updates (eg. security updates, etc) +# # If we do just the build, cache is always reused and the freshness of the +# # base image is never checked. However, pull always asks and updates the +# # image only if it changed ‒ therefore, the cache is used unless there's a +# # change. +# - $DOCKER_CMD pull `sed -ne 's/^FROM //p' "misc/docker/$IMG_NAME/Dockerfile"` +# - $DOCKER_CMD build -t "bird:$IMG_NAME" "misc/docker/$IMG_NAME" +# - $DOCKER_CMD tag "bird:$IMG_NAME" "$IMG_BASE:$IMG_NAME" +# - $DOCKER_CMD push "$IMG_BASE:$IMG_NAME" +# after_script: +# - rm -f "$HOME/.docker/$CI_JOB_ID/" # cleanup the credentials +# tags: +# # That's Docker in Docker +# - dind -docker_debian-7-amd64: - variables: - IMG_NAME: "debian-7-amd64" - <<: *docker_build +# docker_debian-7-amd64: +# variables: +# IMG_NAME: "debian-7-amd64" +# <<: *docker_build -docker_debian-8-amd64: - variables: - IMG_NAME: "debian-8-amd64" - <<: *docker_build +# docker_debian-8-amd64: +# variables: +# IMG_NAME: "debian-8-amd64" +# <<: *docker_build -docker_debian-9-amd64: - variables: - IMG_NAME: "debian-9-amd64" - <<: *docker_build +# docker_debian-9-amd64: +# variables: +# IMG_NAME: "debian-9-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: - IMG_NAME: "debian-7-i386" - <<: *docker_build +# docker_debian-7-i386: +# variables: +# IMG_NAME: "debian-7-i386" +# <<: *docker_build -docker_debian-8-i386: - variables: - IMG_NAME: "debian-8-i386" - <<: *docker_build +# docker_debian-8-i386: +# variables: +# IMG_NAME: "debian-8-i386" +# <<: *docker_build -docker_debian-9-i386: - variables: - IMG_NAME: "debian-9-i386" - <<: *docker_build +# docker_debian-9-i386: +# variables: +# IMG_NAME: "debian-9-i386" +# <<: *docker_build -docker_debian-testing-i386: - variables: - IMG_NAME: "debian-testing-i386" - <<: *docker_build +# docker_debian-testing-i386: +# variables: +# IMG_NAME: "debian-testing-i386" +# <<: *docker_build -docker_fedora-25-amd64: - variables: - IMG_NAME: "fedora-25-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-26-amd64: +# variables: +# IMG_NAME: "fedora-26-amd64" +# <<: *docker_build -docker_centos-7-amd64: - variables: - IMG_NAME: "centos-7-amd64" - <<: *docker_build +# docker_centos-7-amd64: +# variables: +# IMG_NAME: "centos-7-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-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-16_04-amd64: +# variables: +# 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-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-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-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-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-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-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-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 +# .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-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 +# .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 +# .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 +# .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-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 +# .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 +# # 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 +# .freebsd-11-amd64: &freebsd-11-amd64_env +# tags: +# - freebsd +# - amd64 +# #only: +# #- master +# #- triggers +# #- tags .build: &build_job stage: build @@ -231,69 +229,69 @@ docker_ubuntu-16_04-amd64: # Run tests if they are available - $MAKE check -build-debian-7-amd64: - <<: *debian-7-amd64_env - <<: *build_job +# build-debian-7-amd64: +# <<: *debian-7-amd64_env +# <<: *build_job -build-debian-8-amd64: - <<: *debian-8-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-9-amd64: +# <<: *debian-9-amd64_env +# <<: *build_job -build-debian-testing-amd64: - <<: *debian-testing-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-25-amd64: +# <<: *fedora-25-amd64_env +# <<: *build_job -build-fedora-26-amd64: - <<: *fedora-26-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-centos-7-amd64: +# <<: *centos-7-amd64_env +# <<: *build_job -build-opensuse-42_3-amd64: - <<: *opensuse-42_3-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-14_04-amd64: +# <<: *ubuntu-14_04-amd64_env +# <<: *build_job -build-ubuntu-16_04-amd64: - <<: *ubuntu-16_04-amd64_env - <<: *build_job +# build-ubuntu-16_04-amd64: +# <<: *ubuntu-16_04-amd64_env +# <<: *build_job -build-debian-7-i386: - <<: *debian-7-i386_env - <<: *build_job +# build-debian-7-i386: +# <<: *debian-7-i386_env +# <<: *build_job -build-debian-8-i386: - <<: *debian-8-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-9-i386: +# <<: *debian-9-i386_env +# <<: *build_job -build-debian-testing-i386: - <<: *debian-testing-i386_env - <<: *build_job +# build-debian-testing-i386: +# <<: *debian-testing-i386_env +# <<: *build_job -build-freebsd-11-amd64: - <<: *freebsd-11-amd64_env - <<: *build_job +# build-freebsd-11-amd64: +# <<: *freebsd-11-amd64_env +# <<: *build_job -build-freebsd-11-i386: - <<: *freebsd-11-i386_env - <<: *build_job +# build-freebsd-11-i386: +# <<: *freebsd-11-i386_env +# <<: *build_job build-birdlab: <<: *build_job @@ -302,27 +300,11 @@ build-birdlab: - amd64 - netlab: stage: netlab_prep tags: - birdlab script: - echo "Prep-phase" - -tests: - stage: runtest - tags: - - birdlab - script: - - echo "Install" - - ls -l - pwd - - echo "Done!" - -cleaning: - stage: cleanup - tags: - - birdlab - script: - - echo "Cleaning phase" + - ls -l