[couchdb] branch jenkins-bump-erlang-and-debian-versions updated: Try spidermonkey version as an axis

[ko...@apache.org]

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

kocolosk pushed a commit to branch jenkins-bump-erlang-and-debian-versions
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/jenkins-bump-erlang-and-debian-versions by this push:
     new 02830dd  Try spidermonkey version as an axis
02830dd is described below

commit 02830dd05e52233b1a008d6bd959be404170d454
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Jan 15 13:11:45 2022 -0500

    Try spidermonkey version as an axis
---
 build-aux/Jenkinsfile.full | 62 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 15 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 3d94586..0615909 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -57,16 +57,6 @@ platform_images = [
   'bullseye': "apache/couchdbci-debian:bullseye-erlang-${ERLANG_VERSION}"
 ]
 
-spidermonkey_version = [
-  'centos7': '1.8.5',
-  'centos8': '60',
-  'bionic': '1.8.5',
-  'focal': '68',
-  'stretch': '1.8.5',
-  'buster': '60',
-  'bullseye': '78'
-]
-
 pipeline {
 
   // no top-level agent; agents must be declared for each stage
@@ -154,6 +144,52 @@ pipeline {
             name 'platform'
             values 'macos', 'freebsd', 'centos7', 'centos8', 'bionic', 'focal', 'stretch', 'buster', 'bullseye'
           }
+          axis {
+            name 'sm_ver'
+            values '1.8.5', '60', '68', '78'
+          } 
+        }
+        excludes {
+          exclude {
+            axis {
+              name 'platform'
+              values 'centos7', 'bionic', 'stretch', 'macos'
+            }
+            axis {
+              name 'sm_ver'
+              notValues '1.8.5'
+            }
+          }
+          exclude {
+            axis {
+              name 'platform'
+              values 'centos8', 'buster', 'freebsd'
+            }
+            axis {
+              name 'sm_ver'
+              notValues '60'
+            }
+          }
+          exclude {
+            axis {
+              name 'platform'
+              values 'focal'
+            }
+            axis {
+              name 'sm_ver'
+              notValues '68'
+            }
+          }
+          exclude {
+            axis {
+              name 'platform'
+              values 'bullseye'
+            }
+            axis {
+              name 'sm_ver'
+              notValues '78'
+            }
+          }
         }
 
         stages {
@@ -184,7 +220,7 @@ pipeline {
                   cd build
                   tar -xzf $WORKSPACE/apache-couchdb-*.tar.gz
                   cd apache-couchdb-*
-                  ./configure --spidermonkey-version 60
+                  ./configure --spidermonkey-version ${sm_ver}
                   make check || (build-aux/logfile-uploader.py && false)
 
                   # No package build for non-containerized platforms at this time
@@ -224,10 +260,6 @@ pipeline {
               }
             }
 
-            environment {
-              sm_ver = spidermonkey_version["${platform}"]
-            }
-
             stage('Build from tarball & test') {
               steps {
                 unstash 'tarball'