vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Jenkins: lib: fix file encoding (<U+200B>) issues

Browse Source
This commit is contained in:
Christian Poessinger 2021-03-26 19:40:38 +01:00
parent 277561ae26
commit 02803f0b66
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vars/buildPackage.groovy
View File

@ -131,31 +131,31 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false) {
// Unpack files for arm64 IF they exist // Unpack files for arm64 IF they exist
try { try {
unstash 'binary-arm64' unstash 'binary-arm64'
} catch (e) { } catch (e) {
print "Unstash arm64 failed, ignoring" print "Unstash arm64 failed, ignoring"
} }
if (isCustomBuild()) { if (isCustomBuild()) {
echo "Build not started from official Git repository! Artifacts are not uploaded to external repository" echo "Build not started from official Git repository! Artifacts are not uploaded to external repository"
return return
} }
echo "Uploading Artifacts to external repository" echo "Uploading Artifacts to external repository"
copyArtifacts fingerprintArtifacts: true, projectName: '${JOB_NAME}', selector: specific('${BUILD_NUMBER}') copyArtifacts fingerprintArtifacts: true, projectName: '${JOB_NAME}', selector: specific('${BUILD_NUMBER}')
​
// build up some fancy groovy variables so we do not need to write/copy // build up some fancy groovy variables so we do not need to write/copy
// every option over and over again! // every option over and over again!
def RELEASE = getGitBranchName() def RELEASE = getGitBranchName()
if (getGitBranchName() == "master") if (getGitBranchName() == "master")
RELEASE = 'current' RELEASE = 'current'
​
def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + RELEASE def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + RELEASE
if (getGitBranchName() == "crux") if (getGitBranchName() == "crux")
VYOS_REPO_PATH += '/vyos' VYOS_REPO_PATH += '/vyos'
​
def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR' def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR'
def SSH_REMOTE = env.DEV_PACKAGES_VYOS_NET_HOST // defined as global variable def SSH_REMOTE = env.DEV_PACKAGES_VYOS_NET_HOST // defined as global variable
def SSH_DIR = '~/VyOS/' + RELEASE def SSH_DIR = '~/VyOS/' + RELEASE
​
// publish build result, using SSH-dev.packages.vyos.net Jenkins Credentials // publish build result, using SSH-dev.packages.vyos.net Jenkins Credentials
sshagent(['SSH-dev.packages.vyos.net']) { sshagent(['SSH-dev.packages.vyos.net']) {
files = findFiles(glob: '**/*.deb') files = findFiles(glob: '**/*.deb')
@ -169,10 +169,10 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false) {
def ARCH = '' def ARCH = ''
if (PACKAGE_ARCH != 'all') if (PACKAGE_ARCH != 'all')
ARCH = '-A ' + PACKAGE_ARCH ARCH = '-A ' + PACKAGE_ARCH
​
sh(script: "scp ${SSH_OPTS} ${FILE} ${SSH_REMOTE}:${SSH_DIR}") 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} remove ${RELEASE} ${PACKAGE}'\"")
​
// Packages like FRR produce their binary in a nested path e.g. 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. // thus we will only extract the filename portion from FILE as the binary is scp'ed to SSH_DIR without any subpath.
def FILENAME = FILE.toString().tokenize('/')[-1] def FILENAME = FILE.toString().tokenize('/')[-1]
@ -185,6 +185,5 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false) {
} }
} }
} }
} }
} }