diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:13:16 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:13:16 +0100 |
| commit | e68d155960822d85b4f08acb1fa48cac8b49fddf (patch) | |
| tree | b4ff42683555cb69b30da821492adebe7be7fb7f | |
| parent | afeb7c2eaba67449b368677b235c2ad2eac4023f (diff) | |
| download | vyatta-cfg-vpn-e68d155960822d85b4f08acb1fa48cac8b49fddf.tar.gz vyatta-cfg-vpn-e68d155960822d85b4f08acb1fa48cac8b49fddf.zip | |
Jenkins: adjust to new Debian Buster build
| -rw-r--r-- | Jenkinsfile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index b11267e..3b8daeb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,8 @@ pipeline { agent { docker { args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' - image 'vyos/vyos-build:equuleus' + image 'vyos/vyos-build:current' + alwaysPull true } } options { @@ -87,7 +88,8 @@ pipeline { steps { script { dir('build') { - git branch: getGitBranchName(), url: getGitRepoURL() + git branch: getGitBranchName(), + url: getGitRepoURL() } } } @@ -96,7 +98,10 @@ pipeline { steps { script { dir('build') { - sh "dpkg-buildpackage -b -us -uc -tc" + def commitId = sh(returnStdout: true, script: 'git rev-parse --short=11 HEAD').trim() + currentBuild.description = sprintf('Git SHA1: %s', commitId[-11..-1]) + + sh 'dpkg-buildpackage -b -us -uc -tc' } } } @@ -118,9 +123,6 @@ pipeline { // every option over and over again! def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + getGitBranchName() + '/' - if (getGitBranchName() != "equuleus") - VYOS_REPO_PATH += 'vyos/' - def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR' def SSH_REMOTE = 'khagen@10.217.48.113' |