ceph-dev-pipeline: potentially build multiple flavors

Signed-off-by: Zack Cerza <zack@cerza.org>

diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile
index 73c0d960a877660f76f87000fd33eee75f5a9263..3a71f62e448ed124d4f502a9da6726cb809a2043 100644 (file)
--- a/ceph-dev-pipeline/build/Jenkinsfile
+++ b/ceph-dev-pipeline/build/Jenkinsfile
@@ -168,6 +168,7 @@ pipeline {
           allOf {
             expression { env.DISTROS.contains(env.DIST) }
             expression { env.ARCHS.contains(env.ARCH) }
+            expression { env.FLAVORS.contains(env.FLAVOR) }
             anyOf {
               environment name: "CI_COMPILE", value: "true"
               allOf {
@@ -186,6 +187,33 @@ pipeline {
             name 'ARCH'
             values 'x86_64', 'arm64'
           }
+          axes {
+            name 'FLAVOR'
+            values 'default', 'crimson'
+          }
+        }
+        // crimson is only supported on centos9 x86_64
+        excludes {
+          exclude {
+            axis {
+              name 'FLAVOR'
+              values 'crimson'
+            }
+            axis {
+              name 'DIST'
+              notValues 'centos9'
+            }
+          }
+          exclude {
+            axis {
+              name 'FLAVOR'
+              values 'crimson'
+            }
+            axis {
+              name 'ARCH'
+              notValues 'x86_64'
+            }
+          }
         }
         stages {
           stage("node") {
@@ -246,7 +274,7 @@ pipeline {
                   VERSION=${env.VERSION}<br />
                   DISTROS=${env.DISTROS}<br />
                   ARCHS=${env.ARCHS}<br />
-                  FLAVOR=${env.FLAVOR}<br />
+                  FLAVORS=${env.FLAVORS}<br />
                   <a href="${env.SETUP_BUILD_URL}">SETUP_BUILD_ID=${env.SETUP_BUILD_ID}</a><br />
                   <a href="${shaman_url}">shaman builds for this branch+commit</a>
                 """.stripIndent()

diff --git a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
index 71f1b2e9401aeacd77134dce33e703b2301e03fc..c2080e48442a5b158ab821e022a2dc0c0f23d23f 100644 (file)
--- a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
+++ b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
@@ -40,6 +40,11 @@
           description: "A list of architectures to build for. Available options are: x86_64 and arm64"
           default: "x86_64 arm64"
 
+      - string:
+          name: FLAVORS
+          description: "A list of flavors to build. Available options are: default and crimson"
+          default: "default"
+
       - bool:
           name: CI_COMPILE
           description: "Whether to compile and build packages"