Skip to content

Commit 213baa3

Browse files
marclavalIgorMinar
authored andcommitted
ci: add Android 6 and 7 (angular#18803)
PR Close angular#18803
1 parent 8959d7d commit 213baa3

File tree

1 file changed

+27
-5
lines changed

1 file changed

+27
-5
lines changed

browser-providers.conf.js

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ var CIconfiguration = {
2626
'Edge': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
2727
'Android4.4': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
2828
'Android5': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
29+
'Android6': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
30+
'Android7': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
2931
'Safari7': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
3032
'Safari8': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
3133
'Safari9': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
@@ -79,6 +81,20 @@ var customLaunchers = {
7981
'SL_ANDROID4.3': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.3'},
8082
'SL_ANDROID4.4': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.4'},
8183
'SL_ANDROID5': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '5.1'},
84+
'SL_ANDROID6': {
85+
base: 'SauceLabs',
86+
browserName: 'Chrome',
87+
platform: 'Android',
88+
version: '6.0',
89+
device: 'Android Emulator'
90+
},
91+
'SL_ANDROID7': {
92+
base: 'SauceLabs',
93+
browserName: 'Chrome',
94+
platform: 'Android',
95+
version: '7.1',
96+
device: 'Android GoogleAPI Emulator'
97+
},
8298

8399
'BS_CHROME': {base: 'BrowserStack', browser: 'chrome', os: 'OS X', os_version: 'Yosemite'},
84100
'BS_FIREFOX': {base: 'BrowserStack', browser: 'firefox', os: 'Windows', os_version: '10'},
@@ -109,6 +125,8 @@ var customLaunchers = {
109125
'BS_EDGE': {base: 'BrowserStack', browser: 'edge', os: 'Windows', os_version: '10'},
110126
'BS_WINDOWSPHONE':
111127
{base: 'BrowserStack', device: 'Nokia Lumia 930', os: 'winphone', os_version: '8.1'},
128+
'BS_ANDROID7': {base: 'BrowserStack', device: 'Google Pixel', os: 'android', os_version: '7.1'},
129+
'BS_ANDROID6': {base: 'BrowserStack', device: 'Google Nexus 6', os: 'android', os_version: '6.0'},
112130
'BS_ANDROID5': {base: 'BrowserStack', device: 'Google Nexus 5', os: 'android', os_version: '5.0'},
113131
'BS_ANDROID4.4': {base: 'BrowserStack', device: 'HTC One M8', os: 'android', os_version: '4.4'},
114132
'BS_ANDROID4.3':
@@ -128,10 +146,13 @@ var sauceAliases = {
128146
'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'
129147
],
130148
'MOBILE': [
131-
'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5', 'SL_IOS7',
132-
'SL_IOS8', 'SL_IOS9', 'SL_IOS10'
149+
'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5',
150+
'SL_ANDROID6', 'SL_ANDROID7', 'SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'
151+
],
152+
'ANDROID': [
153+
'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5',
154+
'SL_ANDROID6', 'SL_ANDROID7'
133155
],
134-
'ANDROID': ['SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5'],
135156
'IE': ['SL_IE9', 'SL_IE10', 'SL_IE11'],
136157
'IOS': ['SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'],
137158
'SAFARI': ['SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'],
@@ -150,9 +171,10 @@ var browserstackAliases = {
150171
'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'
151172
],
152173
'MOBILE': [
153-
'BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10', 'BS_WINDOWSPHONE'
174+
'BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_ANDROID5', 'BS_ANDROID6', 'BS_ANDROID7', 'BS_IOS7',
175+
'BS_IOS8', 'BS_IOS9', 'BS_IOS10', 'BS_WINDOWSPHONE'
154176
],
155-
'ANDROID': ['BS_ANDROID4.3', 'BS_ANDROID4.4'],
177+
'ANDROID': ['BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_ANDROID5', 'BS_ANDROID6', 'BS_ANDROID7'],
156178
'IE': ['BS_IE9', 'BS_IE10', 'BS_IE11'],
157179
'IOS': ['BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10'],
158180
'SAFARI': ['BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'],

0 commit comments

Comments
 (0)