From d537a26297c44d3d9638b799a46e689187d6752b Mon Sep 17 00:00:00 2001 From: Marc Laval Date: Mon, 9 May 2016 16:47:26 -0700 Subject: [PATCH] chore(build): reenable optional jobs in SL and BS Closes #8558 --- .travis.yml | 11 +++++++---- browser-providers.conf.js | 16 ++++++++-------- karma-js.conf.js | 2 +- scripts/ci-lite/cleanup.sh | 6 ++++++ scripts/ci-lite/env.sh | 6 ++++++ scripts/ci-lite/install.sh | 4 ++-- scripts/ci-lite/test_browserstack.sh | 2 +- scripts/ci-lite/test_saucelabs.sh | 2 +- 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 577f2bd763..e4ac2d009a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,11 +41,14 @@ env: - CI_MODE=e2e - CI_MODE=saucelabs_required - CI_MODE=browserstack_required + # To be activted when the required CI is more stable + #- CI_MODE=saucelabs_optional + #- CI_MODE=browserstack_optional -#matrix: -# allow_failures: -# - env: "MODE=saucelabs_optional" -# - env: "MODE=browserstack_optional" +matrix: + allow_failures: + - env: "CI_MODE=saucelabs_optional" + - env: "CI_MODE=browserstack_optional" install: diff --git a/browser-providers.conf.js b/browser-providers.conf.js index 6dbed1bfa2..9f32ef14ef 100644 --- a/browser-providers.conf.js +++ b/browser-providers.conf.js @@ -4,15 +4,16 @@ var CIconfiguration = { 'Chrome': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'Firefox': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, - // FirefoxBeta should be required:true - // https://github.com/angular/angular/issues/7560 - 'FirefoxBeta': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: false}}, + // FirefoxBeta and ChromeBeta should be target:'BS' or target:'SL', and required:true + // Currently deactivated due to https://github.com/angular/angular/issues/7560 + 'ChromeBeta': { unitTest: {target: null, required: true}, e2e: {target: null, required: false}}, + 'FirefoxBeta': { unitTest: {target: null, required: false}, e2e: {target: null, required: false}}, 'ChromeDev': { unitTest: {target: null, required: true}, e2e: {target: null, required: true}}, 'FirefoxDev': { unitTest: {target: null, required: true}, e2e: {target: null, required: true}}, 'IE9': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, 'IE10': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'IE11': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, - 'Edge': { unitTest: {target: null, required: true}, e2e: {target: null, required: false}}, + 'Edge': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, 'Android4.1': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, 'Android4.2': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, 'Android4.3': { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}}, @@ -23,8 +24,7 @@ var CIconfiguration = { 'Safari9': { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}, 'iOS7': { unitTest: {target: 'BS', required: true}, e2e: {target: null, required: true}}, 'iOS8': { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}, - // TODO(mlaval): iOS9 deactivated as not reliable, reactivate after https://github.com/angular/angular/issues/5408 - 'iOS9': { unitTest: {target: null, required: false}, e2e: {target: null, required: true}}, + 'iOS9': { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}, 'WindowsPhone': { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}} }; @@ -121,9 +121,9 @@ var customLaunchers = { }, 'SL_EDGE': { base: 'SauceLabs', - browserName: 'microsoftedge', + browserName: 'MicrosoftEdge', platform: 'Windows 10', - version: '20.10240' + version: '13.10586' }, 'SL_ANDROID4.1': { base: 'SauceLabs', diff --git a/karma-js.conf.js b/karma-js.conf.js index 3369b84cae..a413e56f4a 100644 --- a/karma-js.conf.js +++ b/karma-js.conf.js @@ -68,7 +68,7 @@ module.exports = function(config) { recordVideo: false, recordScreenshots: false, options: { - 'selenium-version': '2.48.2', + 'selenium-version': '2.53.0', 'command-timeout': 600, 'idle-timeout': 600, 'max-duration': 5400 diff --git a/scripts/ci-lite/cleanup.sh b/scripts/ci-lite/cleanup.sh index 954057fde8..567652ed63 100755 --- a/scripts/ci-lite/cleanup.sh +++ b/scripts/ci-lite/cleanup.sh @@ -21,6 +21,12 @@ if [[ ${TRAVIS} ]]; then browserstack_required) ./scripts/browserstack/teardown_tunnel.sh ;; + saucelabs_optional) + ./scripts/sauce/sauce_connect_teardown.sh + ;; + browserstack_optional) + ./scripts/browserstack/teardown_tunnel.sh + ;; esac fi diff --git a/scripts/ci-lite/env.sh b/scripts/ci-lite/env.sh index 6763bb7c64..5a8b9fcea5 100644 --- a/scripts/ci-lite/env.sh +++ b/scripts/ci-lite/env.sh @@ -30,6 +30,12 @@ if [[ ${TRAVIS} ]]; then browserstack_required) KARMA_JS_BROWSERS=`node -e "console.log(require('/home/travis/build/angular/angular/browser-providers.conf').browserstackAliases.CI_REQUIRED.join(','))"` ;; + saucelabs_optional) + KARMA_JS_BROWSERS=`node -e "console.log(require('/home/travis/build/angular/angular/browser-providers.conf').sauceAliases.CI_OPTIONAL.join(','))"` + ;; + browserstack_optional) + KARMA_JS_BROWSERS=`node -e "console.log(require('/home/travis/build/angular/angular/browser-providers.conf').browserstackAliases.CI_OPTIONAL.join(','))"` + ;; esac else KARMA_JS_BROWSERS=Chrome diff --git a/scripts/ci-lite/install.sh b/scripts/ci-lite/install.sh index 0789bbb450..2e9bda085a 100755 --- a/scripts/ci-lite/install.sh +++ b/scripts/ci-lite/install.sh @@ -46,7 +46,7 @@ echo 'travis_fold:end:install-chromium' # Install Sauce Connect echo 'travis_fold:start:install.sauceConnect' -if [[ ${TRAVIS} && ${CI_MODE} == "saucelabs_required" ]]; then +if [[ ${TRAVIS}] && (${CI_MODE} == "saucelabs_required" || ${CI_MODE} == "saucelabs_optional") ]]; then ./scripts/sauce/sauce_connect_setup.sh fi echo 'travis_fold:end:install.sauceConnect' @@ -54,7 +54,7 @@ echo 'travis_fold:end:install.sauceConnect' # Install BrowserStack Tunnel echo 'travis_fold:start:install.browserstack' -if [[ ${TRAVIS} && ${CI_MODE} == "browserstack_required" ]]; then +if [[ ${TRAVIS} && (${CI_MODE} == "browserstack_required" || ${CI_MODE} == "browserstack_optional") ]]; then ./scripts/browserstack/start_tunnel.sh fi echo 'travis_fold:end:install.browserstack' diff --git a/scripts/ci-lite/test_browserstack.sh b/scripts/ci-lite/test_browserstack.sh index e19df83071..01812ad9b8 100755 --- a/scripts/ci-lite/test_browserstack.sh +++ b/scripts/ci-lite/test_browserstack.sh @@ -2,7 +2,7 @@ set -ex -o pipefail -if [[ ${TRAVIS} && ${CI_MODE} != "browserstack_required" ]]; then +if [[ ${TRAVIS} && ${CI_MODE} != "browserstack_required" && ${CI_MODE} != "browserstack_optional" ]]; then exit 0; fi diff --git a/scripts/ci-lite/test_saucelabs.sh b/scripts/ci-lite/test_saucelabs.sh index 16b3248d87..2ad21821c3 100755 --- a/scripts/ci-lite/test_saucelabs.sh +++ b/scripts/ci-lite/test_saucelabs.sh @@ -2,7 +2,7 @@ set -ex -o pipefail -if [[ ${TRAVIS} && ${CI_MODE} != "saucelabs_required" ]]; then +if [[ ${TRAVIS} && ${CI_MODE} != "saucelabs_required" && ${CI_MODE} != "saucelabs_optional" ]]; then exit 0; fi