attempt calling failure reporter directly from Jenkinsfile

elastic · Sep 12, 2019 · 0d9e58f · 0d9e58f
1 parent e0fdce6
commit 0d9e58f
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 17 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -79,6 +79,10 @@ def withWorkers(name, preWorkerClosure = {}, workerClosures = [:]) {
         catchError {
           publishJunit()
         }
+
+        catchError {
+          runErrorReporter()
+        }
       }
     }
   }
@@ -143,6 +147,9 @@ def legacyJobRunner(name) {
               catchError {
                 publishJunit()
               }
+              catchError {
+                runErrorReporter()
+              }
             }
           }
         }
@@ -262,3 +269,7 @@ def buildOss() {
 def buildXpack() {
   runbld "./test/scripts/jenkins_xpack_build_kibana.sh"
 }
+
+def runErrorReporter() {
+  bash "node src/dev/failed_tests/cli"
+}
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
@@ -1,16 +1,17 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
 
-if [[ "$IS_PIPELINE_JOB" ]] ; then
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+else
   source src/dev/ci_setup/setup_env.sh
 fi
 
 export TEST_BROWSER_HEADLESS=1
 
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  yarn run grunt functionalTests:ensureAllTestsInCiGroup;	
+  yarn run grunt functionalTests:ensureAllTestsInCiGroup;
   node scripts/build --debug --oss;
 else
   installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"

diff --git a/test/scripts/jenkins_firefox_smoke.sh b/test/scripts/jenkins_firefox_smoke.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
 
-if [[ "$IS_PIPELINE_JOB" ]] ; then
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+else
   source src/dev/ci_setup/setup_env.sh
 fi
 

diff --git a/test/scripts/jenkins_unit.sh b/test/scripts/jenkins_unit.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+fi
 
 export TEST_BROWSER_HEADLESS=1
 

diff --git a/test/scripts/jenkins_visual_regression.sh b/test/scripts/jenkins_visual_regression.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
 
-if [[ "$IS_PIPELINE_JOB" ]] ; then
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+else
   source src/dev/ci_setup/setup_env.sh
 fi
 

diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+fi
 
 export TEST_BROWSER_HEADLESS=1
 

diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
 
-export TEST_BROWSER_HEADLESS=1
-
-if [[ "$IS_PIPELINE_JOB" ]] ; then
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+else
   source src/dev/ci_setup/setup_env.sh
 fi
 
+export TEST_BROWSER_HEADLESS=1
+
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
   echo " -> Ensuring all functional tests are in a ciGroup"
   cd "$XPACK_DIR"

diff --git a/test/scripts/jenkins_xpack_firefox_smoke.sh b/test/scripts/jenkins_xpack_firefox_smoke.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
 
-if [[ "$IS_PIPELINE_JOB" ]] ; then
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+else
   source src/dev/ci_setup/setup_env.sh
 fi
 

diff --git a/test/scripts/jenkins_xpack_visual_regression.sh b/test/scripts/jenkins_xpack_visual_regression.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
-trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
 
-if [[ "$IS_PIPELINE_JOB" ]] ; then
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
+else
   source src/dev/ci_setup/setup_env.sh
 fi