summaryrefslogtreecommitdiff
path: root/Jenkinsfile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-12-18 16:20:19 +0100
committerChristian Poessinger <christian@poessinger.com>2019-12-18 16:22:43 +0100
commit0c08e0b3e14411ff2d9cfff57452d167310b86c7 (patch)
tree7dde24ede0f96eeb2f568da3c7b7aedb59709825 /Jenkinsfile
parentc35453f002ade9b5325162f71cebd5a6fea118e6 (diff)
downloadlibvyosconfig-0c08e0b3e14411ff2d9cfff57452d167310b86c7.tar.gz
libvyosconfig-0c08e0b3e14411ff2d9cfff57452d167310b86c7.zip
Jenkins: adjust to new Debian Buster build
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile11
1 files changed, 5 insertions, 6 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index e882e69..1dc3556 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,7 +100,6 @@ pipeline {
dir('build') {
def commitId = sh(returnStdout: true, script: 'git rev-parse --short=11 HEAD').trim()
currentBuild.description = sprintf('Git SHA1: %s', commitId[-11..-1])
-
sh 'eval $(opam env --root=/opt/opam --set-root) && dpkg-buildpackage -b -us -uc -tc'
}
}
@@ -121,11 +120,12 @@ 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/' + getGitBranchName() + '/'
- if (getGitBranchName() != "equuleus")
- VYOS_REPO_PATH += 'vyos/'
-
+ def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + RELEASE + '/'
def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR'
def SSH_REMOTE = 'khagen@10.217.48.113'
@@ -133,7 +133,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