[8.4](backport #1169) ci: run e2e-testing at the end (#1171)

elastic · Sep 14, 2022 · db48c34 · db48c34
1 parent 1bb6731
commit db48c34
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -249,29 +249,6 @@ pipeline {
         }
       }
     }
-    stage('e2e tests') {
-      when {
-        // Always when running builds on branches/tags
-        // Enable if e2e related changes.
-        beforeAgent true
-        anyOf {
-          not { changeRequest() }
-          // package artifacts are not generated if ONLY_DOCS, therefore e2e should not run if ONLY_DOCS
-          expression { return isE2eEnabled() && env.ONLY_DOCS == "false"}
-        }
-      }
-      steps {
-        // TODO: what's the testMatrixFile to be used if any
-        runE2E(testMatrixFile: '.ci/.e2e-tests-for-elastic-agent.yaml',
-               beatVersion: "${env.BEAT_VERSION}-SNAPSHOT",
-               elasticAgentVersion: "${env.BEAT_VERSION}-SNAPSHOT",
-               gitHubCheckName: "e2e-tests",
-               gitHubCheckRepo: env.REPO,
-               gitHubCheckSha1: env.GIT_BASE_COMMIT,
-               propagate: true,
-               wait: true)
-      }
-    }
     stage('extended windows') {
       when {
         // Always when running builds on branches/tags
@@ -381,6 +358,28 @@ pipeline {
         }
       }
     }
+    stage('e2e tests') {
+      when {
+        // Always when running builds on branches/tags
+        // Enable if e2e related changes.
+        beforeAgent true
+        anyOf {
+          not { changeRequest() }
+          // package artifacts are not generated if ONLY_DOCS, therefore e2e should not run if ONLY_DOCS
+          expression { return isE2eEnabled() && env.ONLY_DOCS == "false"}
+        }
+      }
+      steps {
+        runE2E(testMatrixFile: '.ci/.e2e-tests-for-elastic-agent.yaml',
+               beatVersion: "${env.BEAT_VERSION}-SNAPSHOT",
+               elasticAgentVersion: "${env.BEAT_VERSION}-SNAPSHOT",
+               gitHubCheckName: "e2e-tests",
+               gitHubCheckRepo: env.REPO,
+               gitHubCheckSha1: env.GIT_BASE_COMMIT,
+               propagate: true,
+               wait: true)
+      }
+    }
   }
   post {
     cleanup {