diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:12:04 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:12:04 +0100 |
commit | ad8ea629392905e2736919ab5129ff9d6a35a986 (patch) | |
tree | 3305cfbeafd55bb8002f0871f0622db2c3d27e42 | |
parent | 19daf769a0ec37f43105ebcba976f1018e05ae6e (diff) | |
parent | a79abcfb476390ef4bd813cff9dd675d206366ac (diff) | |
download | vyatta-cfg-quagga-ad8ea629392905e2736919ab5129ff9d6a35a986.tar.gz vyatta-cfg-quagga-ad8ea629392905e2736919ab5129ff9d6a35a986.zip |
Merge branch 'equuleus' of github.com:vyos/vyatta-cfg-quagga into current
* 'equuleus' of github.com:vyos/vyatta-cfg-quagga:
Jenkins: import Pipeline from vyos-1x commit bd00ec7
update Jenkins file for equuleus
-rw-r--r-- | Jenkinsfile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 20eb2531..3b8daeb1 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' |