summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Vatamaniuc <vatamane@apache.org>2017-06-14 16:01:09 -0400
committerNick Vatamaniuc <nickva@users.noreply.github.com>2017-06-14 17:37:31 -0400
commit73f6b18f7bd83ef21e05436a6497b7cd207156f3 (patch)
tree1dea25baf5c916b4a2584eccb85eee0afaf26498
parent1ae5d570e1a319b6d5c080bab253b0d9b1fd7eb7 (diff)
downloadcouchdb-73f6b18f7bd83ef21e05436a6497b7cd207156f3.tar.gz
Enable OS process IO logging + upload for Travis and Jenkins tests
Issue #551
-rw-r--r--.travis.yml3
-rw-r--r--Jenkinsfile21
-rwxr-xr-xbuild-aux/logfile-uploader.py3
3 files changed, 27 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 156856cc7..b1f54a79b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,7 @@ cache:
env:
global:
- secure: "UdA/gKIlyuXaW+hUgRx40t1TYjLCGxMqHvM5Uw7UbUH2dqEkgJiLfhZGchS1JVzl8M01VKZUUzS7v2nvRLiHZN1kvaw5kfq31VRoafUah8jfmvqNWZVdLovHl3aw5UX/HRt0RkbWbhdbdknTfh6+YinSZ+Nb54jCErMg9nabXtM="
+ - COUCHDB_IO_LOG_DIR=/tmp/couchjslogs
# Enable this block if you want to build docs & fauxton too
#node_js:
@@ -45,6 +46,8 @@ env:
# Then comment this section out
before_script:
+ - rm -rf /tmp/couchjslogs
+ - mkdir -p /tmp/couchjslogs
- ./configure -c --disable-docs --disable-fauxton
script:
diff --git a/Jenkinsfile b/Jenkinsfile
index 0ef6ddefd..6fbb7e7a1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,6 +19,7 @@ pipeline {
environment {
COUCHAUTH = credentials('couchdb_vm2_couchdb')
recipient = 'notifications@couchdb.apache.org'
+ COUCHDB_IO_LOG_DIR = '/tmp/couchjslogs'
}
stages {
@@ -65,6 +66,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/centos-6-erlang-18.3', args: '-e LD_LIBRARY_PATH=/usr/local/bin --user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
@@ -86,6 +89,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/centos-7-erlang-default', args: '-e LD_LIBRARY_PATH=/usr/local/bin --user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
@@ -107,6 +112,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/centos-7-erlang-18.3', args: '-e LD_LIBRARY_PATH=/usr/local/bin --user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
@@ -128,6 +135,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/ubuntu-12.04-erlang-18.3', args: '--user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
@@ -149,6 +158,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-default', args: '--user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
@@ -170,6 +181,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-18.3', args: '--user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
@@ -191,6 +204,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/ubuntu-16.04-erlang-default', args: '--user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
@@ -212,6 +227,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/ubuntu-16.04-erlang-18.3', args: '--user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
@@ -233,6 +250,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/debian-8-erlang-default', args: '--user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
@@ -254,6 +273,8 @@ pipeline {
withDockerContainer(image: 'couchdbdev/debian-8-erlang-18.3', args: '--user 0:0') {
sh '''
cwd=$(pwd)
+ rm -rf /tmp/couchjslogs
+ mkdir -p /tmp/couchjslogs
builddir=$(mktemp -d)
cd $builddir
tar -xf $cwd/apache-couchdb-*.tar.gz
diff --git a/build-aux/logfile-uploader.py b/build-aux/logfile-uploader.py
index d58d9f0ed..742fc8501 100755
--- a/build-aux/logfile-uploader.py
+++ b/build-aux/logfile-uploader.py
@@ -41,6 +41,9 @@ def collect_logfiles():
# JS harness
for log in glob.glob('dev/logs/node1.log'):
tb.add(log)
+ # couchjs OS process IO logs
+ for log in glob.glob('/tmp/couchjslogs/*'):
+ tb.add(log)
tb.close()
def build_ci_doc():