File tree 6 files changed +12
-54
lines changed
6 files changed +12
-54
lines changed Original file line number Diff line number Diff line change 45
45
matrix :
46
46
# Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
47
47
- CI_MODE=e2e
48
- - CI_MODE=e2e_2
49
48
- CI_MODE=js
50
49
- CI_MODE=saucelabs_required
51
50
# deactivated, see #19768
Original file line number Diff line number Diff line change @@ -40,7 +40,6 @@ setEnvVar YARN_VERSION 1.3.2
40
40
# Revision 494239 (which was part of Chrome 62.0.3186.0) is the last version that does not cause flakes. (Latest revision checked: 508578)
41
41
setEnvVar CHROMIUM_VERSION 494239 # Chrome 62 linux stable, see https://www.chromium.org/developers/calendar
42
42
setEnvVar CHROMEDRIVER_VERSION_ARG " --versions.chrome 2.33"
43
- setEnvVar BAZEL_VERSION 0.11.1
44
43
setEnvVar SAUCE_CONNECT_VERSION 4.4.9
45
44
setEnvVar ANGULAR_CLI_VERSION 1.6.3
46
45
setEnvVar PROJECT_ROOT $( cd ${thisDir} /../..; pwd)
Original file line number Diff line number Diff line change @@ -64,22 +64,6 @@ if [[ ${TRAVIS} &&
64
64
travisFoldEnd " yarn-install.aio"
65
65
fi
66
66
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
-
83
67
# Install Chromium
84
68
if [[ ${TRAVIS} &&
85
69
${CI_MODE} == " js" ||
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
- # First shard for the e2e tests. Balance it with runtime of test-e2e-2.sh
4
-
5
3
set -u -e -o pipefail
6
4
7
5
# Setup environment
@@ -17,7 +15,6 @@ travisFoldStart "test.e2e.check-cycle"
17
15
$( npm bin) /gulp check-cycle
18
16
travisFoldEnd " test.e2e.check-cycle"
19
17
20
-
21
18
# Serve files for e2e tests
22
19
(
23
20
$( npm bin) /gulp serve &
@@ -33,3 +30,15 @@ travisFoldEnd "test.e2e.protractor-examples-e2e"
33
30
travisFoldStart " test.e2e.protractor-perf"
34
31
NODE_PATH=$NODE_PATH :./dist/all $( npm bin) /protractor ./protractor-perf.conf.js --bundles=true --dryrun
35
32
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"
Original file line number Diff line number Diff line change @@ -22,9 +22,6 @@ case ${CI_MODE} in
22
22
e2e)
23
23
${thisDir} /test-e2e.sh
24
24
;;
25
- e2e_2)
26
- ${thisDir} /test-e2e-2.sh
27
- ;;
28
25
saucelabs_required)
29
26
${thisDir} /test-saucelabs.sh
30
27
;;
You can’t perform that action at this time.
0 commit comments