ci: split windows in mandatory and ext_win stages (#30781)

(cherry picked from commit f0912da) # Conflicts: # auditbeat/Jenkinsfile.yml # filebeat/Jenkinsfile.yml # heartbeat/Jenkinsfile.yml # metricbeat/Jenkinsfile.yml # packetbeat/Jenkinsfile.yml # winlogbeat/Jenkinsfile.yml # x-pack/auditbeat/Jenkinsfile.yml # x-pack/elastic-agent/Jenkinsfile.yml # x-pack/filebeat/Jenkinsfile.yml # x-pack/functionbeat/Jenkinsfile.yml # x-pack/heartbeat/Jenkinsfile.yml # x-pack/metricbeat/Jenkinsfile.yml # x-pack/osquerybeat/Jenkinsfile.yml # x-pack/packetbeat/Jenkinsfile.yml # x-pack/winlogbeat/Jenkinsfile.yml
elastic · Mar 15, 2022 · b879ed3 · b879ed3
1 parent 4ae6d10
commit b879ed3
Show file tree

Hide file tree

Showing 16 changed files with 326 additions and 45 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -138,6 +138,23 @@ pipeline {
         runBuildAndTest(filterStage: 'extended')
       }
     }
+    stage('ExtendedWin') {
+      options { skipDefaultCheckout() }
+      when {
+        // On a branches/tags, skip if changes are only related to docs.
+        // Always when forcing the input parameter
+        anyOf {
+          allOf {                                           // If no PR and no docs changes
+            expression { return env.ONLY_DOCS == "false" }
+            not { changeRequest() }
+          }
+          expression { return params.runAllStages }         // If UI forced
+        }
+      }
+      steps {
+        runBuildAndTest(filterStage: 'extended_win')
+      }
+    }
     stage('Packaging') {
       options { skipDefaultCheckout() }
       when {

diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml
@@ -34,7 +34,7 @@ stages:
                 - "armTest"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
-        stage: extended
+        stage: mandatory
     unitTest:
         mage: "mage build unitTest"
         stage: mandatory
@@ -60,30 +60,44 @@ stages:
                 - "macosTest"
             tags: true         ## for all the tags
         stage: extended
+<<<<<<< HEAD
     windows:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2019"
         stage: mandatory
+=======
+    windows-2022:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2022"
+        stage: mandatory
+    windows-2019:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2019"
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     windows-2016:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2016"
-        stage: extended
+        stage: mandatory
     windows-2012:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2012-r2"
-        stage: extended
+        stage: extended_win
     windows-10:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-10"
-        stage: extended
+        stage: extended_win
     windows-8:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-8"
+<<<<<<< HEAD
         stage: extended
     #windows-2008:  See https://github.com/elastic/beats/issues/19799
     #    mage: "mage build unitTest"
@@ -100,6 +114,9 @@ stages:
     #    platforms:             ## override default labels in this specific stage.
     #        - "windows-7-32-bit"
     #    stage: extended
+=======
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     packaging-linux:
         packaging-linux: "mage package"
         e2e:

diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml
@@ -34,7 +34,7 @@ stages:
                 - "armTest"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
-        stage: extended
+        stage: mandatory
     unitTest:
         mage: "mage build unitTest"
         stage: mandatory
@@ -72,26 +72,40 @@ stages:
                 - "macosTest"
             tags: true         ## for all the tags
         stage: extended
+<<<<<<< HEAD
     windows:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2019"
             #- "windows-2008-r2"  https://github.com/elastic/beats/issues/19795
         stage: mandatory
+=======
+    windows-2022:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2022"
+        stage: mandatory
+    windows-2019:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2019"
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     windows-2016:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2016"
-        stage: extended
+        stage: mandatory
     windows-10:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-10"
-        stage: extended
+        stage: extended_win
     windows-8:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-8"
+<<<<<<< HEAD
         stage: extended
     #windows-7:  See https://github.com/elastic/beats/issues/22317
     #    mage: "mage build unitTest"
@@ -104,6 +118,9 @@ stages:
         platforms:             ## override default labels in this specific stage.
             - "windows-7-32-bit"
         stage: extended
+=======
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     packaging-linux:
         packaging-linux: "mage package"
         e2e:

diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml
@@ -34,7 +34,7 @@ stages:
                 - "armTest"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
-        stage: extended
+        stage: mandatory
     unitTest:
         mage: "mage build unitTest"
         stage: mandatory
@@ -59,30 +59,44 @@ stages:
                 - "macosTest"
             tags: true         ## for all the tags
         stage: extended
+<<<<<<< HEAD
     windows:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2019"
         stage: mandatory
+=======
+    windows-2022:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2022"
+        stage: mandatory
+    windows-2019:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2019"
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     windows-2016:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2016"
-        stage: extended
+        stage: mandatory
     windows-2012:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2012-r2"
-        stage: extended
+        stage: extended_win
     windows-10:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-10"
-        stage: extended
+        stage: extended_win
     windows-8:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-8"
+<<<<<<< HEAD
         stage: extended
     windows-7:
         mage: "mage build unitTest"
@@ -94,6 +108,9 @@ stages:
         platforms:             ## override default labels in this specific stage.
             - "windows-7-32-bit"
         stage: extended
+=======
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     packaging-linux:
         packaging-linux: "mage package"
         e2e:

diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml
@@ -48,30 +48,44 @@ stages:
                 - "macosTest"
             tags: true         ## for all the tags
         stage: extended
+<<<<<<< HEAD
     windows:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2019"
         stage: mandatory
+=======
+    windows-2022:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2022"
+        stage: mandatory
+    windows-2019:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2019"
+        stage: extended
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     windows-2016:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2016"
-        stage: extended
+        stage: mandatory
     windows-2012:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2012-r2"
-        stage: extended
+        stage: extended_win
     windows-10:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-10"
-        stage: extended
+        stage: extended_win
     windows-8:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-8"
+<<<<<<< HEAD
         stage: extended
     windows-2008:
         mage: "mage build unitTest"
@@ -88,6 +102,9 @@ stages:
         platforms:             ## override default labels in this specific stage.
             - "windows-7-32-bit"
         stage: extended
+=======
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     packaging-linux:
         packaging-linux: "mage package"
         e2e:

diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml
@@ -35,7 +35,7 @@ stages:
                 - "armTest"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
-        stage: extended
+        stage: mandatory
     unitTest:
         mage: "mage build unitTest"
         stage: mandatory
@@ -52,35 +52,53 @@ stages:
                 - "macosTest"
             tags: true         ## for all the tags
         stage: extended
+<<<<<<< HEAD
     windows:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2019"
         stage: mandatory
+=======
+    windows-2022:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2022"
+        stage: mandatory
+    windows-2019:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-2019"
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     windows-2016:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2016"
-        stage: extended
+        stage: mandatory
     windows-2012:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2012-r2"
-        stage: extended
+        stage: extended_win
     windows-10:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-10"
+<<<<<<< HEAD
         stage: extended
     windows-2008:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-2008-r2"
         stage: extended
+=======
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     windows-8:
         mage: "mage build unitTest"
         platforms:             ## override default labels in this specific stage.
             - "windows-8"
+<<<<<<< HEAD
         stage: extended
     windows-7:
         mage: "mage build unitTest"
@@ -92,6 +110,9 @@ stages:
         platforms:             ## override default labels in this specific stage.
             - "windows-7-32-bit"
         stage: extended
+=======
+        stage: extended_win
+>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781))
     packaging-linux:
         packaging-linux: "mage package"
         e2e: