summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <wohali@apache.org>2020-04-28 22:08:17 +0000
committerJoan Touzet <joant@atypical.net>2020-04-29 19:13:49 -0400
commite57e49b7e3d382e117647c142688eff5071607f8 (patch)
tree92156b7ff4233301f30e5c2dca6d77d17175e48b
parent44e0f0fcb06727f0e41e1995fc7b24421457439d (diff)
downloadcouchdb-jenkins-fossa-sm68.tar.gz
Add Ubuntu Focal (20.04) + SM68 to Jenkinsjenkins-fossa-sm68
-rw-r--r--.gitignore1
-rw-r--r--build-aux/Jenkinsfile.full49
2 files changed, 48 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 645817b76..6223d7322 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
.eunit/
cover/
core
+debian/
log
apache-couchdb-*/
bin/
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index d88525415..b3b477bea 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -33,7 +33,7 @@ mkdir couchdb
cp ${WORKSPACE}/apache-couchdb-*.tar.gz couchdb
tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz -C couchdb
cd couchdb-pkg
-make ${platform} PLATFORM=${platform}
+make
'''
cleanup_and_save = '''
@@ -417,6 +417,50 @@ pipeline {
} // post
} // stage
+ stage('Ubuntu Focal') {
+ agent {
+ docker {
+ image 'couchdbdev/ubuntu-focal-erlang-20.3.8.25-1:latest'
+ label 'docker'
+ alwaysPull true
+ args "${DOCKER_ARGS}"
+ }
+ }
+ environment {
+ platform = 'focal'
+ sm_ver = '68'
+ }
+ stages {
+ stage('Build from tarball & test') {
+ steps {
+ unstash 'tarball'
+ sh( script: build_and_test )
+ }
+ post {
+ always {
+ junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
+ }
+ }
+ }
+ stage('Build CouchDB packages') {
+ steps {
+ sh( script: make_packages )
+ sh( script: cleanup_and_save )
+ }
+ post {
+ success {
+ archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+ }
+ }
+ }
+ } // stages
+ post {
+ cleanup {
+ sh 'rm -rf ${WORKSPACE}/*'
+ }
+ } // post
+ } // stage
+
stage('Debian Stretch') {
agent {
docker {
@@ -697,11 +741,12 @@ pipeline {
cp js/debian-stretch/*.deb pkgs/stretch
reprepro -b couchdb-pkg/repo includedeb stretch pkgs/stretch/*.deb
cp js/debian-buster/*.deb pkgs/stretch
- reprepro -b couchdb-pkg/repo includedeb stretch pkgs/buster/*.deb
+ reprepro -b couchdb-pkg/repo includedeb buster pkgs/buster/*.deb
cp js/ubuntu-xenial/*.deb pkgs/xenial
reprepro -b couchdb-pkg/repo includedeb xenial pkgs/xenial/*.deb
cp js/ubuntu-bionic/*.deb pkgs/bionic
reprepro -b couchdb-pkg/repo includedeb bionic pkgs/bionic/*.deb
+ reprepro -b couchdb-pkg/repo includedeb focal pkgs/focal/*.deb
'''
echo 'Building CentOS repos...'