From 6f6ae43ff83bffde0c9fcd99018a7d36ff2e20b7 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 9 Jun 2025 15:58:30 -0600 Subject: [PATCH] ceph-dev-pipeline: potentially build multiple flavors Signed-off-by: Zack Cerza --- ceph-dev-pipeline/build/Jenkinsfile | 30 ++++++++++++++++++- .../config/definitions/ceph-dev-pipeline.yml | 5 ++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile index 73c0d960..3a71f62e 100644 --- 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}
DISTROS=${env.DISTROS}
ARCHS=${env.ARCHS}
- FLAVOR=${env.FLAVOR}
+ FLAVORS=${env.FLAVORS}
SETUP_BUILD_ID=${env.SETUP_BUILD_ID}
shaman builds for this branch+commit """.stripIndent() diff --git a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml index 71f1b2e9..c2080e48 100644 --- 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" -- 2.39.5