[packaging] use commit version

v1v · Oct 20, 2020 · cad5685 · cad5685
1 parent 7f212d3
commit cad5685
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
@@ -65,7 +65,18 @@ pipeline {
           options { skipDefaultCheckout() }
           steps {
             deleteDir()
-            gitCheckout(basedir: "${BASE_DIR}")
+            script {
+              if(isUpstreamTrigger()) {
+                copyArtifacts(filter: 'packaging.properties',
+                              flatten: true,
+                              projectName: "Beats/beats/${env.JOB_BASE_NAME}",
+                              selector: upstream(fallbackToLastSuccessful: true))
+                def props = readProperties('packaging.properties')
+                gitCheckout(basedir: "${BASE_DIR}", branch: props.COMMIT)
+              } else {
+                gitCheckout(basedir: "${BASE_DIR}")
+              }
+            }
             setEnvVar("GO_VERSION", readFile("${BASE_DIR}/.go-version").trim())
             stashV2(name: 'source', bucket: "${JOB_GCS_BUCKET_STASH}", credentialsId: "${JOB_GCS_CREDENTIALS}")
           }