chore(build): reenable optional jobs in SL and BS

Closes #8558

.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:
+matrix:
-#  allow_failures:
+  allow_failures:
-#    - env: "MODE=saucelabs_optional"
+    - env: "CI_MODE=saucelabs_optional"
-#    - env: "MODE=browserstack_optional"
+    - env: "CI_MODE=browserstack_optional"
 
 
 install:

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
+  // FirefoxBeta and ChromeBeta should be target:'BS' or target:'SL', and required:true
-  // https://github.com/angular/angular/issues/7560
+  // Currently deactivated due to https://github.com/angular/angular/issues/7560
-  'FirefoxBeta':  { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: false}},
+  '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: 'BS', required: false}, e2e: {target: null, required: true}},
-  'iOS9':         { unitTest: {target: null, 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',

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

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
 

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

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'

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
 

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