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 05:20:14 UTC
[couchdb] branch jenkins-dynamic-matrix updated: Last refactor for today
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
The following commit(s) were added to refs/heads/jenkins-dynamic-matrix by this push:
new 918f8e7 Last refactor for today
918f8e7 is described below
commit 918f8e718dd63f1ecbfe394293e9e5ce49c7a684
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Jan 18 00:20:01 2022 -0500
Last refactor for today
---
build-aux/Jenkinsfile.full | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 51642dd..e6c26fc 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -13,14 +13,6 @@
// License for the specific language governing permissions and limitations under
// the License.
-unpack = '''
-rm -rf ${PLATFORM}/build
-mkdir -p ${COUCHDB_IO_LOG_DIR} ${PLATFORM}/build
-cd ${PLATFORM}
-tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz -C build
-mv build/apache-couchdb-* build/couchdb
-'''
-
make_packages = '''
cd ${PLATFORM}
git clone https://github.com/apache/couchdb-pkg
@@ -134,11 +126,11 @@ def generateNativeStage(platform) {
withEnv([
'HOME='+pwd(),
'PATH+USRLOCAL=/usr/local/bin',
- 'MAKE='+meta[platform].gnu_make,
- 'PLATFORM='+platform
+ 'MAKE='+meta[platform].gnu_make
]) {
- sh( script: unpack, label: 'Unpack tarball' )
- dir( "${platform}/build/couchdb" ) {
+ sh( script: "mkdir -p ${COUCHDB_IO_LOG_DIR} ${platform}/build", label: 'Create build directories' )
+ sh "tar -xf --strip-components=1 apache-couchdb-*.tar.gz -C ${platform}/build"
+ dir( "${platform}/build" ) {
sh "./configure --skip-deps --spidermonkey-version ${meta[platform].spidermonkey_vsn}"
sh '$MAKE'
sh '$MAKE eunit'
@@ -151,9 +143,15 @@ def generateNativeStage(platform) {
catch (err) {
echo "Build failed: {$err}"
sh 'ls -l ${WORKSPACE}'
- dir( "${platform}/build/couchdb" ) {
- sh 'ls -l'
- sh "${meta[platform].gnu_make} build-report"
+ withEnv([
+ 'HOME='+pwd(),
+ 'PATH+USRLOCAL=/usr/local/bin',
+ 'MAKE='+meta[platform].gnu_make
+ ]) {
+ dir( "${platform}/build" ) {
+ sh 'ls -l'
+ sh '${MAKE} build-report'
+ }
}
}
finally {
@@ -188,10 +186,11 @@ def generateContainerStage(platform) {
withEnv(['PLATFORM='+platform]) {
stage("${meta[platform].name} - build & test") {
try {
- sh( script: 'rm -rf apache-couchdb-*', label: 'Clean workspace' )
+ sh( script: "rm -rf ${platform} apache-couchdb-*", label: 'Clean workspace' )
unstash 'tarball'
- sh( script: unpack, label: 'Unpack tarball' )
- dir( "${platform}/build/couchdb" ) {
+ sh( script: "mkdir -p ${COUCHDB_IO_LOG_DIR} ${platform}/build", label: 'Create build directories' )
+ sh "tar -xf --strip-components=1 apache-couchdb-*.tar.gz -C ${platform}/build"
+ dir( "${platform}/build" ) {
sh "./configure --skip-deps --spidermonkey-version ${meta[platform].spidermonkey_vsn}"
sh 'make'
sh 'make eunit'
@@ -203,7 +202,7 @@ def generateContainerStage(platform) {
catch (err) {
echo "Build failed: {$err}"
sh 'ls -l ${WORKSPACE}'
- dir( "${platform}/build/couchdb" ) {
+ dir( "${platform}/build" ) {
sh 'ls -l'
sh 'make build-report'
}