Skip to content

build: ensure tunnel identifiers are unique #14108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/browserstack/start-tunnel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rm ${tunnelFileName}
ARGS=""

if [ ! -z "${CIRCLE_BUILD_NUM}" ]; then
ARGS="${ARGS} --local-identifier ${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
ARGS="${ARGS} --local-identifier angular-material-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
fi

echo "Starting Browserstack Local in the background, logging into: ${tunnelLogFile}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/saucelabs/start-tunnel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rm ${tunnelFileName}
sauceArgs="--readyfile ${tunnelReadyFile} --pidfile ${tunnelPidFile}"

if [ ! -z "${CIRCLE_BUILD_NUM}" ]; then
sauceArgs="${sauceArgs} --tunnel-identifier ${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
sauceArgs="${sauceArgs} --tunnel-identifier angular-material-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
fi

echo "Starting Sauce Connect in the background, logging into: ${tunnelLogFile}"
Expand Down
5 changes: 3 additions & 2 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ module.exports = (config) => {
if (process.env['CIRCLECI']) {
const instanceIndex = Number(process.env['CIRCLE_NODE_INDEX']);
const maxParallelInstances = Number(process.env['CIRCLE_NODE_TOTAL']);
const tunnelIdentifier = `${process.env['CIRCLE_BUILD_NUM']}-${instanceIndex}`;
const buildIdentifier = `angular-material-${tunnelIdentifier}`;
const tunnelIdentifier =
`angular-material-${process.env['CIRCLE_BUILD_NUM']}-${instanceIndex}`;
const buildIdentifier = `circleci-${tunnelIdentifier}`;
const testPlatform = process.env['TEST_PLATFORM'];

if (testPlatform === 'browserstack') {
Expand Down