Merge pull request #7633 from spalger/ci/sourceRatherThanExec

[ci] source the setup script instead of executing it
elastic · Jul 5, 2016 · 832e515 · 832e515
2 parents 37cc438 + 8adaecb
commit 832e515
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/test/scripts/jenkins_setup.sh → test/scripts/_jenkins_setup.sh b/test/scripts/jenkins_setup.sh → test/scripts/_jenkins_setup.sh
@@ -37,5 +37,3 @@ if [ -z "$(npm bin)" ]; then
   echo "npm does not know where it stores executables..... huh??"
   exit 1
 fi
-
-export GRUNT="$(npm bin)/grunt"
diff --git a/test/scripts/jenkins_build_snapshot.sh b/test/scripts/jenkins_build_snapshot.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -e
+source "$(dirname $0)/_jenkins_setup.sh"
 
-"$(dirname $0)/jenkins_setup.sh"
-
-"$GRUNT" build;
+"$(npm bin)/grunt" build;
diff --git a/test/scripts/jenkins_selenium.sh b/test/scripts/jenkins_selenium.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -e
-
-"$(dirname $0)/jenkins_setup.sh"
+source "$(dirname $0)/_jenkins_setup.sh"
 
 xvfb-run "$(npm bin)/grunt" jenkins:selenium;
diff --git a/test/scripts/jenkins_unit.sh b/test/scripts/jenkins_unit.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -e
+source "$(dirname $0)/_jenkins_setup.sh"
 
-"$(dirname $0)/jenkins_setup.sh"
-
-xvfb-run "$GRUNT" jenkins:unit;
+xvfb-run "$(npm bin)/grunt" jenkins:unit;
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,5 +37,3 @@ if [ -z "$(npm bin)" ]; then @@
       echo "npm does not know where it stores executables..... huh??"
       exit 1
     fi
-    export GRUNT="$(npm bin)/grunt"