[7.x] [ci/es] always pull snapshots, break early when they're… (elast…

…ic#62066) * [ci/es] always pull snapshots, break early when they're not available * move to setup.sh after deps are installed Co-authored-by: spalger <spalger@users.noreply.github.com> Co-authored-by: spalger <spalger@users.noreply.github.com>
tylersmalley · Mar 31, 2020 · b5c9181 · b5c9181
1 parent e61f815
commit b5c9181
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh
@@ -16,6 +16,14 @@ echo " -- TEST_ES_SNAPSHOT_VERSION='$TEST_ES_SNAPSHOT_VERSION'"
 echo " -- installing node.js dependencies"
 yarn kbn bootstrap --prefer-offline
 
+###
+### Download es snapshots
+###
+echo " -- downloading es snapshot"
+node scripts/es snapshot --download-only;
+node scripts/es snapshot --license=oss --download-only;
+
+
 ###
 ### verify no git modifications
 ###

diff --git a/test/scripts/jenkins_build_kibana.sh b/test/scripts/jenkins_build_kibana.sh
@@ -11,9 +11,6 @@ node scripts/build_kibana_platform_plugins \
 # doesn't persist, also set in kibanaPipeline.groovy
 export KBN_NP_PLUGINS_BUILT=true
 
-echo " -> downloading es snapshot"
-node scripts/es snapshot --license=oss --download-only;
-
 echo " -> Ensuring all functional tests are in a ciGroup"
 yarn run grunt functionalTests:ensureAllTestsInCiGroup;
 

diff --git a/test/scripts/jenkins_xpack_build_kibana.sh b/test/scripts/jenkins_xpack_build_kibana.sh
@@ -12,9 +12,6 @@ node scripts/build_kibana_platform_plugins \
 # doesn't persist, also set in kibanaPipeline.groovy
 export KBN_NP_PLUGINS_BUILT=true
 
-echo " -> downloading es snapshot"
-node scripts/es snapshot --download-only;
-
 echo " -> Ensuring all functional tests are in a ciGroup"
 cd "$XPACK_DIR"
 node scripts/functional_tests --assert-none-excluded \