mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-11-10 05:08:42 +00:00
Merge commit 'c9b7b032110fbd49a5f084bfe3bc886e0e1edfe4' into mq-merge-step-1
This commit is contained in:
commit
f9bef5b989
@ -4,8 +4,8 @@ variables:
|
|||||||
GIT_STRATEGY: fetch
|
GIT_STRATEGY: fetch
|
||||||
DOCKER_CMD: docker --config="$HOME/.docker/$CI_JOB_ID/"
|
DOCKER_CMD: docker --config="$HOME/.docker/$CI_JOB_ID/"
|
||||||
IMG_BASE: registry.nic.cz/labs/bird
|
IMG_BASE: registry.nic.cz/labs/bird
|
||||||
TOOLS_DIR: /var/lib/gitlab-runner/bird-tools
|
TOOLS_DIR: /home/gitlab-runner/bird-tools
|
||||||
STAYRTR_BINARY: /var/lib/gitlab-runner/stayrtr-0.1-108-g8d18a41-linux-x86_64
|
STAYRTR_BINARY: /usr/bin/stayrtr
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
# - image
|
# - image
|
||||||
@ -309,10 +309,10 @@ pkg-opensuse-15.3-amd64:
|
|||||||
image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
|
image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
|
||||||
|
|
||||||
|
|
||||||
build-birdlab:
|
build-netlab:
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
- birdlab
|
- netlab
|
||||||
- amd64
|
- amd64
|
||||||
script:
|
script:
|
||||||
- DIR=$(pwd)
|
- DIR=$(pwd)
|
||||||
@ -327,9 +327,9 @@ build-birdlab:
|
|||||||
|
|
||||||
.test: &test-base
|
.test: &test-base
|
||||||
stage: test
|
stage: test
|
||||||
needs: [build-birdlab]
|
needs: [build-netlab]
|
||||||
tags:
|
tags:
|
||||||
- birdlab
|
- netlab
|
||||||
- amd64
|
- amd64
|
||||||
script:
|
script:
|
||||||
- cd $TOOLS_DIR/netlab
|
- cd $TOOLS_DIR/netlab
|
||||||
|
Loading…
Reference in New Issue
Block a user