You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2022/01/18 16:05:38 UTC
[couchdb] 01/02: Need to escape for arch to flow through to shell
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch jenkins-dynamic-matrix
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 57949ce60d18fa5cbec41ef42fcb67809b051f08
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Jan 18 11:00:27 2022 -0500
Need to escape for arch to flow through to shell
---
build-aux/Jenkinsfile.full | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index c5fce04..cfb3536 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -207,7 +207,6 @@ def generateContainerStage(platform) {
}
finally {
junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
- // Do we actually want to unconditionally destroy the contents of the workspace here?
sh 'rm -rf ${WORKSPACE}/* ${COUCHDB_IO_LOG_DIR}'
}
}
@@ -215,17 +214,16 @@ def generateContainerStage(platform) {
stage("${meta[platform].name} - package") {
try {
unstash 'tarball'
- // sh( label: 'Build packages', script='''
sh( script: "mkdir -p ${platform}/couchdb", label: 'Create build directory' )
sh( script: "tar -xf apache-couchdb-*.tar.gz -C ${platform}/couchdb", label: 'Unpack release' )
sh( script: "cd ${platform} && git clone https://github.com/apache/couchdb-pkg", label: 'Clone packaging helper repo' )
dir( "${platform}/couchdb-pkg" ) {
sh( script: 'make', label: 'Build packages' )
}
- sh( label: 'Stage package artifacts for archival', script="""
+ sh( label: 'Stage package artifacts for archival', script: """
rm -rf pkgs/${platform}
mkdir -p pkgs/${platform}
- mv ${platform}/rpmbuild/RPMS/$(arch)/*rpm pkgs/${platform} || true
+ mv ${platform}/rpmbuild/RPMS/\$(arch)/*rpm pkgs/${platform} || true
mv ${platform}/couchdb/*.deb pkgs/${platform} || true
""" )
archiveArtifacts artifacts: 'pkgs/**', fingerprint: true, onlyIfSuccessful: true