Skip to content

Commit 7e581da

Browse files
alexeagleIgorMinar
authored andcommitted
ci: remove travis e2e_2 job (angular#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 angular#22810
1 parent 102ed3b commit 7e581da

File tree

6 files changed

+12
-54
lines changed

6 files changed

+12
-54
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ env:
4545
matrix:
4646
# Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
4747
- CI_MODE=e2e
48-
- CI_MODE=e2e_2
4948
- CI_MODE=js
5049
- CI_MODE=saucelabs_required
5150
# deactivated, see #19768

scripts/ci/env.sh

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ setEnvVar YARN_VERSION 1.3.2
4040
# Revision 494239 (which was part of Chrome 62.0.3186.0) is the last version that does not cause flakes. (Latest revision checked: 508578)
4141
setEnvVar CHROMIUM_VERSION 494239 # Chrome 62 linux stable, see https://www.chromium.org/developers/calendar
4242
setEnvVar CHROMEDRIVER_VERSION_ARG "--versions.chrome 2.33"
43-
setEnvVar BAZEL_VERSION 0.11.1
4443
setEnvVar SAUCE_CONNECT_VERSION 4.4.9
4544
setEnvVar ANGULAR_CLI_VERSION 1.6.3
4645
setEnvVar PROJECT_ROOT $(cd ${thisDir}/../..; pwd)

scripts/ci/install.sh

-16
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,6 @@ if [[ ${TRAVIS} &&
6464
travisFoldEnd "yarn-install.aio"
6565
fi
6666

67-
# Install bazel
68-
if [[ ${TRAVIS} && ${CI_MODE} == "e2e_2" ]]; then
69-
travisFoldStart "bazel-install"
70-
(
71-
mkdir tmp
72-
cd tmp
73-
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
74-
chmod +x bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
75-
./bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh --user
76-
cd ..
77-
rm -rf tmp
78-
)
79-
travisFoldEnd "bazel-install"
80-
fi
81-
82-
8367
# Install Chromium
8468
if [[ ${TRAVIS} &&
8569
${CI_MODE} == "js" ||

scripts/ci/test-e2e-2.sh

-30
This file was deleted.

scripts/ci/test-e2e.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/usr/bin/env bash
22

3-
# First shard for the e2e tests. Balance it with runtime of test-e2e-2.sh
4-
53
set -u -e -o pipefail
64

75
# Setup environment
@@ -17,7 +15,6 @@ travisFoldStart "test.e2e.check-cycle"
1715
$(npm bin)/gulp check-cycle
1816
travisFoldEnd "test.e2e.check-cycle"
1917

20-
2118
# Serve files for e2e tests
2219
(
2320
$(npm bin)/gulp serve &
@@ -33,3 +30,15 @@ travisFoldEnd "test.e2e.protractor-examples-e2e"
3330
travisFoldStart "test.e2e.protractor-perf"
3431
NODE_PATH=$NODE_PATH:./dist/all $(npm bin)/protractor ./protractor-perf.conf.js --bundles=true --dryrun
3532
travisFoldEnd "test.e2e.protractor-perf"
33+
34+
# TODO(i): temporarily disable this test because we don't have rxjs backwards compatibility package
35+
# and cdk+material are not yet compatible with rxjs v6
36+
# uncomment when we have cdk and material releases compatible with rxjs v6
37+
#travisFoldStart "test.e2e.offlineCompiler"
38+
# #TODO(alexeagle): move offline_compiler_test to integration/
39+
# ${thisDir}/offline_compiler_test.sh
40+
#travisFoldEnd "test.e2e.offlineCompiler"
41+
42+
travisFoldStart "test.e2e.source-maps"
43+
./node_modules/.bin/gulp source-map-test
44+
travisFoldEnd "test.e2e.source-maps"

scripts/ci/test.sh

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ case ${CI_MODE} in
2222
e2e)
2323
${thisDir}/test-e2e.sh
2424
;;
25-
e2e_2)
26-
${thisDir}/test-e2e-2.sh
27-
;;
2825
saucelabs_required)
2926
${thisDir}/test-saucelabs.sh
3027
;;

0 commit comments

Comments
 (0)