[CI] fix apm-beats-update.groovy pipeline with missing stages (#20238) (

#20239)
elastic · Jul 30, 2020 · 8be3536 · 8be3536
1 parent af1ff5e
commit 8be3536
Showing 1 changed file with 42 additions and 40 deletions.
diff --git a/.ci/apm-beats-update.groovy b/.ci/apm-beats-update.groovy
@@ -48,51 +48,53 @@ pipeline {
           }
         }
       }
-      /**
-       Checkout the code and stash it, to use it on other stages.
-      */
-      stage('Checkout') {
-        steps {
-          deleteDir()
-          gitCheckout(basedir: "${BEATS_DIR}", githubNotifyFirstTimeContributor: false)
-          script {
-            dir("${BEATS_DIR}"){
-              env.GO_VERSION = readFile(".go-version").trim()
-              def regexps =[
-                "^devtools/mage.*",
-                "^libbeat/scripts/Makefile",
-              ]
-              env.BEATS_UPDATED = isGitRegionMatch(patterns: regexps)
-              // Skip all the stages except docs for PR's with asciidoc changes only
-              env.ONLY_DOCS = isGitRegionMatch(patterns: [ '.*\\.asciidoc' ], comparator: 'regexp', shouldMatchAll: true)
+      stages {
+        /**
+        Checkout the code and stash it, to use it on other stages.
+        */
+        stage('Checkout') {
+          steps {
+            deleteDir()
+            gitCheckout(basedir: "${BEATS_DIR}", githubNotifyFirstTimeContributor: false)
+            script {
+              dir("${BEATS_DIR}"){
+                env.GO_VERSION = readFile(".go-version").trim()
+                def regexps =[
+                  "^devtools/mage.*",
+                  "^libbeat/scripts/Makefile",
+                ]
+                env.BEATS_UPDATED = isGitRegionMatch(patterns: regexps)
+                // Skip all the stages except docs for PR's with asciidoc changes only
+                env.ONLY_DOCS = isGitRegionMatch(patterns: [ '.*\\.asciidoc' ], comparator: 'regexp', shouldMatchAll: true)
+              }
             }
           }
         }
-      }
-      /**
-      updates beats updates the framework part and go parts of beats.
-      Then build and test.
-      Finally archive the results.
-      */
-      stage('Update Beats') {
-        options { skipDefaultCheckout() }
-        when {
-          beforeAgent true
-          anyOf {
-            branch 'master'
-            branch "\\d+\\.\\d+"
-            branch "v\\d?"
-            tag "v\\d+\\.\\d+\\.\\d+*"
-            allOf {
-              expression { return env.BEATS_UPDATED != "false" || isCommentTrigger() }
-              changeRequest()
-            }
+        /**
+        updates beats updates the framework part and go parts of beats.
+        Then build and test.
+        Finally archive the results.
+        */
+        stage('Update Beats') {
+          options { skipDefaultCheckout() }
+          when {
+            beforeAgent true
+            anyOf {
+              branch 'master'
+              branch "\\d+\\.\\d+"
+              branch "v\\d?"
+              tag "v\\d+\\.\\d+\\.\\d+*"
+              allOf {
+                expression { return env.BEATS_UPDATED != "false" || isCommentTrigger() }
+                changeRequest()
+              }
 
+            }
           }
-        }
-        steps {
-          withGithubNotify(context: 'Check Apm Server Beats Update') {
-            beatsUpdate()
+          steps {
+            withGithubNotify(context: 'Check Apm Server Beats Update') {
+              beatsUpdate()
+            }
           }
         }
       }