[6.x] [ci] use es snapshots on non pull requests (#22834) (#22894)

* [ci] use es snapshots on non pull requests * remove extra export * always clone * master -> 6.x
elastic · Sep 10, 2018 · 540ab94 · 540ab94
1 parent 8da5719
commit 540ab94
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/dev/ci_setup/git_setup.sh b/src/dev/ci_setup/git_setup.sh
@@ -70,7 +70,6 @@ function checkout_sibling {
 
       cloneBranch="$PR_TARGET_BRANCH"
       if clone_target_is_valid ; then
-        export TEST_ES_FROM=snapshot
         return 0
       fi
 
@@ -81,6 +80,9 @@ function checkout_sibling {
 
     function checkout_clone_target {
       pick_clone_target
+      if [[ $cloneBranch = "6.x"  && $cloneAuthor = "elastic" ]]; then
+        export TEST_ES_FROM=snapshot
+      fi
 
       echo " -> checking out '${cloneBranch}' branch from ${cloneAuthor}/${project}..."
       git clone -b "$cloneBranch" "git@github.com:${cloneAuthor}/${project}.git" "$targetDir" --depth=1