You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2019/08/06 06:17:17 UTC

[couchdb] branch jenkins-junit-reports-and-jenkins-env updated (3c26a49 -> 6b9cd14)

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a change to branch jenkins-junit-reports-and-jenkins-env
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    from 3c26a49  Plugin not installed
     new 59e4213  Reenable all platforms
     new 6b9cd14  Use git plugin

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Jenkinsfile | 464 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 261 insertions(+), 203 deletions(-)


[couchdb] 01/02: Reenable all platforms

Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch jenkins-junit-reports-and-jenkins-env
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 59e4213eec8c8a2096f36260f275b60ae176f137
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Aug 6 02:05:19 2019 -0400

    Reenable all platforms
---
 Jenkinsfile | 454 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 253 insertions(+), 201 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b8424f2..35d9604 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -144,7 +144,7 @@ pipeline {
     // their build results to each other during the build, which ACTUALLY
     // HAPPENS. Ugh.
 
-    stage('make check') {
+    stage('Test and Package') {
 
       parallel {
 
@@ -231,211 +231,263 @@ pipeline {
           } // post
         } // stage
 
-        // stage('CentOS 7') {
-        //   agent {
-        //     docker {
-        //       image 'couchdbdev/centos-7-erlang-19.3.6:latest'
-        //       alwaysPull true
-        //       label 'ubuntu'
-        //     }
-        //   }
-        //   options {
-        //     skipDefaultCheckout()
-        //     timeout(time: 90, unit: "MINUTES")
-        //   }
-        //   environment {
-        //     platform = 'centos7'
-        //   }
-        //   steps {
-        //     sh 'rm -f apache-couchdb-*.tar.gz'
-        //     unstash 'tarball'
-        //     sh( script: build_script )
-        //   } // steps
-        //   post {
-        //     always {
-        //       junit 'build/apache-couchdb-*/src/*/.eunit/*.xml'
-        //       junit 'build/apache-couchdb-*/_build/*/lib/couchdbtest/*.xml'
-        //     }
-        //     success {
-        //       archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-        //     }
-        //     cleanup {
-        //       sh 'rm -rf ${builddir} ${COUCHDB_IO_LOG_DIR}'
-        //     }
-        //   } // post
-        // } // stage
+        stage('CentOS 7') {
+          agent {
+            docker {
+              image 'couchdbdev/centos-7-erlang-19.3.6:latest'
+              alwaysPull true
+              label 'ubuntu'
+              customWorkspace pwd() + '/centos7'
+            }
+          }
+          options {
+            skipDefaultCheckout()
+            timeout(time: 90, unit: "MINUTES")
+          }
+          environment {
+            platform = 'centos7'
+          }
+          stages {
+            stage('Build from tarball & test') {
+              steps {
+                unstash 'tarball'
+                sh( script: build_and_test )
+              }
+            }
+            stage('Build CouchDB packages') {
+              steps {
+                sh( script: make_packages )
+                sh( script: cleanup_and_save )
+              }
+            }
+          } // stages
+          post {
+            always {
+              junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml'
+            }
+            success {
+              archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+            }
+            cleanup {
+              sh 'rm -rf ${WORKSPACE}'
+            }
+          } // post
+        } // stage
 
-        // stage('Ubuntu Xenial') {
-        //   agent {
-        //     docker {
-        //       image 'couchdbdev/ubuntu-xenial-erlang-19.3.6:latest'
-        //       alwaysPull true
-        //       label 'ubuntu'
-        //     }
-        //   }
-        //   options {
-        //     skipDefaultCheckout()
-        //     timeout(time: 90, unit: "MINUTES")
-        //   }
-        //   environment {
-        //     platform = 'xenial'
-        //   }
-        //   steps {
-        //     sh 'rm -f apache-couchdb-*.tar.gz'
-        //     unstash 'tarball'
-        //     sh( script: build_script )
-        //   } // steps
-        //   post {
-        //     always {
-        //       junit 'build/apache-couchdb-*/src/*/.eunit/*.xml'
-        //       junit 'build/apache-couchdb-*/_build/*/lib/couchdbtest/*.xml'
-        //     }
-        //     success {
-        //       archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-        //     }
-        //     cleanup {
-        //       sh 'rm -rf ${builddir} ${COUCHDB_IO_LOG_DIR}'
-        //     }
-        //   } // post
-        // } // stage
+        stage('Ubuntu Xenial') {
+          agent {
+            docker {
+              image 'couchdbdev/ubuntu-xenial-erlang-19.3.6:latest'
+              alwaysPull true
+              label 'ubuntu'
+              customWorkspace pwd() + '/xenial'
+            }
+          }
+          options {
+            skipDefaultCheckout()
+            timeout(time: 90, unit: "MINUTES")
+          }
+          environment {
+            platform = 'xenial'
+          }
+          stages {
+            stage('Build from tarball & test') {
+              steps {
+                unstash 'tarball'
+                sh( script: build_and_test )
+              }
+            }
+            stage('Build CouchDB packages') {
+              steps {
+                sh( script: make_packages )
+                sh( script: cleanup_and_save )
+              }
+            }
+          } // stages
+          post {
+            always {
+              junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml'
+            }
+            success {
+              archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+            }
+            cleanup {
+              sh 'rm -rf ${WORKSPACE}'
+            }
+          } // post
+        } // stage
 
-        // stage('Ubuntu Bionic') {
-        //   agent {
-        //     docker {
-        //       image 'couchdbdev/ubuntu-bionic-erlang-19.3.6:latest'
-        //       alwaysPull true
-        //       label 'ubuntu'
-        //     }
-        //   }
-        //   options {
-        //     skipDefaultCheckout()
-        //     timeout(time: 90, unit: "MINUTES")
-        //   }
-        //   environment {
-        //     platform = 'bionic'
-        //   }
-        //   steps {
-        //     sh 'rm -f apache-couchdb-*.tar.gz'
-        //     unstash 'tarball'
-        //     sh( script: build_script )
-        //   } // steps
-        //   post {
-        //     always {
-        //       junit 'build/apache-couchdb-*/src/*/.eunit/*.xml'
-        //       junit 'build/apache-couchdb-*/_build/*/lib/couchdbtest/*.xml'
-        //     }
-        //     success {
-        //       archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-        //     }
-        //     cleanup {
-        //       sh 'rm -rf ${builddir} ${COUCHDB_IO_LOG_DIR}'
-        //     }
-        //   } // post
-        // } // stage
+        stage('Ubuntu Bionic') {
+          agent {
+            docker {
+              image 'couchdbdev/ubuntu-bionic-erlang-19.3.6:latest'
+              alwaysPull true
+              label 'ubuntu'
+              customWorkspace pwd() + '/bionic'
+            }
+          }
+          options {
+            skipDefaultCheckout()
+            timeout(time: 90, unit: "MINUTES")
+          }
+          environment {
+            platform = 'bionic'
+          }
+          stages {
+            stage('Build from tarball & test') {
+              steps {
+                unstash 'tarball'
+                sh( script: build_and_test )
+              }
+            }
+            stage('Build CouchDB packages') {
+              steps {
+                sh( script: make_packages )
+                sh( script: cleanup_and_save )
+              }
+            }
+          } // stages
+          post {
+            always {
+              junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml'
+            }
+            success {
+              archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+            }
+            cleanup {
+              sh 'rm -rf ${WORKSPACE}'
+            }
+          } // post
+        } // stage
 
-        // stage('Debian Jessie') {
-        //   agent {
-        //     docker {
-        //       image 'couchdbdev/debian-jessie-erlang-19.3.6:latest'
-        //       alwaysPull true
-        //       label 'ubuntu'
-        //     }
-        //   }
-        //   options {
-        //     skipDefaultCheckout()
-        //     timeout(time: 90, unit: "MINUTES")
-        //   }
-        //   environment {
-        //     platform = 'jessie'
-        //   }
-        //   steps {
-        //     sh 'rm -f apache-couchdb-*.tar.gz'
-        //     unstash 'tarball'
-        //     sh( script: build_script )
-        //   } // steps
-        //   post {
-        //     always {
-        //       junit 'build/apache-couchdb-*/src/*/.eunit/*.xml'
-        //       junit 'build/apache-couchdb-*/_build/*/lib/couchdbtest/*.xml'
-        //     }
-        //     success {
-        //       archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-        //     }
-        //     cleanup {
-        //       sh 'rm -rf ${builddir} ${COUCHDB_IO_LOG_DIR}'
-        //     }
-        //   } // post
-        // } // stage
+        stage('Debian Jessie') {
+          agent {
+            docker {
+              image 'couchdbdev/debian-jessie-erlang-19.3.6:latest'
+              alwaysPull true
+              label 'ubuntu'
+              customWorkspace pwd() + '/jessie'
+            }
+          }
+          options {
+            skipDefaultCheckout()
+            timeout(time: 90, unit: "MINUTES")
+          }
+          environment {
+            platform = 'jessie'
+          }
+          stages {
+            stage('Build from tarball & test') {
+              steps {
+                unstash 'tarball'
+                sh( script: build_and_test )
+              }
+            }
+            stage('Build CouchDB packages') {
+              steps {
+                sh( script: make_packages )
+                sh( script: cleanup_and_save )
+              }
+            }
+          } // stages
+          post {
+            always {
+              junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml'
+            }
+            success {
+              archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+            }
+            cleanup {
+              sh 'rm -rf ${WORKSPACE}'
+            }
+          } // post
+        } // stage
 
-        // stage('Debian Stretch x86_64') {
-        //   agent {
-        //     docker {
-        //       image 'couchdbdev/debian-stretch-erlang-19.3.6:latest'
-        //       alwaysPull true
-        //       label 'ubuntu'
-        //     }
-        //   }
-        //   options {
-        //     skipDefaultCheckout()
-        //     timeout(time: 90, unit: "MINUTES")
-        //   }
-        //   environment {
-        //     platform = 'stretch'
-        //   }
-        //   steps {
-        //     sh 'rm -f apache-couchdb-*.tar.gz'
-        //     unstash 'tarball'
-        //     sh( script: build_script )
-        //   } // steps
-        //   post {
-        //     always {
-        //       junit 'build/apache-couchdb-*/src/*/.eunit/*.xml'
-        //       junit 'build/apache-couchdb-*/_build/*/lib/couchdbtest/*.xml'
-        //     }
-        //     success {
-        //       archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-        //     }
-        //     cleanup {
-        //       sh 'rm -rf ${builddir} ${COUCHDB_IO_LOG_DIR}'
-        //     }
-        //   } // post
-        // } // stage
+        stage('Debian Stretch x86_64') {
+          agent {
+            docker {
+              image 'couchdbdev/debian-stretch-erlang-19.3.6:latest'
+              alwaysPull true
+              label 'ubuntu'
+              customWorkspace pwd() + '/stretch'
+            }
+          }
+          options {
+            skipDefaultCheckout()
+            timeout(time: 90, unit: "MINUTES")
+          }
+          environment {
+            platform = 'stretch'
+          }
+          stages {
+            stage('Build from tarball & test') {
+              steps {
+                unstash 'tarball'
+                sh( script: build_and_test )
+              }
+            }
+            stage('Build CouchDB packages') {
+              steps {
+                sh( script: make_packages )
+                sh( script: cleanup_and_save )
+              }
+            }
+          } // stages
+          post {
+            always {
+              junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml'
+            }
+            success {
+              archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+            }
+            cleanup {
+              sh 'rm -rf ${WORKSPACE}'
+            }
+          } // post
+        } // stage
 
-        // stage('Debian Stretch aarch64') {
-        //   agent {
-        //     docker {
-        //       image 'couchdbdev/aarch64-debian-stretch-erlang-20.3.8.20:latest'
-        //       alwaysPull true
-        //       label 'arm'
-        //     }
-        //   }
-        //   options {
-        //     skipDefaultCheckout()
-        //     timeout(time: 90, unit: "MINUTES")
-        //   }
-        //   environment {
-        //     platform = 'stretch'
-        //   }
-        //   steps {
-        //     sh 'rm -f apache-couchdb-*.tar.gz'
-        //     unstash 'tarball'
-        //     withEnv(['MIX_HOME='+pwd()]) {
-        //       sh( script: build_script )
-        //     }
-        //   } // steps
-        //   post {
-        //     always {
-        //       junit 'build/apache-couchdb-*/src/*/.eunit/*.xml'
-        //       junit 'build/apache-couchdb-*/_build/*/lib/couchdbtest/*.xml'
-        //     }
-        //     success {
-        //       archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-        //     }
-        //     cleanup {
-        //       sh 'rm -rf ${builddir} ${COUCHDB_IO_LOG_DIR}'
-        //     }
-        //   } // post
-        // } // stage
+        stage('Debian Stretch aarch64') {
+          agent {
+            docker {
+              image 'couchdbdev/aarch64-debian-stretch-erlang-20.3.8.20:latest'
+              alwaysPull true
+              label 'arm'
+              customWorkspace pwd() + '/arm'
+            }
+          }
+          options {
+            skipDefaultCheckout()
+            timeout(time: 90, unit: "MINUTES")
+          }
+          environment {
+            platform = 'stretch'
+          }
+          stages {
+            stage('Build from tarball & test') {
+              steps {
+                unstash 'tarball'
+                sh( script: build_and_test )
+              }
+            }
+            stage('Build CouchDB packages') {
+              steps {
+                sh( script: make_packages )
+                sh( script: cleanup_and_save )
+              }
+            }
+          } // stages
+          post {
+            always {
+              junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml'
+            }
+            success {
+              archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+            }
+            cleanup {
+              sh 'rm -rf ${WORKSPACE}'
+            }
+          } // post
+        } // stage
 
       } // parallel
     } // stage "Make Check"


[couchdb] 02/02: Use git plugin

Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch jenkins-junit-reports-and-jenkins-env
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 6b9cd1440c2188cc4b21fd4a47bae473cbb1ca4f
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Aug 6 02:17:07 2019 -0400

    Use git plugin
---
 Jenkinsfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 35d9604..0b06006 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,7 +25,6 @@ make eunit apps=couch || (build-aux/logfile-uploader.py && false)
 '''
 
 make_packages = '''
-git clone https://github.com/apache/couchdb-pkg
 rm -rf couchdb
 mkdir couchdb
 cp ${WORKSPACE}/apache-couchdb-*.tar.gz couchdb
@@ -36,7 +35,7 @@ make ${platform} PLATFORM=${platform}
 
 cleanup_and_save = '''
 rm -rf ${WORKSPACE}/pkgs/${platform}
-mkdir ${WORKSPACE}/pkgs/${platform}
+mkdir -p ${WORKSPACE}/pkgs/${platform}
 mv ${WORKSPACE}/rpmbuild/RPMS/$(arch)/*rpm ${WORKSPACE}/pkgs/${platform} || true
 mv ${WORKSPACE}/couchdb/*.deb ${WORKSPACE}/pkgs/${platform} || true
 '''
@@ -213,6 +212,7 @@ pipeline {
             }
             stage('Build CouchDB packages') {
               steps {
+                git 'https://github.com/apache/couchdb-pkg'
                 sh( script: make_packages )
                 sh( script: cleanup_and_save )
               }
@@ -256,6 +256,7 @@ pipeline {
             }
             stage('Build CouchDB packages') {
               steps {
+                git 'https://github.com/apache/couchdb-pkg'
                 sh( script: make_packages )
                 sh( script: cleanup_and_save )
               }
@@ -299,6 +300,7 @@ pipeline {
             }
             stage('Build CouchDB packages') {
               steps {
+                git 'https://github.com/apache/couchdb-pkg'
                 sh( script: make_packages )
                 sh( script: cleanup_and_save )
               }
@@ -342,6 +344,7 @@ pipeline {
             }
             stage('Build CouchDB packages') {
               steps {
+                git 'https://github.com/apache/couchdb-pkg'
                 sh( script: make_packages )
                 sh( script: cleanup_and_save )
               }
@@ -385,6 +388,7 @@ pipeline {
             }
             stage('Build CouchDB packages') {
               steps {
+                git 'https://github.com/apache/couchdb-pkg'
                 sh( script: make_packages )
                 sh( script: cleanup_and_save )
               }
@@ -428,6 +432,7 @@ pipeline {
             }
             stage('Build CouchDB packages') {
               steps {
+                git 'https://github.com/apache/couchdb-pkg'
                 sh( script: make_packages )
                 sh( script: cleanup_and_save )
               }
@@ -471,6 +476,7 @@ pipeline {
             }
             stage('Build CouchDB packages') {
               steps {
+                git 'https://github.com/apache/couchdb-pkg'
                 sh( script: make_packages )
                 sh( script: cleanup_and_save )
               }