This is an automated email from the ASF dual-hosted git repository. wohali pushed a commit to branch jenkins-packages-2 in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 825d0add611289eb624df5ef469a86c8ae3996b0 Author: Eric Avdey <[email protected]> AuthorDate: Mon May 1 10:27:31 2017 -0300 Fix _local_docs end-point This is a second attempt to fix _local_docs end-point. The previous one didn't work on big enough btree_local, because local btree doesn't have reduction fun, so reuse of couch_db_updater:btree_by_id_reduce/2 was crashing on a bad match as soon as btree_local was getting kp_node. Also using full fold to calculate total_rows value turned out to be resource expensive when a database have significant number of local documents. This fix avoids calculating of total_rows and offset instead always setting them to null and also setting to null update_seq when requested, since it doesn't have meaning in context of local documents. A fabric module fabric_view_all_docs.erl was copied and modified as fabric_view_local_docs.erl, because re-using it for processing of both types of the documents was getting rather convoluted. Jira: COUCHDB-3337 --- Jenkinsfile | 313 +++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 234 insertions(+), 79 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6fbb7e7..88401b8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,21 +26,25 @@ pipeline { stage('Build') { agent { docker { - /* This image has the oldest Erlang we support, 16B03 */ + label 'ubuntu' + // This image has the oldest Erlang we support, 16B03 image 'couchdbdev/ubuntu-14.04-erlang-default' - /* We need the jenkins user mapped inside of the image */ - args '-v /etc/passwd:/etc/passwd -v /etc/group:/etc/group' + // https://github.com/jenkins-infra/jenkins.io/blob/master/Jenkinsfile#64 + // We need the jenkins user mapped inside of the image + args '-e npm_config_cache=npm-cache -e HOME=. -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group' } } steps { timeout(time: 15, unit: "MINUTES") { - /* npm config cache below is required because /home/jenkins doesn't - ACTUALLY exist in the image */ - /* sh 'git clone --depth 10 https://github.com/apache/couchdb .' */ + // npm config cache below is required because /home/jenkins doesn't + // ACTUALLY exist in the image sh ''' - export npm_config_cache=$(mktemp -d) - ./configure --with-curl - make dist + set + rm -rf apache-couchdb-*.tar.gz + #export npm_config_cache=$(mktemp -d) + ./configure --with-curl + make dist + chmod -R a+w * ''' stash includes: 'apache-couchdb-*.tar.gz', name: 'tarball' archiveArtifacts artifacts: 'apache-couchdb-*.tar.gz', fingerprint: true @@ -49,44 +53,69 @@ pipeline { } } - /* TODO rework this once JENKINS-41334 is released - https://issues.jenkins-ci.org/browse/JENKINS-41334 */ - /* The builddir stuff is to prevent all 10 builds from live syncing - their build results to each other during the build. Moving the - build outside of the workdir should speed up the build process too, - though it does mean we pollute /tmp whenever a build fails. */ + // TODO rework this once JENKINS-41334 is released + // https://issues.jenkins-ci.org/browse/JENKINS-41334 + + // The builddir stuff is to prevent all 10 builds from live syncing + // their build results to each other during the build. Moving the + // build outside of the workdir should speed up the build process, too + + // we run all package builds as root inside the Docker container + + // Build packages on supported platforms using esl's erlang stage('Test') { steps { parallel(centos6erlang183: { node(label: 'ubuntu') { - timeout(time: 45, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 60, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/centos-6-erlang-18.3' - withDockerContainer(image: 'couchdbdev/centos-6-erlang-18.3', args: '-e LD_LIBRARY_PATH=/usr/local/bin --user 0:0') { + withDockerContainer(image: 'couchdbdev/centos-6-erlang-18.3', args: '-e LD_LIBRARY_PATH=/usr/local/bin -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group --user 0:0') { sh ''' cwd=$(pwd) - rm -rf /tmp/couchjslogs - mkdir -p /tmp/couchjslogs + umask 0 + rm -rf /tmp/couchjslogs && mkdir -p /tmp/couchjslogs + + # Build CouchDB from tarball builddir=$(mktemp -d) cd $builddir tar -xf $cwd/apache-couchdb-*.tar.gz cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) + + # Build CouchDB packages + cd $builddir + git clone https://github.com/apache/couchdb-pkg + mkdir couchdb + cd couchdb + cp $cwd/apache-couchdb-*.tar.gz . + tar -xf apache-couchdb-*.tar.gz + cd ../couchdb-pkg + # centos only + platform=centos6 + make $platform PLATFORM=$platform + rm -rf $cwd/pkgs/$platform && mkdir -p $cwd/pkgs/$platform + # CentOS variant + mv ~/rpmbuild/RPMS/x86_64/*rpm $cwd/pkgs/$platform || true + + # Cleanup + cd $cwd && rm -rf $builddir + chown -R jenkins:jenkins * ''' } // withDocker } // timeout + archiveArtifacts artifacts: 'pkgs/**', fingerprint: true + deleteDir() } // node }, centos7erlangdefault: { node(label: 'ubuntu') { - timeout(time: 30, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 45, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/centos-7-erlang-default' - withDockerContainer(image: 'couchdbdev/centos-7-erlang-default', args: '-e LD_LIBRARY_PATH=/usr/local/bin --user 0:0') { + withDockerContainer(image: 'couchdbdev/centos-7-erlang-default', args: '-e LD_LIBRARY_PATH=/usr/local/bin -e npm_config_cache=npm-cache -e HOME=. -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group') { sh ''' cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -97,42 +126,64 @@ pipeline { cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) ''' } // withDocker } // timeout + deleteDir() } // node }, centos7erlang183: { node(label: 'ubuntu') { - timeout(time: 30, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 60, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/centos-7-erlang-18.3' - withDockerContainer(image: 'couchdbdev/centos-7-erlang-18.3', args: '-e LD_LIBRARY_PATH=/usr/local/bin --user 0:0') { + withDockerContainer(image: 'couchdbdev/centos-7-erlang-18.3', args: '-e LD_LIBRARY_PATH=/usr/local/bin -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group --user 0:0') { sh ''' cwd=$(pwd) - rm -rf /tmp/couchjslogs - mkdir -p /tmp/couchjslogs + umask 0 + rm -rf /tmp/couchjslogs && mkdir -p /tmp/couchjslogs + + # Build CouchDB from tarball builddir=$(mktemp -d) cd $builddir tar -xf $cwd/apache-couchdb-*.tar.gz cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) + + # Build CouchDB packages + cd $builddir + git clone https://github.com/apache/couchdb-pkg + mkdir couchdb + cd couchdb + cp $cwd/apache-couchdb-*.tar.gz . + tar -xf apache-couchdb-*.tar.gz + cd ../couchdb-pkg + # centos only + platform=centos7 + make $platform PLATFORM=$platform + rm -rf $cwd/pkgs/$platform && mkdir -p $cwd/pkgs/$platform + # CentOS variant + mv ~/rpmbuild/RPMS/x86_64/*rpm $cwd/pkgs/$platform || true + + # Cleanup + cd $cwd && rm -rf $builddir + chown -R jenkins:jenkins * ''' } // withDocker } // timeout + archiveArtifacts artifacts: 'pkgs/**', fingerprint: true + deleteDir() } // node }, ubuntu1204erlang183: { node(label: 'ubuntu') { - timeout(time: 30, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 45, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/ubuntu-12.04-erlang-18.3' - withDockerContainer(image: 'couchdbdev/ubuntu-12.04-erlang-18.3', args: '--user 0:0') { + withDockerContainer(image: 'couchdbdev/ubuntu-12.04-erlang-18.3', args: '-e npm_config_cache=npm-cache -e HOME=. -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group') { sh ''' cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -143,19 +194,19 @@ pipeline { cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) ''' } // withDocker } // timeout + deleteDir() } // node }, ubuntu1404erlangdefault: { node(label: 'ubuntu') { - timeout(time: 30, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 45, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/ubuntu-14.04-erlang-default' - withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-default', args: '--user 0:0') { + withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-default', args: '-e npm_config_cache=npm-cache -e HOME=. -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group') { sh ''' cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -166,42 +217,65 @@ pipeline { cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) ''' } // withDocker } // timeout + deleteDir() } // node }, ubuntu1404erlang183: { node(label: 'ubuntu') { - timeout(time: 30, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 60, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/ubuntu-14.04-erlang-18.3' - withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-18.3', args: '--user 0:0') { + withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-18.3', args: '-v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group --user 0:0') { sh ''' cwd=$(pwd) - rm -rf /tmp/couchjslogs - mkdir -p /tmp/couchjslogs + umask 0 + rm -rf /tmp/couchjslogs && mkdir -p /tmp/couchjslogs + + # Build CouchDB from tarball builddir=$(mktemp -d) cd $builddir tar -xf $cwd/apache-couchdb-*.tar.gz cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) + + # Build CouchDB packages + cd $builddir + git clone https://github.com/apache/couchdb-pkg + mkdir couchdb + cd couchdb + cp $cwd/apache-couchdb-*.tar.gz . + tar -xf apache-couchdb-*.tar.gz + cd ../couchdb-pkg + # debian/ubuntu only + sudo apt-get install -y libmozjs185-dev + platform=$(lsb_release -cs) + make $platform PLATFORM=$platform + rm -rf $cwd/pkgs/$platform && mkdir -p $cwd/pkgs/$platform + # Ubuntu/Debian variant + mv ../couchdb/*deb $cwd/pkgs/$platform || true + + # Cleanup + cd $cwd && rm -rf $builddir + chown -R jenkins:jenkins * ''' } // withDocker } // timeout + archiveArtifacts artifacts: 'pkgs/**', fingerprint: true + deleteDir() } // node }, ubuntu1604erlangdefault: { node(label: 'ubuntu') { - timeout(time: 30, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 45, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/ubuntu-16.04-erlang-default' - withDockerContainer(image: 'couchdbdev/ubuntu-16.04-erlang-default', args: '--user 0:0') { + withDockerContainer(image: 'couchdbdev/ubuntu-16.04-erlang-default', args: '-e npm_config_cache=npm-cache -e HOME=. -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group') { sh ''' cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -212,42 +286,65 @@ pipeline { cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) ''' } // withDocker } // timeout + deleteDir() } // node }, ubuntu1604erlang183: { node(label: 'ubuntu') { - timeout(time: 30, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 60, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/ubuntu-16.04-erlang-18.3' - withDockerContainer(image: 'couchdbdev/ubuntu-16.04-erlang-18.3', args: '--user 0:0') { + withDockerContainer(image: 'couchdbdev/ubuntu-16.04-erlang-18.3', args: '-v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group --user 0:0') { sh ''' cwd=$(pwd) - rm -rf /tmp/couchjslogs - mkdir -p /tmp/couchjslogs + umask 0 + rm -rf /tmp/couchjslogs && mkdir -p /tmp/couchjslogs + + # Build CouchDB from tarball builddir=$(mktemp -d) cd $builddir tar -xf $cwd/apache-couchdb-*.tar.gz cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) + + # Build CouchDB packages + cd $builddir + git clone https://github.com/apache/couchdb-pkg + mkdir couchdb + cd couchdb + cp $cwd/apache-couchdb-*.tar.gz . + tar -xf apache-couchdb-*.tar.gz + cd ../couchdb-pkg + # debian/ubuntu only + sudo apt-get install -y libmozjs185-dev + platform=$(lsb_release -cs) + make $platform PLATFORM=$platform + rm -rf $cwd/pkgs/$platform && mkdir -p $cwd/pkgs/$platform + # Ubuntu/Debian variant + mv ../couchdb/*deb $cwd/pkgs/$platform || true + + # Cleanup + cd $cwd && rm -rf $builddir + chown -R jenkins:jenkins * ''' } // withDocker } // timeout + archiveArtifacts artifacts: 'pkgs/**', fingerprint: true + deleteDir() } // node }, debian8erlangdefault: { node(label: 'ubuntu') { - timeout(time: 30, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 45, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/debian-8-erlang-default' - withDockerContainer(image: 'couchdbdev/debian-8-erlang-default', args: '--user 0:0') { + withDockerContainer(image: 'couchdbdev/debian-8-erlang-default', args: '-e npm_config_cache=npm-cache -e HOME=. -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group') { sh ''' cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -258,33 +355,57 @@ pipeline { cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) ''' } // withDocker } // timeout + deleteDir() } // node }, debian8erlang183: { node(label: 'ubuntu') { - timeout(time: 30, unit: "MINUTES") { - sh 'rm *.tar.gz || true' + timeout(time: 60, unit: "MINUTES") { unstash 'tarball' sh 'docker pull couchdbdev/debian-8-erlang-18.3' - withDockerContainer(image: 'couchdbdev/debian-8-erlang-18.3', args: '--user 0:0') { + // must run as root because of sudo step below + withDockerContainer(image: 'couchdbdev/debian-8-erlang-18.3', args: '-v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group --user 0:0') { sh ''' cwd=$(pwd) - rm -rf /tmp/couchjslogs - mkdir -p /tmp/couchjslogs + rm -rf /tmp/couchjslogs && mkdir -p /tmp/couchjslogs + + # Build CouchDB from tarball builddir=$(mktemp -d) cd $builddir tar -xf $cwd/apache-couchdb-*.tar.gz cd apache-couchdb-* ./configure --with-curl make all - make check || (build-aux/logfile-uploader.py && false) + #make check || (build-aux/logfile-uploader.py && false) + + # Build CouchDB packages + cd $builddir + git clone https://github.com/apache/couchdb-pkg + mkdir couchdb + cd couchdb + cp $cwd/apache-couchdb-*.tar.gz . + tar -xf apache-couchdb-*.tar.gz + cd ../couchdb-pkg + # debian/ubuntu only + sudo apt-get install -y libmozjs185-dev + platform=$(lsb_release -cs) + make $platform PLATFORM=$platform + rm -rf $cwd/pkgs/$platform && mkdir -p $cwd/pkgs/$platform + # Ubuntu/Debian variant + mv ../couchdb/*deb $cwd/pkgs/$platform || true + + # Cleanup + cd $cwd && rm -rf $builddir + chown -R jenkins:jenkins * ''' } // withDocker } // timeout + archiveArtifacts artifacts: 'pkgs/**', fingerprint: true + deleteDir() } // node } ) // parallel @@ -293,22 +414,56 @@ pipeline { stage('Publish') { when { - branch '*(master|2.0.x|2.1.x)' + expression { return env.BRANCH_NAME ==~ /master|2.0.x|2.1.x|jenkins-.*/ } } - agent any - steps { - /* Push it somewhere useful other than Jenkins, maybe? */ - /* echo 'Publishing tarball...' - unstash 'tarball' */ - echo 'Triggering Debian .deb builds...' - echo 'Triggering Ubuntu .deb builds...' - echo 'Triggering Ubuntu snap builds...' - echo 'Triggering CentOS .rpm builds...' - echo 'Cleaning workspace...' - sh 'rm -rf * .[a-zA-Z]*' + agent { + docker { + // This image has the deb AND rpm repo tools installed in it + image 'couchdbdev/debian-8-base' + // We need the jenkins user mapped inside of the image + args '-v /etc/passwd:/etc/passwd -v /etc/group:/etc/group' + label 'ubuntu' + } } - } - } + steps { + withCredentials([file(credentialsId: 'jenkins-key', variable: 'KEY')]) { + sh 'rm -rf pkgs' + unarchive mapping: ['pkgs/' : '.'] + echo 'Building Debian repo...' + sh ''' + git clone https://github.com/apache/couchdb-pkg + reprepro -b couchdb-pkg/repo includedeb jessie pkgs/jessie/*deb + reprepro -b couchdb-pkg/repo includedeb trusty pkgs/trusty/*deb + reprepro -b couchdb-pkg/repo includedeb xenial pkgs/xenial/*deb + ''' + echo 'Building CentOS repos...' + sh ''' + cd pkgs/centos6 && createrepo --database . + cd ../centos7 && rm js* && createrepo --database . + ''' + echo 'rsyncing repos to couchdb-vm2...' + sh ''' + mkdir -p $BRANCH_NAME/debian $BRANCH_NAME/el6 $BRANCH_NAME/el7 + mv couchdb-pkg/repo/pool $BRANCH_NAME/debian + mv couchdb-pkg/repo/dists $BRANCH_NAME/debian + mv pkgs/centos6/* $BRANCH_NAME/el6 + mv pkgs/centos7/* $BRANCH_NAME/el7 + rsync -avz --delete -e "ssh -i $KEY" $BRANCH_NAME [email protected]:/var/www/html + ''' + // cronjob on couchdb-vm2 cleans up old tarballs (keeps latest 10) + echo 'rsyncing source tarball to couchdb-vm2...' + unstash 'tarball' + sh ''' + rm -rf $BRANCH_NAME + mkdir -p $BRANCH_NAME/source + mv apache-couchdb-*.tar.gz $BRANCH_NAME/source + rsync -avz -e "ssh -i $KEY" $BRANCH_NAME [email protected]:/var/www/html + ''' + deleteDir() + } // withCredentials + } // steps + } // stage + } // stages post { success { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
