diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-09-22 20:24:43 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-09-22 20:24:43 +0200 |
| commit | 67f60efcc73fae0fe6712b41485a2a7407258359 (patch) | |
| tree | ca71522bade4a8bcf9387983008db982ca01e211 | |
| parent | 12a7a498ce70c04d78fccb6e53496f946c54576b (diff) | |
| download | vyos-1x-67f60efcc73fae0fe6712b41485a2a7407258359.tar.gz vyos-1x-67f60efcc73fae0fe6712b41485a2a7407258359.zip | |
Jenkins: intruduce ARCH_OPT to support multi arch deployment
| -rw-r--r-- | Jenkinsfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 386058a79..b9aa54f21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -134,6 +134,9 @@ pipeline { 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 + def ARCH_OPT = '' + if (ARCH != 'all') + ARCH_OPT = '-A ' + ARCH // No need to explicitly check the return code. The pipeline // will fail if sh returns a non 0 exit code @@ -144,13 +147,13 @@ pipeline { scp ${SSH_OPTS} ${PACKAGE} ${SSH_REMOTE}:${SSH_DIR}/ """ sh """ - ssh ${SSH_OPTS} ${SSH_REMOTE} -t "uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} -A ${ARCH} remove ${RELEASE} ${SUBSTRING}'" + ssh ${SSH_OPTS} ${SSH_REMOTE} -t "uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} ${ARCH_OPT} remove ${RELEASE} ${SUBSTRING}'" """ sh """ ssh ${SSH_OPTS} ${SSH_REMOTE} -t "uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} deleteunreferenced'" """ sh """ - ssh ${SSH_OPTS} ${SSH_REMOTE} -t "uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} -A ${ARCH} includedeb ${RELEASE} ${SSH_DIR}/${PACKAGE}'" + ssh ${SSH_OPTS} ${SSH_REMOTE} -t "uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} ${ARCH_OPT} includedeb ${RELEASE} ${SSH_DIR}/${PACKAGE}'" """ } } |