move source-dist to new file

diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile
index 151bdbefe351104be4c31f5b5c568364d41f9377..e011a564aa20bd292a7fd365979e5a01588511b8 100644 (file)
--- a/ceph-dev-pipeline/build/Jenkinsfile
+++ b/ceph-dev-pipeline/build/Jenkinsfile
@@ -134,32 +134,26 @@ def get_ceph_release_repo_text(base_url) {
   return text.toString()
 }
 
+def buildImpl = load 'ceph-dev-pipeline/build/build.groovy';
+
 pipeline {
   agent any
   stages {
     stage("source distribution") {
       steps {
         script {
-          if ( ! env.SETUP_BUILD_ID ) {
-            def setup_build = build(
-              job: env.SETUP_JOB,
-              parameters: [
-                string(name: "BRANCH", value: env.BRANCH),
-                // Below are just for ceph-source-dist
-                string(name: "SHA1", value: env.SHA1),
-                string(name: "CEPH_REPO", value: env.CEPH_REPO),
-                string(name: "CEPH_BUILD_BRANCH", value: env.CEPH_BUILD_BRANCH),
-                // Below are only for actual releases
-                string(name: 'RELEASE_TYPE',  value: env.RELEASE_TYPE ?: ''),
-                string(name: 'RELEASE_BUILD', value: env.RELEASE_BUILD ?: ''),
-                string(name: 'VERSION',       value: env.VERSION ?: '')
-              ]
-            )
-            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", env.SETUP_JOB, env.SETUP_BUILD_ID].join("/")).normalize()
-          println "${env.SETUP_BUILD_URL}"
+          result = buildImpl.build_source_dist([
+            SETUP_JOB: env.SETUP_JOB,
+            SETUP_BUILD_ID: env.SETUP_BUILD_ID,
+            CEPH_REPO: env.CEPH_REPO,
+            BRANCH: env.BRANCH,
+            SHA1: env.SHA1,
+            CEPH_BUILD_BRANCH: env.CEPH_BUILD_BRANCH,
+            RELEASE_TYPE: env.RELEASE_TYPE,
+            RELEASE_BUILD: env.RELEASE_BUILD,
+            VERSION: env.VERSION,
+          ]);
+          env.putAll(result);
         }
       }
     }

diff --git a/ceph-dev-pipeline/build/build.groovy b/ceph-dev-pipeline/build/build.groovy
new file mode 100644 (file)
index 0000000..9b9a567
--- /dev/null
+++ b/ceph-dev-pipeline/build/build.groovy
@@ -0,0 +1,26 @@
+def build_source_dist(Map params) {
+  def result = [:];
+  if ( params.SETUP_BUILD_ID ) {
+    result.SETUP_BUILD_ID = params.SETUP_BUILD_ID;
+  } else {
+    def setup_build = build(
+      job: params.SETUP_JOB,
+      parameters: [
+        string(name: "BRANCH", value: params.BRANCH),
+        // Below are just for ceph-source-dist
+        string(name: "SHA1", value: params.SHA1),
+        string(name: "CEPH_REPO", value: params.CEPH_REPO),
+        string(name: "CEPH_BUILD_BRANCH", value: params.CEPH_BUILD_BRANCH),
+        // Below are only for actual releases
+        string(name: 'RELEASE_TYPE',  value: params.RELEASE_TYPE ?: ''),
+        string(name: 'RELEASE_BUILD', value: params.RELEASE_BUILD ?: ''),
+        string(name: 'VERSION',       value: params.VERSION ?: '')
+      ]
+    )
+    result.SETUP_BUILD_ID = setup_build.getNumber()
+  }
+  println "SETUP_BUILD_ID=${params.SETUP_BUILD_ID}"
+  result.SETUP_BUILD_URL = new URI([params.JENKINS_URL, "job", params.SETUP_JOB, params.SETUP_BUILD_ID].join("/")).normalize()
+  println "${result.SETUP_BUILD_URL}"
+  return result;
+}