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 2022/01/18 19:25:54 UTC

[couchdb] branch jenkins-dynamic-matrix-throwaway updated (381e82e -> f6c8c74)

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

kocolosk pushed a change to branch jenkins-dynamic-matrix-throwaway
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    from 381e82e  Tweak error reporting a bit
     new b3ef1d4  Further improvements to README
     new f6c8c74  See if setting build result is needed

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:
 build-aux/Jenkinsfile.full | 16 +++++++---------
 build-aux/README.md        | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 10 deletions(-)

[couchdb] 01/02: Further improvements to README

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

kocolosk pushed a commit to branch jenkins-dynamic-matrix-throwaway
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit b3ef1d4237896db114341f8641e41f01f9cbe9c9
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Jan 18 13:56:43 2022 -0500

    Further improvements to README
---
 build-aux/README.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/build-aux/README.md b/build-aux/README.md
index 88649d9..72cef94 100644
--- a/build-aux/README.md
+++ b/build-aux/README.md
@@ -72,7 +72,7 @@ it's configured for CouchDB through the GUI:
 
 [2]: https://issues.apache.org/jira/browse/INFRA-17449 explains why "Discover pull requests from forks/Trust" has been set to "Nobody."
 
-## Full Platform builds on `main` and release branches
+## Full Platform Builds on `main` and release branches
 
 [![main branch status](https://ci-couchdb.apache.org/job/jenkins-cm1/job/FullPlatformMatrix/job/main/badge/icon?subject=main)](https://ci-couchdb.apache.org/blue/organizations/jenkins/jenkins-cm1%2FFullPlatformMatrix/activity?branch=main)
 [![3.x branch status](https://ci-couchdb.apache.org/job/jenkins-cm1/job/FullPlatformMatrix/job/3.x/badge/icon?subject=3.x)](https://ci-couchdb.apache.org/blue/organizations/jenkins/jenkins-cm1%2FFullPlatformMatrix/activity?branch=3.x)
@@ -113,3 +113,19 @@ Settings are as follows:
   * Days to keep old items: <blank>
   * Max # of old items to keep: 10
 * Everything else set as defaults.
+
+## Other Resources
+
+The [apache/couchdb-ci](https://github.com/apache/couchdb-ci) repo contains the
+dockerfiles that we use to generate the container images used for our
+container-based builds. These images are hosted on Docker Hub in the following
+repos:
+
+* [apache/couchdbci-debian](https://hub.docker.com/r/apache/couchdbci-debian)
+* [apache/couchdbci-ubuntu](https://hub.docker.com/r/apache/couchdbci-ubuntu)
+* [apache/couchdbci-centos](https://hub.docker.com/r/apache/couchdbci-centos)
+
+The [apache/couchdb-pkg](https://github.com/apache/couchdb-ci) repo contains
+a set of helper scripts to build binary packages for Debian / CentOS / Ubuntu
+from the contents of a release tarball. The packaging stage of our "Full
+Platform Builds" pipeline clones this repo to produces the package artifacts.

[couchdb] 02/02: See if setting build result is needed

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

kocolosk pushed a commit to branch jenkins-dynamic-matrix-throwaway
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit f6c8c7440599c1ae06fbd280a61398fa1da6d276
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Jan 18 14:25:40 2022 -0500

    See if setting build result is needed
---
 build-aux/Jenkinsfile.full | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index aaf64f2..01e966b 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -126,7 +126,7 @@ def generateNativeStage(platform) {
               dir( "${platform}/build" ) {
                 sh "./configure --skip-deps --spidermonkey-version ${meta[platform].spidermonkey_vsn}"
                 sh '$MAKE'
-                sh "${platform} == \"macos\" && false"
+                sh "\"${platform}\" == \"macos\" && false"
                 sh '$MAKE eunit'
                 sh '$MAKE elixir-suite'
                 sh '$MAKE exunit'
@@ -135,7 +135,6 @@ def generateNativeStage(platform) {
             }
           }
           catch (err) {
-            currentBuild.result = 'FAILURE'
             sh 'ls -l ${WORKSPACE}'
             withEnv([
                 'HOME='+pwd(),
@@ -147,7 +146,7 @@ def generateNativeStage(platform) {
                 sh '${MAKE} build-report'
               }
             }
-            error("{$err}")
+            error("Build step failed with error: ${err.getMessage()}")
           }
           finally {
             junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
@@ -180,7 +179,7 @@ def generateContainerStage(platform) {
                   dir( "${platform}/build" ) {
                     sh "./configure --skip-deps --spidermonkey-version ${meta[platform].spidermonkey_vsn}"
                     sh 'make'
-                    sh "${platform} == \"focal\" && false"
+                    sh "\"${platform}\" == \"focal\" && false"
                     sh 'make eunit'
                     sh 'make elixir-suite'
                     sh 'make exunit'
@@ -188,13 +187,12 @@ def generateContainerStage(platform) {
                   }
                 }
                 catch (err) {
-                  currentBuild.result = 'FAILURE'
                   sh 'ls -l ${WORKSPACE}'
                   dir( "${platform}/build" ) {
                     sh 'ls -l'
                     sh 'make build-report'
                   }
-                  error("{$err}")
+                  error("Build step failed with error: ${err.getMessage()}")
                 }
                 finally {
                   junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
@@ -208,7 +206,7 @@ def generateContainerStage(platform) {
                   sh( script: "mkdir -p ${platform}/couchdb", label: 'Create build directory' )
                   sh( script: "tar -xf apache-couchdb-*.tar.gz -C ${platform}/couchdb", label: 'Unpack release' )
                   sh( script: "cd ${platform} && git clone https://github.com/apache/couchdb-pkg", label: 'Clone packaging helper repo' )
-                  sh "${platform} == \"centos7\" && false"
+                  sh "\"${platform}\" == \"centos7\" && false"
                   dir( "${platform}/couchdb-pkg" ) {
                     sh( script: 'make', label: 'Build packages' )
                   }
@@ -221,9 +219,8 @@ def generateContainerStage(platform) {
                   archiveArtifacts artifacts: 'pkgs/**', fingerprint: true, onlyIfSuccessful: true
                 }
                 catch (err) {
-                  currentBuild.result = 'FAILURE'
                   sh 'ls -l ${WORKSPACE}'
-                  error("{$err}")
+                  error("Build step failed with error: ${err.getMessage()}")
                 }
                 finally {
                   sh 'rm -rf ${WORKSPACE}/*'
@@ -282,6 +279,7 @@ pipeline {
         spidermonkey = '78'
       }
       options {
+        // TODO start this timeout _after_ the agent has been acquired if possible
         timeout(time: 15, unit: "MINUTES")
       }
       steps {