diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 14:42:01 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 14:46:20 +0100 |
commit | a17d72be46fe80f036058f044085e15b76740de2 (patch) | |
tree | d3233936dcc1bb44ee19dd95586e3d26e0eb0f56 | |
parent | 6c076df8aca590aa2a7fe9f40361a2afdb139477 (diff) | |
download | vyos-1x-a17d72be46fe80f036058f044085e15b76740de2.tar.gz vyos-1x-a17d72be46fe80f036058f044085e15b76740de2.zip |
Jenkins: add exception for master branch to deploy path
-rw-r--r-- | Jenkinsfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 3b8daeb12..63a271bc1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -121,8 +121,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() + '/' + 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' @@ -130,7 +134,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 |