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/16 17:20:36 UTC

[couchdb] branch jenkins-dynamic-matrix updated: Try a simpler matrix first

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 ceb15c1  Try a simpler matrix first
ceb15c1 is described below

commit ceb15c11fc5512ee105c9dd5f5eff2a89325a7ff
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sun Jan 16 12:20:28 2022 -0500

    Try a simpler matrix first
---
 build-aux/Jenkinsfile.full | 153 +++++++++++++++++++++++----------------------
 1 file changed, 77 insertions(+), 76 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 2068248..32f2f65 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -138,9 +138,10 @@ pipeline {
 
     stage('Test and Package') {
       steps {
-        dynamicMatrixMultiGroups([
+        dynamicMatrix([
+        // dynamicMatrixMultiGroups([
           // Group 1: non-containerized builds (MacOS, FreeBSD)
-          [
+          // [
             failFast: false,
             axes: [
               platform: ['macos', 'freebsd']
@@ -191,82 +192,82 @@ pipeline {
                 } // post
               }
             }
-          ],
+          // ],
 
           // Group 2: containerized builds for Linux distros
-          [
-            failFast: false,
-            axes: [
-              platform: ['centos7', 'centos8', 'bionic', 'focal', 'stretch', 'buster', 'bullseye']
-            ],
-            actions: {
-              stage("${platform}") {
-                agent {
-                  docker {
-                    image platform_images["${platform}"]
-                    label 'docker'
-                    args "${DOCKER_ARGS}"
-                    registryUrl 'https://docker.io/'
-                    registryCredentialsId 'dockerhub_creds'
-                  }
-                }
-
-                options {
-                  skipDefaultCheckout()
-                  timeout(time: 90, unit: "MINUTES")
-                }
-
-                stages {
-                  stage('Build from tarball & test') {
-                    steps {
-                      sh( script: 'rm -rf apache-couchdb-*', label: 'Clean workspace' )
-                      unstash 'tarball'
-                      sh( script: unpack, label: 'Unpack tarball' )
-                      dir( "${platform}/build/couchdb" ) {
-                        sh 'pwd'
-                        sh 'ls -l'
-                        sh "./configure --skip-deps --spidermonkey-version ${spidermonkey[env.platform]}"
-                        sh 'make'
-                        sh 'make eunit'
-                        sh 'make elixir-suite'
-                        sh 'make exunit'
-                        sh 'make mango-test'
-                      }
-                    }
-                    post {
-                      always {
-                        junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
-                      }
-                      failure {
-                        dir( "${platform}/build/couchdb" ) {
-                          sh 'make build-report'
-                        }
-                      }
-                    }
-                  }
-
-                  stage('Build CouchDB packages') {
-                    steps {
-                      unstash 'tarball'
-                      sh( script: make_packages, label: 'Build packages' )
-                      sh( script: cleanup_and_save, label: 'Stage package artifacts for archival' )
-                    }
-                    post {
-                      success {
-                        archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-                      }
-                    }
-                  }
-                }
-
-                post {
-                  cleanup {
-                    sh 'rm -rf ${WORKSPACE}/*'
-                  }
-                } // post
-              } // containerized platform
-            }
-          ]
+          // [
+          //   failFast: false,
+          //   axes: [
+          //     platform: ['centos7', 'centos8', 'bionic', 'focal', 'stretch', 'buster', 'bullseye']
+          //   ],
+          //   actions: {
+          //     stage("${platform}") {
+          //       agent {
+          //         docker {
+          //           image platform_images["${platform}"]
+          //           label 'docker'
+          //           args "${DOCKER_ARGS}"
+          //           registryUrl 'https://docker.io/'
+          //           registryCredentialsId 'dockerhub_creds'
+          //         }
+          //       }
+
+          //       options {
+          //         skipDefaultCheckout()
+          //         timeout(time: 90, unit: "MINUTES")
+          //       }
+
+          //       stages {
+          //         stage('Build from tarball & test') {
+          //           steps {
+          //             sh( script: 'rm -rf apache-couchdb-*', label: 'Clean workspace' )
+          //             unstash 'tarball'
+          //             sh( script: unpack, label: 'Unpack tarball' )
+          //             dir( "${platform}/build/couchdb" ) {
+          //               sh 'pwd'
+          //               sh 'ls -l'
+          //               sh "./configure --skip-deps --spidermonkey-version ${spidermonkey[env.platform]}"
+          //               sh 'make'
+          //               sh 'make eunit'
+          //               sh 'make elixir-suite'
+          //               sh 'make exunit'
+          //               sh 'make mango-test'
+          //             }
+          //           }
+          //           post {
+          //             always {
+          //               junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
+          //             }
+          //             failure {
+          //               dir( "${platform}/build/couchdb" ) {
+          //                 sh 'make build-report'
+          //               }
+          //             }
+          //           }
+          //         }
+
+          //         stage('Build CouchDB packages') {
+          //           steps {
+          //             unstash 'tarball'
+          //             sh( script: make_packages, label: 'Build packages' )
+          //             sh( script: cleanup_and_save, label: 'Stage package artifacts for archival' )
+          //           }
+          //           post {
+          //             success {
+          //               archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+          //             }
+          //           }
+          //         }
+          //       }
+
+          //       post {
+          //         cleanup {
+          //           sh 'rm -rf ${WORKSPACE}/*'
+          //         }
+          //       } // post
+          //     } // containerized platform
+          //   }
+          // ]
         ])
       }
     } // stage 'Test and Package'