Support version

.ci/beats-tester.groovy

@@ -96,6 +96,7 @@ pipeline {
 def runBeatsTesterJob(Map args = [:]) {
   def apm = args.get('apm', '')
   def beats = args.get('beats', '')
+  def version = args.version
 
   if (isUpstreamTrigger()) {
     copyArtifacts(filter: 'beats-tester.properties',
@@ -105,15 +106,16 @@ def runBeatsTesterJob(Map args = [:]) {
     def props = readProperties(file: 'beats-tester.properties')
     apm = props.get('APM_URL_BASE', '')
     beats = props.get('BEATS_URL_BASE', '')
+    version = props.get('VERSION', '8.0.0-SNAPSHOT')
   }
   if (apm?.trim() || beats?.trim()) {
     build(job: env.BEATS_TESTER_JOB, propagate: false, wait: false,
           parameters: [
             string(name: 'APM_URL_BASE', value: apm),
             string(name: 'BEATS_URL_BASE', value: beats),
-            string(name: 'VERSION', value: args.version)
+            string(name: 'VERSION', value: version)
           ])
   } else {
-    build(job: env.BEATS_TESTER_JOB, propagate: false, wait: false, parameters: [ string(name: 'VERSION', value: args.version) ])
+    build(job: env.BEATS_TESTER_JOB, propagate: false, wait: false, parameters: [ string(name: 'VERSION', value: version) ])
   }
 }

.ci/packaging.groovy

@@ -83,6 +83,9 @@ pipeline {
               }
             }
             setEnvVar("GO_VERSION", readFile("${BASE_DIR}/.go-version").trim())
+            dir("${BASE_DIR}"){
+              setEnvVar('VERSION', sh(label: 'Get beat version', script: 'make get-version', returnStdout: true)?.trim())
+            }
             stashV2(name: 'source', bucket: "${JOB_GCS_BUCKET_STASH}", credentialsId: "${JOB_GCS_CREDENTIALS}")
           }
         }
@@ -142,7 +145,9 @@ pipeline {
                   withGithubNotify(context: "Packaging Linux ${BEATS_FOLDER}") {
                     deleteDir()
                     release()
-                    pushCIDockerImages()
+                    dir("${BASE_DIR}") {
+                      pushCIDockerImages()
+                    }
                   }
                   prepareE2ETestForPackage("${BEATS_FOLDER}")
                 }
@@ -188,7 +193,7 @@ pipeline {
           writeFile(file: 'beats-tester.properties', text: """## To be consumed by the beats-tester pipeline
     COMMIT=${env.GIT_BASE_COMMIT}
     BEATS_URL_BASE=https://storage.googleapis.com/beats-ci-artifacts/commits/${env.GIT_BASE_COMMIT}
-    VERSION=${env.JOB_BASE_NAME}-SNAPSHOT""")
+    VERSION=${env.VERSION}-SNAPSHOT""")
           archiveArtifacts artifacts: 'beats-tester.properties'
         }
       }
@@ -217,7 +222,7 @@ def pushCIDockerImages(){
 }
 
 def tagAndPush(beatName){
-  def libbetaVer = sh(label: 'Get libbeat version', script: 'grep defaultBeatVersion ${BASE_DIR}/libbeat/version/version.go|cut -d "=" -f 2|tr -d \\"', returnStdout: true)?.trim()
+  def libbetaVer = sh(label: 'Get beat version', script: 'make get-version', returnStdout: true)?.trim()
   def aliasVersion = ""
   if("${env.SNAPSHOT}" == "true"){
     aliasVersion = libbetaVer.substring(0, libbetaVer.lastIndexOf(".")) // remove third number in version

Jenkinsfile

@@ -121,9 +121,12 @@ pipeline {
   }
   post {
     success {
+      dir("${BASE_DIR}"){
+        setEnvVar('VERSION', sh(label: 'Get beat version', script: 'make get-version', returnStdout: true)?.trim())
+      }
       writeFile(file: 'packaging.properties', text: """## To be consumed by the packaging pipeline
 COMMIT=${env.GIT_BASE_COMMIT}
-VERSION=${BRANCH_NAME}-SNAPSHOT""")
+VERSION=${VERSION}-SNAPSHOT""")
       archiveArtifacts artifacts: 'packaging.properties'
     }
     always {

Makefile

@@ -176,6 +176,11 @@ python-env:
 test-apm:
 	sh ./script/test_apm.sh
 
+## get-version : Get the libbeat version
+.PHONY: get-version
+get-version:
+	@mage dumpVariables | grep 'beat_version' | cut -d"=" -f 2 | tr -d " "
+
 ### Packaging targets ####
 
 ## snapshot : Builds a snapshot release.