ceph-dev-pipeline: Use ceph-source-dist by default

But continue to offer ceph-dev-new-setup as an option.

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

diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile
index ee8bf89359c83be7716369788cd762628caad43c..926ad3c1b5cc4ec666b083c208769d6ae9a17577 100644 (file)
--- a/ceph-dev-pipeline/build/Jenkinsfile
+++ b/ceph-dev-pipeline/build/Jenkinsfile
@@ -45,18 +45,21 @@ pipeline {
         script {
           if ( ! env.SETUP_BUILD_ID ) {
             def setup_build = build(
-              job: "ceph-dev-new-setup",
+              job: env.SETUP_JOB,
               parameters: [
                 string(name: "BRANCH", value: env.BRANCH),
                 string(name: "FLAVOR", value: env.FLAVOR),
                 string(name: "SCCACHE", value: env.SCCACHE),
                 string(name: "DWZ", value: env.DWZ),
+                // Below are just for ceph-source-dist
+                string(name: "CEPH_REPO", value: env.CEPH_REPO),
+                string(name: "CEPH_BUILD_BRANCH", value: env.CEPH_BUILD_BRANCH),
               ]
             )
             env.SETUP_BUILD_ID = setup_build.getNumber()
           }
           println "SETUP_BUILD_ID=${env.SETUP_BUILD_ID}"
-          env.SETUP_BUILD_URL = new URI([env.JENKINS_URL, "job", "ceph-dev-new-setup", env.SETUP_BUILD_ID].join("/")).normalize()
+          env.SETUP_BUILD_URL = new URI([env.JENKINS_URL, "job", env.SETUP_JOB, env.SETUP_BUILD_ID].join("/")).normalize()
           println "${env.SETUP_BUILD_URL}"
         }
       }
@@ -131,7 +134,7 @@ pipeline {
                 }
                 println artifact_filter
                 copyArtifacts(
-                  projectName: "ceph-dev-new-setup",
+                  projectName: env.SETUP_JOB,
                   selector: specific(buildNumber: env.SETUP_BUILD_ID),
                   filter: artifact_filter,
                 )

diff --git a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
index 811d3e6e7cefe005e00462dacf5dd19b3f7dba1a..61f0e92fe25e2e60e225cbaf38dc180d82af930c 100644 (file)
--- a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
+++ b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
@@ -94,6 +94,12 @@
           description: "Use the source distribution from this ceph-dev-new-setup build instead of creating a new one"
           default: ""
 
+      - choice:
+          name: SETUP_JOB
+          choices:
+            - ceph-source-dist
+            - ceph-dev-new-setup
+
       - string:
           name: CEPH_BUILD_BRANCH
           description: "Use the Jenkinsfile from this ceph-build branch"