From 7e581dab5f8bd2c80add649ee65778ba25c5661b Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Fri, 13 Apr 2018 15:01:04 -0700
Subject: [PATCH] ci: remove travis e2e_2 job (#22810)

The only remaining test can run in the first e2e travis shard.
This also removes the last thing needing bazel available on Travis.

PR Close #22810
---
 .travis.yml              |  1 -
 scripts/ci/env.sh        |  1 -
 scripts/ci/install.sh    | 16 ----------------
 scripts/ci/test-e2e-2.sh | 30 ------------------------------
 scripts/ci/test-e2e.sh   | 15 ++++++++++++---
 scripts/ci/test.sh       |  3 ---
 6 files changed, 12 insertions(+), 54 deletions(-)
 delete mode 100755 scripts/ci/test-e2e-2.sh

diff --git a/.travis.yml b/.travis.yml
index 6309b272b4..e06b84fa54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,6 @@ env:
   matrix:
     # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
     - CI_MODE=e2e
-    - CI_MODE=e2e_2
     - CI_MODE=js
     - CI_MODE=saucelabs_required
     # deactivated, see #19768
diff --git a/scripts/ci/env.sh b/scripts/ci/env.sh
index 718702dad7..b28dae419b 100755
--- a/scripts/ci/env.sh
+++ b/scripts/ci/env.sh
@@ -40,7 +40,6 @@ setEnvVar YARN_VERSION 1.3.2
 # Revision 494239 (which was part of Chrome 62.0.3186.0) is the last version that does not cause flakes. (Latest revision checked: 508578)
 setEnvVar CHROMIUM_VERSION 494239 # Chrome 62 linux stable, see https://www.chromium.org/developers/calendar
 setEnvVar CHROMEDRIVER_VERSION_ARG "--versions.chrome 2.33"
-setEnvVar BAZEL_VERSION 0.11.1
 setEnvVar SAUCE_CONNECT_VERSION 4.4.9
 setEnvVar ANGULAR_CLI_VERSION 1.6.3
 setEnvVar PROJECT_ROOT $(cd ${thisDir}/../..; pwd)
diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh
index bc8028c643..ef0f31023a 100755
--- a/scripts/ci/install.sh
+++ b/scripts/ci/install.sh
@@ -64,22 +64,6 @@ if [[ ${TRAVIS} &&
   travisFoldEnd "yarn-install.aio"
 fi
 
-# Install bazel
-if [[ ${TRAVIS} && ${CI_MODE} == "e2e_2" ]]; then
-  travisFoldStart "bazel-install"
-  (
-    mkdir tmp
-    cd tmp
-    curl --location --compressed https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh > bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
-    chmod +x bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
-    ./bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh --user
-    cd ..
-    rm -rf tmp
-  )
-  travisFoldEnd "bazel-install"
-fi
-
-
 # Install Chromium
 if [[ ${TRAVIS} &&
   ${CI_MODE} == "js" ||
diff --git a/scripts/ci/test-e2e-2.sh b/scripts/ci/test-e2e-2.sh
deleted file mode 100755
index 27aab37a89..0000000000
--- a/scripts/ci/test-e2e-2.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Second shard for the e2e tests. Balance it with runtime of test-e2e.sh
-
-set -u -e -o pipefail
-
-# Setup environment
-readonly thisDir=$(cd $(dirname $0); pwd)
-source ${thisDir}/_travis-fold.sh
-
-
-travisFoldStart "test.e2e.buildPackages"
-  ./build.sh
-travisFoldEnd "test.e2e.buildPackages"
-
-# TODO(i): temporarily disable this test because we don't have rxjs backwards compatibility package
-#   and cdk+material are not yet compatible with rxjs v6
-#   uncomment when we have cdk and material releases compatible with rxjs v6
-#travisFoldStart "test.e2e.offlineCompiler"
-#  #TODO(alexeagle): move offline_compiler_test to integration/
-#  ${thisDir}/offline_compiler_test.sh
-#travisFoldEnd "test.e2e.offlineCompiler"
-
-travisFoldStart "test.e2e.platform-server"
-  ./packages/platform-server/integrationtest/run_tests.sh
-travisFoldEnd "test.e2e.platform-server"
-
-travisFoldStart "test.e2e.source-maps"
-  ./node_modules/.bin/gulp source-map-test
-travisFoldEnd "test.e2e.source-maps"
diff --git a/scripts/ci/test-e2e.sh b/scripts/ci/test-e2e.sh
index 40c889578d..bc18b729f6 100755
--- a/scripts/ci/test-e2e.sh
+++ b/scripts/ci/test-e2e.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-# First shard for the e2e tests. Balance it with runtime of test-e2e-2.sh
-
 set -u -e -o pipefail
 
 # Setup environment
@@ -17,7 +15,6 @@ travisFoldStart "test.e2e.check-cycle"
   $(npm bin)/gulp check-cycle
 travisFoldEnd "test.e2e.check-cycle"
 
-
 # Serve files for e2e tests
 (
   $(npm bin)/gulp serve &
@@ -33,3 +30,15 @@ travisFoldEnd "test.e2e.protractor-examples-e2e"
 travisFoldStart "test.e2e.protractor-perf"
   NODE_PATH=$NODE_PATH:./dist/all $(npm bin)/protractor ./protractor-perf.conf.js --bundles=true --dryrun
 travisFoldEnd "test.e2e.protractor-perf"
+
+# TODO(i): temporarily disable this test because we don't have rxjs backwards compatibility package
+#   and cdk+material are not yet compatible with rxjs v6
+#   uncomment when we have cdk and material releases compatible with rxjs v6
+#travisFoldStart "test.e2e.offlineCompiler"
+#  #TODO(alexeagle): move offline_compiler_test to integration/
+#  ${thisDir}/offline_compiler_test.sh
+#travisFoldEnd "test.e2e.offlineCompiler"
+
+travisFoldStart "test.e2e.source-maps"
+  ./node_modules/.bin/gulp source-map-test
+travisFoldEnd "test.e2e.source-maps"
diff --git a/scripts/ci/test.sh b/scripts/ci/test.sh
index d8a73d8464..201616b6e8 100755
--- a/scripts/ci/test.sh
+++ b/scripts/ci/test.sh
@@ -22,9 +22,6 @@ case ${CI_MODE} in
   e2e)
     ${thisDir}/test-e2e.sh
     ;;
-  e2e_2)
-    ${thisDir}/test-e2e-2.sh
-    ;;
   saucelabs_required)
     ${thisDir}/test-saucelabs.sh
     ;;