Revert "ci: e2e-testing should fail the build (#31135)" (#32079)

cmacknz · web-flow · commit ef6096f24629 · 2022-06-23T14:48:39.000-04:00
This reverts commit 2241413. Allow the E2E tests to keep running but not fail the build when they fail while we work to stabilize them: #32076
diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
@@ -433,22 +433,24 @@ def runE2ETests(){
 
   def suites = '' // empty value represents all suites in the E2E tests
 
-  def suitesSet = e2eTestSuites.toSet()
+  catchError(buildResult: 'UNSTABLE', message: 'Unable to run e2e tests', stageResult: 'FAILURE') {
+    def suitesSet = e2eTestSuites.toSet()
 
-  if (!suitesSet.contains('ALL')) {
-    suitesSet.each { suite ->
-      suites += "${suite},"
-    };
+    if (!suitesSet.contains('ALL')) {
+      suitesSet.each { suite ->
+        suites += "${suite},"
+      };
+    }
+    echo 'runE2E will run now in a sync mode to validate packages can be published.'
+    runE2E(runTestsSuites: suites,
+          testMatrixFile: '.ci/.e2e-tests-beats.yaml',
+          beatVersion: "${env.BEAT_VERSION}-SNAPSHOT",
+          gitHubCheckName: env.GITHUB_CHECK_E2E_TESTS_NAME,
+          gitHubCheckRepo: env.REPO,
+          gitHubCheckSha1: env.GIT_BASE_COMMIT,
+          propagate: true,
+          wait: true)
   }
-  echo 'runE2E will run now in a sync mode to validate packages can be published.'
-  runE2E(runTestsSuites: suites,
-         testMatrixFile: '.ci/.e2e-tests-beats.yaml',
-         beatVersion: "${env.BEAT_VERSION}-SNAPSHOT",
-         gitHubCheckName: env.GITHUB_CHECK_E2E_TESTS_NAME,
-         gitHubCheckRepo: env.REPO,
-         gitHubCheckSha1: env.GIT_BASE_COMMIT,
-         propagate: true,
-         wait: true)
 }
 
 /**
