ci: Azure Pipelines: upgrade from macOS 10.13 -> 10.14 (#2204)

niklasvh · Apr 15, 2020 · c366e87 · c366e87
1 parent ae5f866
commit c366e87
Show file tree

Hide file tree

Showing 5 changed files with 1,438 additions and 163 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -74,28 +74,29 @@ jobs:
     parameters:
       name: Browser_Tests_OSX_Safari_IOS_9
       displayName: iOS Simulator Safari 9
-      vmImage: 'macOS-10.13'
+      vmImage: 'macOS-10.14'
       targetBrowser: Safari_IOS_9
 
   - template: ci/browser-tests.yml
     parameters:
       name: Browser_Tests_OSX_Safari_IOS_10
       displayName: iOS Simulator Safari 10
-      vmImage: 'macOS-10.13'
+      vmImage: 'macOS-10.14'
       targetBrowser: Safari_IOS_10
 
   - template: ci/browser-tests.yml
     parameters:
       name: Browser_Tests_OSX_Safari_IOS_12
       displayName: iOS Simulator Safari 12
-      vmImage: 'macOS-10.13'
+      vmImage: 'macOS-10.14'
       targetBrowser: Safari_IOS_12
+      xcodeSelection: '/Applications/Xcode_10.1.app'
 
   - template: ci/browser-tests.yml
     parameters:
       name: Browser_Tests_OSX_Safari_Stable
       displayName: OSX Safari Stable
-      vmImage: 'macOS-10.13'
+      vmImage: 'macOS-10.14'
       targetBrowser: Safari_Stable
 
   - template: ci/browser-tests.yml

diff --git a/ci/browser-tests.yml b/ci/browser-tests.yml
@@ -31,6 +31,9 @@ jobs:
       inputs:
         artifactName: build
         downloadPath: $(System.DefaultWorkingDirectory)
+    - ${{ if ne(parameters.xcodeSelection, '') }}:
+      - script: sudo xcode-select -s "${{ parameters.xcodeSelection }}"
+        displayName: 'Switch Xcode'
     - ${{ if not(eq(parameters.xvfb, 'true')) }}:
       - script: npm run karma
         displayName: 'Run browser tests'

diff --git a/karma.conf.js b/karma.conf.js
@@ -4,6 +4,7 @@
 const path = require('path');
 const simctl = require('node-simctl');
 const iosSimulator = require('appium-ios-simulator');
+const listenAddress = 'localhost';
 const port = 9876;
 
 const log = require('karma/lib/logger').create('launcher:MobileSafari');
@@ -13,16 +14,19 @@ module.exports = function(config) {
         Safari_IOS_9: {
             base: 'MobileSafari',
             name: 'iPhone 5s',
+            platform: 'iOS',
             sdk: '9.0'
         },
         Safari_IOS_10: {
             base: 'MobileSafari',
             name: 'iPhone 5s',
+            platform: 'iOS',
             sdk: '10.0'
         },
         Safari_IOS_12: {
             base: 'MobileSafari',
             name: 'iPhone 5s',
+            platform: 'iOS',
             sdk: '12.1'
         },
         SauceLabs_IE9: {
@@ -85,7 +89,7 @@ module.exports = function(config) {
             flags: ['-extoff']
         },
         Safari_Stable: {
-            base: 'Safari'
+            base: 'SafariNative'
         },
         Chrome_Stable: {
             base: 'ChromeHeadless'
@@ -125,8 +129,8 @@ module.exports = function(config) {
         }
         baseBrowserDecorator(this);
         this.on('start', url => {
-            simctl.getDevices().then(devices => {
-                const d = devices[args.sdk].find(d => {
+            simctl.getDevices(args.sdk, args.platform).then(devices => {
+                const d = devices.find(d => {
                     return d.name === args.name;
                 });
 
@@ -208,6 +212,9 @@ module.exports = function(config) {
             outputDir: 'tmp/junit/'
         },
 
+        // web server listen address,
+        listenAddress,
+
         // web server port
         port,