From 745b0ba0a6d18790eef70ad5ab6e83b5fadb29fc Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Tue, 17 Sep 2019 14:43:07 -0700
Subject: [PATCH] [7.x] set IS_PIPELINE_JOB in intake jobs (#45850) (#45920)

* set IS_PIPELINE_JOB in intake jobs

* firefox smoke doesn't get an initial build

* firefox smoke doesn't get an initial build (oss edition)

* re-enable all jobs
---
 Jenkinsfile                                 |  2 +-
 test/scripts/jenkins_firefox_smoke.sh       | 18 +++++-------------
 test/scripts/jenkins_xpack_firefox_smoke.sh | 20 ++++++--------------
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dc47b7b1bac8..29d2504bc422 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -105,7 +105,6 @@ def getPostBuildWorker(name, closure) {
       "TEST_KIBANA_URL=http://elastic:changeme@localhost:${kibanaPort}",
       "TEST_ES_URL=http://elastic:changeme@localhost:${esPort}",
       "TEST_ES_TRANSPORT_PORT=${esTransportPort}",
-      "IS_PIPELINE_JOB=1",
     ]) {
       closure()
     }
@@ -168,6 +167,7 @@ def jobRunner(label, closure) {
 
     withEnv([
       "CI=true",
+      "IS_PIPELINE_JOB=1",
       "HOME=${env.JENKINS_HOME}",
       "PR_SOURCE_BRANCH=${env.ghprbSourceBranch}",
       "PR_TARGET_BRANCH=${env.ghprbTargetBranch}",
diff --git a/test/scripts/jenkins_firefox_smoke.sh b/test/scripts/jenkins_firefox_smoke.sh
index f4bd378fa1c6..924de169cad2 100755
--- a/test/scripts/jenkins_firefox_smoke.sh
+++ b/test/scripts/jenkins_firefox_smoke.sh
@@ -8,19 +8,11 @@ else
   source src/dev/ci_setup/setup_env.sh
 fi
 
-if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  node scripts/build --debug --oss;
-  linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-oss-*-linux-x86_64.tar.gz')"
-  installDir="$PARENT_DIR/install/kibana"
-  mkdir -p "$installDir"
-  tar -xzf "$linuxBuild" -C "$installDir" --strip=1
-else
-  installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
-  destDir=${installDir}-${CI_WORKER_NUMBER}
-  cp -R "$installDir" "$destDir"
-
-  export KIBANA_INSTALL_DIR="$destDir"
-fi
+node scripts/build --debug --oss;
+linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-oss-*-linux-x86_64.tar.gz')"
+installDir="$PARENT_DIR/install/kibana"
+mkdir -p "$installDir"
+tar -xzf "$linuxBuild" -C "$installDir" --strip=1
 
 export TEST_BROWSER_HEADLESS=1
 
diff --git a/test/scripts/jenkins_xpack_firefox_smoke.sh b/test/scripts/jenkins_xpack_firefox_smoke.sh
index 216c1c39370e..e8fbfb01c50d 100755
--- a/test/scripts/jenkins_xpack_firefox_smoke.sh
+++ b/test/scripts/jenkins_xpack_firefox_smoke.sh
@@ -8,20 +8,12 @@ else
   source src/dev/ci_setup/setup_env.sh
 fi
 
-if [[ -z "$IS_PIPELINE_JOB" ]] ; then
-  node scripts/build --debug --no-oss;
-  linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
-  installDir="$PARENT_DIR/install/kibana"
-  mkdir -p "$installDir"
-  tar -xzf "$linuxBuild" -C "$installDir" --strip=1
-  export KIBANA_INSTALL_DIR="$installDir"
-else
-  installDir="$PARENT_DIR/install/kibana"
-  destDir="${installDir}-${CI_WORKER_NUMBER}"
-  cp -R "$installDir" "$destDir"
-
-  export KIBANA_INSTALL_DIR="$destDir"
-fi
+node scripts/build --debug --no-oss;
+linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
+installDir="$PARENT_DIR/install/kibana"
+mkdir -p "$installDir"
+tar -xzf "$linuxBuild" -C "$installDir" --strip=1
+export KIBANA_INSTALL_DIR="$installDir"
 
 export TEST_BROWSER_HEADLESS=1