[beats-tester][packaging] store artifacts also in another predictable…

… location

.ci/beats-tester.groovy

@@ -54,13 +54,15 @@ pipeline {
           options { skipDefaultCheckout() }
           when { branch 'master' }
           steps {
+            // TODO: to use the git commit that triggered the upstream build
             runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT")
           }
         }
         stage('Build *.x branch') {
           options { skipDefaultCheckout() }
           when { branch '*.x' }
           steps {
+            // TODO: to use the git commit that triggered the upstream build
             runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT")
           }
         }
@@ -84,6 +86,7 @@ pipeline {
             }
            }
           steps {
+            // TODO: to use the git commit that triggered the upstream build
             runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT")
           }
         }

.ci/packaging.groovy

@@ -327,10 +327,22 @@ def publishPackages(baseDir){
     bucketUri = "gs://${JOB_GCS_BUCKET}/pull-requests/pr-${env.CHANGE_ID}"
   }
   def beatsFolderName = getBeatsName(baseDir)
-  googleStorageUpload(bucket: "${bucketUri}/${beatsFolderName}",
+  uploadPackages("${bucketUri}/${beatsFolderName}", baseDir, beatsFolderName)
+
+  // In order to run the beats-tester let's copy those files to another more predictable
+  // location where those files won't be uploaded while running the beats-tester
+  if (isBranch()) {
+    bucketUri = "gs://${JOB_GCS_BUCKET}/commit/${env.GIT_BASE_COMMIT}"
+    uploadPackages("${bucketUri}/${beatsFolderName}", baseDir, beatsFolderName)
+  }
+}
+
+def uploadPackages(bucketUri, baseDir, beatsFolderName){
+  def distributionsFolder = 'build/distributions'
+  googleStorageUpload(bucket: bucketUri,
     credentialsId: "${JOB_GCS_CREDENTIALS}",
-    pathPrefix: "${baseDir}/build/distributions/",
-    pattern: "${baseDir}/build/distributions/**/*",
+    pathPrefix: "${baseDir}/${distributionsFolder}/",
+    pattern: "${baseDir}/${distributionsFolder}/**/*",
     sharedPublicly: true,
     showInline: true
   )