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 03:38:34 UTC

[couchdb] branch jenkins-dynamic-matrix updated: Fix stage name

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

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


The following commit(s) were added to refs/heads/jenkins-dynamic-matrix by this push:
     new c3b6809  Fix stage name
c3b6809 is described below

commit c3b680945b7d530f80c7b36610a8078c35a4c08b
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Jan 17 22:38:21 2022 -0500

    Fix stage name
---
 build-aux/Jenkinsfile.full | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index e7e00af..0cf41e7 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -175,7 +175,9 @@ def generateNativeStage(platform) {
 
 def generateContainerStage(platform) {
   return {
-    stage(meta[platform].name) {
+    // Important: the stage name here must match the parallelStagesMap key for the
+    // Jenkins UI to render the pipeline stages correctly. Don't ask why. -APK
+    stage(platform) {
       // TODO allow for other labels, e.g. arm64v8
       node('docker') {
         docker.withRegistry('https://docker.io/', 'dockerhub_creds') {
@@ -211,20 +213,20 @@ def generateContainerStage(platform) {
                 }
 
                 stage("${meta[platform].name} - package") {
-                  // try {
+                  try {
                     sh 'pwd; ls -l'
                     unstash 'tarball'
                     sh( script: make_packages, label: 'Build packages' )
                     sh( script: cleanup_and_save, label: 'Stage package artifacts for archival' )
                     archiveArtifacts artifacts: 'pkgs/**', fingerprint: true, onlyIfSuccessful: true
-                  // }
-                  // catch (err) {
-                  //   echo "Packaging failed: {$err}"
-                  //   sh 'ls -l ${WORKSPACE}'
-                  // }
-                  // finally {
-                    // deleteDir()
-                  // }
+                  }
+                  catch (err) {
+                    echo "Packaging failed: {$err}"
+                    sh 'ls -l ${WORKSPACE}'
+                  }
+                  finally {
+                    deleteDir()
+                  }
                 }
               }
             }