From 4e781d4dec184308ac844a4c2ff7dcfc7832cc77 Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Wed, 14 Aug 2019 16:03:30 +0200 Subject: update Jenkins file for equuleus --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index aac051799..835a683a8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { docker { label 'jessie-amd64' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'higebu/vyos-build:current' + image 'higebu/vyos-build:equuleus' } } @@ -31,7 +31,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/''' agent { docker { label 'jessie-amd64' - image 'vyos-build-armhf:current' + image 'vyos-build-armhf:equuleus' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' } @@ -56,7 +56,7 @@ mv ../*.deb /tmp/$GIT_BRANCH/packages/''' docker { label 'jessie-amd64' args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'vyos-build-arm64:current' + image 'vyos-build-arm64:equuleus' } } -- cgit v1.2.3 From c8d11ef3f77d90dcb880d9c3a11e0ccee7494b30 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 22 Sep 2019 19:15:34 +0200 Subject: Jenkins: fix httpURI in isCustomBuild() (cherry picked from commit 2de90d7176ef5b5e41d05541d47d94f0a79caee1) --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index e254a2dca..61700662a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ def getGitRepoURL() { def isCustomBuild() { // GitHub organisation base URL def gitURI = 'git@github.com:vyos/' + env.JOB_NAME - def httpURI = 'https://github.com/vyos' + env.JOB_NAME + def httpURI = 'https://github.com/vyos/' + env.JOB_NAME return ! ((getGitRepoURL() == gitURI) || (getGitRepoURL() == httpURI)) } -- cgit v1.2.3 From ce8cc3514acdc1f2c06bcd3ef7f3ef32561df9c8 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 28 Sep 2019 12:58:00 +0200 Subject: Jenkins: assume dependencies are available in Docker container --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index a77701b4c..b11267ec2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,12 +96,7 @@ pipeline { steps { script { dir('build') { - sh """ - #!/bin/bash - sudo apt-get -o Acquire::Check-Valid-Until=false update - sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control - dpkg-buildpackage -b -us -uc -tc - """ + sh "dpkg-buildpackage -b -us -uc -tc" } } } -- cgit v1.2.3 From 92884280ac5693f050f80db8ad698cc2f64193c5 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 11 Oct 2019 19:22:45 +0200 Subject: Jenkins: Docker: always pull container from Dockerhub (cherry picked from commit ef7c5aaecd2936d9c2f28d22aec185602dc48206) --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 7529d949e..a169b8f2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,6 +74,7 @@ pipeline { docker { args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' image 'vyos/vyos-build:equuleus' + alwaysPull true } } options { -- cgit v1.2.3