diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:34:27 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:34:27 +0100 |
commit | 1fb0a2e918c5a5f862fa27e5272b7e44dec50603 (patch) | |
tree | fbb0b7479b2981df4e35a50b84ec129d24104a94 /Jenkinsfile | |
parent | cb97581251df019d2dba1ae830cc0d46b2631c6c (diff) | |
parent | 2767307c451b164322a117544e513d7d9d82a42f (diff) | |
download | vyos-nhrp-1fb0a2e918c5a5f862fa27e5272b7e44dec50603.tar.gz vyos-nhrp-1fb0a2e918c5a5f862fa27e5272b7e44dec50603.zip |
Merge branch 'equuleus' of github.com:vyos/vyos-nhrp into current
* 'equuleus' of github.com:vyos/vyos-nhrp:
Jenkins: import Pipeline from vyos-1x commit bd00ec7
update Jenkins file for equuleus
Diffstat (limited to 'Jenkinsfile')
-rw-r--r-- | Jenkinsfile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 20eb253..3b8daeb 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: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' |