From faa43a755eba5194c50fae20dddc0e3837fe5dc5 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Sun, 10 Nov 2019 03:02:58 +0100 Subject: [PATCH] Apply relevant changes from branch mh-test-gitlab --- .gitlab-ci.yml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c02d9c50..039dbf5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,12 @@ variables: GIT_STRATEGY: fetch DOCKER_CMD: docker --config="$HOME/.docker/$CI_JOB_ID/" IMG_BASE: registry.labs.nic.cz/labs/bird + TOOLS_DIR: /var/lib/gitlab-runner/bird-tools stages: - image - build + - test .docker: &docker_build stage: image @@ -293,7 +295,25 @@ build-freebsd-11-i386: <<: *build_job build-birdlab: - <<: *build_job + stage: build tags: - - birdlab - - amd64 + - 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-int/common + +running_test: + stage: test + tags: + - birdlab + - amd64 + script: + - cd $TOOLS_DIR/netlab-int + - sudo ./runtest -m check cf-ospf