diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-08 20:49:05 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-02-08 20:49:05 +0100 |
| commit | 4c2ad52b5933e8d542bffc07ca00d1c1b3205fd3 (patch) | |
| tree | 489c0c1f36e9c28788499330b90ac7f842fdb454 /vars | |
| parent | b6dacbb4aa5a941141910213484f266a72e79e20 (diff) | |
| download | vyos-build-4c2ad52b5933e8d542bffc07ca00d1c1b3205fd3.tar.gz vyos-build-4c2ad52b5933e8d542bffc07ca00d1c1b3205fd3.zip | |
Jenkins: fix unexpected char: '#' - Groovy does not like BASH foo
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/buildPackage.groovy | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy index c08ddc46..e6a4be2e 100644 --- a/vars/buildPackage.groovy +++ b/vars/buildPackage.groovy @@ -141,11 +141,14 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false) { def ARCH = '' if (PACKAGE_ARCH != 'all') ARCH = '-A ' + PACKAGE_ARCH + sh(script: "scp ${SSH_OPTS} ${FILE} ${SSH_REMOTE}:${SSH_DIR}") sh(script: "ssh ${SSH_OPTS} ${SSH_REMOTE} -t \"uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} ${ARCH} remove ${RELEASE} ${PACKAGE}'\"") - // packages like FRR produce their binary in a nested path e.g. build-arm64/packages/frr/frr-rpki-rtrlib-dbgsym_7.5_arm64.deb + + // Packages like FRR produce their binary in a nested path e.g. packages/frr/frr-rpki-rtrlib-dbgsym_7.5_arm64.deb, // thus we will only extract the filename portion from FILE as the binary is scp'ed to SSH_DIR without any subpath. - sh(script: "ssh ${SSH_OPTS} ${SSH_REMOTE} -t \"uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} ${ARCH} includedeb ${RELEASE} ${SSH_DIR}/${FILE##*/}'\"") + def FILENAME = FILE.tokenize('/')[-1] + sh(script: "ssh ${SSH_OPTS} ${SSH_REMOTE} -t \"uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} ${ARCH} includedeb ${RELEASE} ${SSH_DIR}/${FILENAME}'\"") } sh(script: "ssh ${SSH_OPTS} ${SSH_REMOTE} -t \"uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} deleteunreferenced'\"") } |