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 23:15:44 UTC
[couchdb] branch jenkins-dynamic-matrix updated: Is a stage even required?
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 bd90a55 Is a stage even required?
bd90a55 is described below
commit bd90a558d809367aa4eef3e057f35d8e2ea0fed4
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sun Jan 16 18:15:36 2022 -0500
Is a stage even required?
---
build-aux/Jenkinsfile.full | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index ceaeae5..5bcf2fb 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -111,8 +111,6 @@ gnu_make = ['freebsd': 'gmake', 'macos': 'make']
// We use an initial stage to dynamically generate the list of parallel stages
// to run afterwards. This keeps our Jenkinsfile DRY and gives us more
// flexibility and better UX than the matrix pipeline.
-def parallelStagesMap
-
def generateNativeStage(platform) {
return {
stage(meta[platform].name) {
@@ -232,6 +230,15 @@ def generateContainerStage(platform) {
}
}
+def parallelStagesMap = meta.collectEntries { key, values ->
+ if (values.image) {
+ [key: generateContainerStage(key)]
+ }
+ else {
+ [key: generateNativeStage(key)]
+ }
+}
+
pipeline {
// no top-level agent; agents must be declared for each stage
@@ -298,22 +305,6 @@ pipeline {
}
} // stage Build Release Tarball
- stage('Generate Test Matrix') {
- agent any
- steps {
- script {
- parallelStagesMap = meta.collectEntries { key, platform ->
- if (platform.image) {
- [key: generateContainerStage(key)]
- }
- else {
- [key: generateNativeStage(key)]
- }
- }
- }
- }
- }
-
stage('Test and Package') {
steps {
script {