summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2019-12-17 08:37:28 -0600
committerPaul J. Davis <paul.joseph.davis@gmail.com>2019-12-17 08:37:28 -0600
commit994a804e031f5e7d73290d329757e64099447b91 (patch)
tree97fa1ff8b319bddd4968488059a5d28c88c26789
parentd4a1837760673c8efac6478afe1b3efc97d65f66 (diff)
downloadcouchdb-jenkins-pr-jenkinsfile-davisp.tar.gz
Minor tweaks for Jenkins UIjenkins-pr-jenkinsfile-davisp
-rw-r--r--build-aux/Jenkinsfile.pr22
1 files changed, 12 insertions, 10 deletions
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index d06b8035d..2b029a3ef 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -13,6 +13,15 @@
// License for the specific language governing permissions and limitations under
// the License.
+create_tarball = '''
+set
+rm -rf apache-couchdb-*
+. /usr/local/kerl/${LOW_ERLANG_VER}/activate
+./configure --with-curl
+make dist
+chmod -R a+w * .
+'''
+
build_and_test = '''
mkdir -p ${COUCHDB_IO_LOG_DIR}
rm -rf build
@@ -62,7 +71,7 @@ pipeline {
}
stages {
- stage('Build Release Tarball') {
+ stage('Create Release Tarball') {
agent {
docker {
image "${DOCKER_IMAGE}"
@@ -75,14 +84,7 @@ pipeline {
timeout(time: 15, unit: "MINUTES")
}
steps {
- sh '''
- set
- rm -rf apache-couchdb-*
- . /usr/local/kerl/${LOW_ERLANG_VER}/activate
- ./configure --with-curl
- make dist
- chmod -R a+w * .
- '''
+ sh( script: create_tarball, label: 'Create Tarball' )
}
post {
success {
@@ -128,7 +130,7 @@ pipeline {
}
steps {
unstash 'tarball'
- sh( script: build_and_test )
+ sh( script: build_and_test, label: 'Configure, Build, Test' )
}
post {
always {