diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-27 16:02:27 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-27 16:02:27 +0100 |
| commit | b73af93684e4ac46fd8c2051345eb015e55f6daf (patch) | |
| tree | f9d2d34f5800ae8799094671dbab64c5673701f3 | |
| parent | 60c32fc3ea95d37205ac0e73b1ba1396ccf298c3 (diff) | |
| download | vyos-strongswan-b73af93684e4ac46fd8c2051345eb015e55f6daf.tar.gz vyos-strongswan-b73af93684e4ac46fd8c2051345eb015e55f6daf.zip | |
Jenkins: make pipeline branch independent
| -rw-r--r-- | Jenkinsfile | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 56528c23c..72e864272 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,11 +69,24 @@ def projectProperties = [ properties(projectProperties) setDescription() +node('Docker') { + stage('Define Agent') { + script { + // create container name on demand + def branchName = getGitBranchName() + if (branchName == "master") { + branchName = "current" + } + env.DOCKER_IMAGE = "vyos/vyos-build:" + branchName + } + } +} + pipeline { agent { docker { - args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' - image 'vyos/vyos-build:current' + args "--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006" + image "${env.DOCKER_IMAGE}" alwaysPull true } } @@ -131,8 +144,15 @@ pipeline { sshagent(['SSH-dev.packages.vyos.net']) { // build up some fancy groovy variables so we do not need to write/copy // every option over and over again! + def RELEASE = getGitBranchName() + if (getGitBranchName() == "master") { + RELEASE = 'current' + } + + def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + RELEASE + '/' + if (getGitBranchName() == "crux") + VYOS_REPO_PATH += 'vyos/' - def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + getGitBranchName() + '/' def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR' def SSH_REMOTE = 'khagen@10.217.48.113' @@ -140,7 +160,6 @@ pipeline { files = findFiles(glob: '*.deb') files.each { PACKAGE -> - def RELEASE = getGitBranchName() def ARCH = sh(returnStdout: true, script: "dpkg-deb -f ${PACKAGE} Architecture").trim() def SUBSTRING = sh(returnStdout: true, script: "dpkg-deb -f ${PACKAGE} Package").trim() def SSH_DIR = '~/VyOS/' + RELEASE + '/' + ARCH |