You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2019/12/11 20:24:50 UTC
[couchdb] 01/01: Use finer grained steps in the build pipeline
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch jenkins-davisp-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 16f597c78115bf339362b70e5f4df4c0ea720d32
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Wed Dec 11 13:47:22 2019 -0600
Use finer grained steps in the build pipeline
---
Makefile | 2 +-
build-aux/Jenkinsfile.mini | 27 +++++++++++++++++++--------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 4c1283b..fbf392a 100644
--- a/Makefile
+++ b/Makefile
@@ -409,7 +409,7 @@ introspect:
.PHONY: dist
# target: dist - Make release tarball
-dist: all
+dist:
@./build-aux/couchdb-build-release.sh $(COUCHDB_VERSION)
@cp -r share/www apache-couchdb-$(COUCHDB_VERSION)/share/
diff --git a/build-aux/Jenkinsfile.mini b/build-aux/Jenkinsfile.mini
index 15de750..e58fd86 100644
--- a/build-aux/Jenkinsfile.mini
+++ b/build-aux/Jenkinsfile.mini
@@ -15,15 +15,14 @@
// DRYing out the Jenkinsfile...
-build_and_test = '''
+unpack_tarball = '''
+# Unpack tarball
mkdir -p ${COUCHDB_IO_LOG_DIR}
rm -rf build
mkdir build
cd build
tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
cd apache-couchdb-*
-./configure --with-curl
-make check || (build-aux/logfile-uploader.py && false)
'''
make_packages = '''
@@ -88,10 +87,13 @@ pipeline {
sh '''
set
rm -rf apache-couchdb-*
- ./configure --with-curl
- make dist
- chmod -R a+w * .
'''
+ sh './configure --with-curl'
+ sh 'make couch'
+ sh 'make fauxton'
+ sh 'make docs'
+ sh 'make dist'
+ sh 'chmod -R a+w * .'
}
post {
success {
@@ -130,7 +132,16 @@ pipeline {
stage('Build from tarball & test') {
steps {
unstash 'tarball'
- sh( script: build_and_test )
+ sh( script: unpack_tarball )
+ sh './configure --with-curl'
+ sh 'make'
+ sh 'make test-cluster-with-quorum'
+ sh 'make test-cluster-without-quorum'
+ sh 'make python-black'
+ sh 'make eunit'
+ sh 'make javascript'
+ sh 'make mango-test'
+ sh 'make elixir'
}
post {
always {
@@ -181,7 +192,7 @@ pipeline {
sh 'rm -rf ${WORKSPACE}/*'
unstash 'tarball'
unarchive mapping: ['pkgs/' : '.']
-
+
echo 'Retrieving & cleaning current couchdb-vm2 tree...'
sh '''
rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY" jenkins@couchdb-vm2.apache.org:/var/www/html/$BRANCH_NAME . || mkdir -p $BRANCH_NAME