diff options
| author | Jan Lehnardt <jan@apache.org> | 2018-03-05 12:49:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 12:49:46 +0100 |
| commit | b51c8efeedda6ac8682307e2ffbd20a71f8c65fb (patch) | |
| tree | 05522474fefc4e690d48dab702f469e08f23e922 | |
| parent | 59c0f1127b9f90a79cf3ba4b7275c8f19e573f59 (diff) | |
| parent | 51cb6aecc42eaa12058113003a3b4af7234250a8 (diff) | |
| download | couchdb-pse-remove-unused-notify-option.tar.gz | |
Merge branch 'master' into pse-remove-unused-notify-optionpse-remove-unused-notify-option
| -rw-r--r-- | Jenkinsfile | 117 | ||||
| -rw-r--r-- | src/couch/src/test_engine_util.erl | 2 |
2 files changed, 1 insertions, 118 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 221e96f45..905a85f29 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -118,31 +118,6 @@ pipeline { deleteDir() } // node }, - centos7erlangdefault: { - node(label: 'ubuntu') { - timeout(time: 45, unit: "MINUTES") { - sh 'docker pull couchdbdev/centos-7-erlang-default' - withDockerContainer(image: 'couchdbdev/centos-7-erlang-default', args: '-e LD_LIBRARY_PATH=/usr/local/bin') { - sh 'rm -f apache-couchdb-*.tar.gz' - unstash 'tarball' - sh ''' - cwd=$(pwd) - mkdir -p $COUCHDB_IO_LOG_DIR - - # 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) - ''' - } // withDocker - } // timeout - deleteDir() - } // node - }, centos7erlang183: { node(label: 'ubuntu') { timeout(time: 60, unit: "MINUTES") { @@ -183,29 +158,6 @@ pipeline { deleteDir() } // node }, - ubuntu1404erlangdefault: { - node(label: 'ubuntu') { - timeout(time: 45, unit: "MINUTES") { - sh 'docker pull couchdbdev/ubuntu-14.04-erlang-default' - withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-default') { - sh 'rm -f apache-couchdb-*.tar.gz' - unstash 'tarball' - sh ''' - cwd=$(pwd) - mkdir -p $COUCHDB_IO_LOG_DIR - 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) - ''' - } // withDocker - } // timeout - deleteDir() - } // node - }, ubuntu1404erlang183: { node(label: 'ubuntu') { timeout(time: 60, unit: "MINUTES") { @@ -246,29 +198,6 @@ pipeline { deleteDir() } // node }, - ubuntu1604erlangdefault: { - node(label: 'ubuntu') { - timeout(time: 45, unit: "MINUTES") { - sh 'docker pull couchdbdev/ubuntu-16.04-erlang-default' - withDockerContainer(image: 'couchdbdev/ubuntu-16.04-erlang-default') { - sh 'rm -f apache-couchdb-*.tar.gz' - unstash 'tarball' - sh ''' - cwd=$(pwd) - mkdir -p $COUCHDB_IO_LOG_DIR - 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) - ''' - } // withDocker - } // timeout - deleteDir() - } // node - }, ubuntu1604erlang183: { node(label: 'ubuntu') { timeout(time: 60, unit: "MINUTES") { @@ -309,29 +238,6 @@ pipeline { deleteDir() } // node }, - debian8erlangdefault: { - node(label: 'ubuntu') { - timeout(time: 45, unit: "MINUTES") { - sh 'docker pull couchdbdev/debian-8-erlang-default' - withDockerContainer(image: 'couchdbdev/debian-8-erlang-default') { - sh 'rm -f apache-couchdb-*.tar.gz' - unstash 'tarball' - sh ''' - cwd=$(pwd) - mkdir -p $COUCHDB_IO_LOG_DIR - 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) - ''' - } // withDocker - } // timeout - deleteDir() - } // node - }, debian8erlang183: { node(label: 'ubuntu') { timeout(time: 60, unit: "MINUTES") { @@ -372,29 +278,6 @@ pipeline { deleteDir() } // node }, - debian9erlangdefault: { - node(label: 'ubuntu') { - timeout(time: 45, unit: "MINUTES") { - sh 'docker pull couchdbdev/debian-9-erlang-default' - withDockerContainer(image: 'couchdbdev/debian-9-erlang-default') { - sh 'rm -f apache-couchdb-*.tar.gz' - unstash 'tarball' - sh ''' - cwd=$(pwd) - mkdir -p $COUCHDB_IO_LOG_DIR - 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) - ''' - } // withDocker - } // timeout - deleteDir() - } // node - }, debian9erlang183: { node(label: 'ubuntu') { timeout(time: 60, unit: "MINUTES") { diff --git a/src/couch/src/test_engine_util.erl b/src/couch/src/test_engine_util.erl index c81acd03d..790fe30fe 100644 --- a/src/couch/src/test_engine_util.erl +++ b/src/couch/src/test_engine_util.erl @@ -58,7 +58,7 @@ gather(Module) -> case {atom_to_list(Fun), Arity} of {[$c, $e, $t, $_ | _], 0} -> TestFun = make_test_fun(Module, Fun), - [{spawn, TestFun} | Acc]; + [{timeout, 60, {spawn, TestFun}} | Acc]; _ -> Acc end |