summaryrefslogtreecommitdiff
path: root/vars/buildPackage.groovy
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-08 20:46:17 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-08 20:46:17 +0100
commitc1e6e7bb945f28a60d9f9df5cf920089299677bd (patch)
treebe189d4d69c27d30f145f1120de4ec55b361c4b4 /vars/buildPackage.groovy
parentdb4a33fa3b66270fb95f85cc392151afd94bcbf8 (diff)
downloadvyos-build-c1e6e7bb945f28a60d9f9df5cf920089299677bd.tar.gz
vyos-build-c1e6e7bb945f28a60d9f9df5cf920089299677bd.zip
Jenkins: do not add package from nested path to reprepro
Diffstat (limited to 'vars/buildPackage.groovy')
-rw-r--r--vars/buildPackage.groovy4
1 files changed, 3 insertions, 1 deletions
diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy
index b777f2b2..c08ddc46 100644
--- a/vars/buildPackage.groovy
+++ b/vars/buildPackage.groovy
@@ -143,7 +143,9 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false) {
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}'\"")
- sh(script: "ssh ${SSH_OPTS} ${SSH_REMOTE} -t \"uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} ${ARCH} includedeb ${RELEASE} ${SSH_DIR}/${FILE}'\"")
+ // packages like FRR produce their binary in a nested path e.g. build-arm64/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##*/}'\"")
}
sh(script: "ssh ${SSH_OPTS} ${SSH_REMOTE} -t \"uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} deleteunreferenced'\"")
}