diff options
author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2019-11-10 03:02:58 +0100 |
---|---|---|
committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2019-11-26 19:43:56 +0100 |
commit | faa43a755eba5194c50fae20dddc0e3837fe5dc5 (patch) | |
tree | fed56e91a152ed10d897bc5223be83075c2d495e | |
parent | 5176455f1a4506e9397e23895e1de525c3c190c9 (diff) |
Apply relevant changes from branch mh-test-gitlab
-rw-r--r-- | .gitlab-ci.yml | 26 |
1 files 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 |