Skip to content

Commit 9f40d2a

Browse files
josephperrottAndrewKushnir
josephperrott
authored and
AndrewKushnir
committed
ci: remove browserstack configuration (angular#43881)
Remove browserstack configuration from the repo as it is not used for our CI. PR Close angular#43881
1 parent ec8a565 commit 9f40d2a

13 files changed

Lines changed: 6 additions & 278 deletions

File tree

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ The `<type>` and `<summary>` fields are mandatory, the `(<scope>)` field is opti
259259
Must be one of the following:
260260
261261
* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
262-
* **ci**: Changes to our CI configuration files and scripts (example scopes: Circle, BrowserStack, SauceLabs)
262+
* **ci**: Changes to our CI configuration files and scripts (examples: CircleCi, SauceLabs)
263263
* **docs**: Documentation only changes
264264
* **feat**: A new feature
265265
* **fix**: A bug fix

‎browser-providers.conf.js‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*/
88

99
// Unique place to configure the browsers which are used in the different CI jobs in Sauce Labs (SL)
10-
// and BrowserStack (BS).
1110
// If the target is set to null, then the browser is not run anywhere during CI.
1211
// If a category becomes empty (e.g. BS and required), then the corresponding job must be commented
1312
// out in the CI configuration.
@@ -120,14 +119,7 @@ var customLaunchers = {
120119
platform: 'Android',
121120
version: '10.0',
122121
device: 'Android GoogleAPI Emulator'
123-
},
124-
'BS_CHROME': {base: 'BrowserStack', browser: 'chrome', os: 'OS X', os_version: 'Yosemite'},
125-
'BS_FIREFOX': {base: 'BrowserStack', browser: 'firefox', os: 'Windows', os_version: '10'},
126-
'BS_SAFARI10': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Sierra'},
127-
'BS_EDGE': {base: 'BrowserStack', browser: 'edge', os: 'Windows', os_version: '10'},
128-
'BS_WINDOWSPHONE':
129-
{base: 'BrowserStack', device: 'Nokia Lumia 930', os: 'winphone', os_version: '8.1'},
130-
'BS_ANDROID7': {base: 'BrowserStack', device: 'Google Pixel', os: 'android', os_version: '7.1'}
122+
}
131123
};
132124

133125
var sauceAliases = {
@@ -146,27 +138,9 @@ var sauceAliases = {
146138
'CI_OPTIONAL': buildConfiguration('unitTest', 'SL', false)
147139
};
148140

149-
var browserstackAliases = {
150-
'ALL': Object.keys(customLaunchers).filter(function(item) {
151-
return customLaunchers[item].base == 'BrowserStack';
152-
}),
153-
'DESKTOP': [
154-
'BS_CHROME',
155-
'BS_FIREFOX',
156-
'BS_EDGE',
157-
],
158-
'MOBILE': ['BS_ANDROID7', 'BS_WINDOWSPHONE'],
159-
'ANDROID': ['BS_ANDROID7'],
160-
'IOS': [],
161-
'SAFARI': [],
162-
'CI_REQUIRED': buildConfiguration('unitTest', 'BS', true),
163-
'CI_OPTIONAL': buildConfiguration('unitTest', 'BS', false)
164-
};
165-
166141
module.exports = {
167142
customLaunchers: customLaunchers,
168143
sauceAliases: sauceAliases,
169-
browserstackAliases: browserstackAliases
170144
};
171145

172146
function buildConfiguration(type, target, required) {

‎karma-js.conf.js‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ module.exports = function(config) {
102102

103103
plugins: [
104104
'karma-jasmine',
105-
'karma-browserstack-launcher',
106105
'karma-sauce-launcher',
107106
'karma-chrome-launcher',
108107
'karma-sourcemap-loader',
@@ -134,14 +133,6 @@ module.exports = function(config) {
134133
maxDuration: 5400,
135134
},
136135

137-
browserStack: {
138-
project: 'Angular2',
139-
startTunnel: false,
140-
retryLimit: 3,
141-
timeout: 1800,
142-
pollingTimeout: 10000,
143-
},
144-
145136
// Try "websocket" for a faster transmission first. Fallback to "polling" if necessary.
146137
transports: ['websocket', 'polling'],
147138

@@ -168,11 +159,6 @@ module.exports = function(config) {
168159
// Setup the Saucelabs plugin so that it can launch browsers using the proper tunnel.
169160
conf.sauceLabs.build = tunnelIdentifier;
170161
conf.sauceLabs.tunnelIdentifier = tunnelIdentifier;
171-
172-
// Setup the Browserstack plugin so that it can launch browsers using the proper tunnel.
173-
// TODO: This is currently not used because BS doesn't run on the CI. Consider removing.
174-
conf.browserStack.build = tunnelIdentifier;
175-
conf.browserStack.tunnelIdentifier = tunnelIdentifier;
176162
}
177163

178164
// For SauceLabs jobs, we set up a domain which resolves to the machine which launched
@@ -188,8 +174,7 @@ module.exports = function(config) {
188174
}
189175

190176
if (process.env.KARMA_WEB_TEST_MODE) {
191-
// KARMA_WEB_TEST_MODE is used to setup karma to run in
192-
// SauceLabs or Browserstack
177+
// KARMA_WEB_TEST_MODE is used to setup karma to run in SauceLabs.
193178
console.log(`KARMA_WEB_TEST_MODE: ${process.env.KARMA_WEB_TEST_MODE}`);
194179

195180
switch (process.env.KARMA_WEB_TEST_MODE) {
@@ -199,12 +184,6 @@ module.exports = function(config) {
199184
case 'SL_OPTIONAL':
200185
conf.browsers = browserProvidersConf.sauceAliases.CI_OPTIONAL;
201186
break;
202-
case 'BS_REQUIRED':
203-
conf.browsers = browserProvidersConf.browserstackAliases.CI_REQUIRED;
204-
break;
205-
case 'BS_OPTIONAL':
206-
conf.browsers = browserProvidersConf.browserstackAliases.CI_OPTIONAL;
207-
break;
208187
default:
209188
throw new Error(
210189
`Unrecognized process.env.KARMA_WEB_TEST_MODE: ${process.env.KARMA_WEB_TEST_MODE}`);

‎package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@
169169
"@types/cldrjs": "^0.4.22",
170170
"@types/cli-progress": "^3.4.2",
171171
"@yarnpkg/lockfile": "^1.1.0",
172-
"browserstacktunnel-wrapper": "^2.0.4",
173172
"check-side-effects": "0.0.23",
174173
"cldr": "7.1.1",
175174
"cldrjs": "0.5.5",
@@ -180,7 +179,6 @@
180179
"gulp-conventional-changelog": "^2.0.35",
181180
"husky": "7.0.2",
182181
"inquirer": "^8.0.0",
183-
"karma-browserstack-launcher": "^1.3.0",
184182
"karma-sauce-launcher": "^4.3.6",
185183
"madge": "^5.0.0",
186184
"sauce-connect": "https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz",

‎packages/common/test/i18n/format_date_spec.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ describe('Format date', () => {
345345
// https://github.com/angular/angular/issues/21491
346346
it('should not assume UTC for iso strings in Safari if the timezone is not defined', () => {
347347
// this test only works if the timezone is not in UTC
348-
// which is the case for BrowserStack when we test Safari
349348
if (new Date().getTimezoneOffset() !== 0) {
350349
expect(formatDate('2018-01-11T13:00:00', 'HH', ɵDEFAULT_LOCALE_ID))
351350
.not.toEqual(formatDate('2018-01-11T13:00:00Z', 'HH', ɵDEFAULT_LOCALE_ID));

‎packages/router/karma.conf.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ module.exports = function(config) {
8989

9090
plugins: [
9191
'karma-jasmine',
92-
'karma-browserstack-launcher',
9392
'karma-sauce-launcher',
9493
'karma-chrome-launcher',
9594
'karma-sourcemap-loader',

‎packages/zone.js/test/karma_test.bzl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps,
7878
],
7979
tags = ["zone_karma_test"],
8080
runtime_deps = [
81-
"@npm//karma-browserstack-launcher",
8281
"@npm//karma-sauce-launcher",
8382
],
8483
)
@@ -110,7 +109,6 @@ def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps,
110109
# Visible to //:saucelabs_unit_tests_poc target
111110
visibility = ["//:__pkg__"],
112111
runtime_deps = [
113-
"@npm//karma-browserstack-launcher",
114112
"@npm//karma-sauce-launcher",
115113
],
116114
)

‎scripts/browserstack/start_tunnel.js‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎scripts/browserstack/start_tunnel.sh‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎scripts/browserstack/teardown_tunnel.sh‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)