From 039ca606c84e585675b8bcea123ad4ae993cebac Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 14 Nov 2018 23:19:22 +0100
Subject: [PATCH] build: ensure tunnel identifiers are unique (#14108)

* Currently it can happen that our tunnel identifier conflicts with other tunnel identifiers from other Angular projects. A few PRs reported that their tunnel couldn't be re-opened because it was already used and closed successfully.
---
 scripts/browserstack/start-tunnel.sh | 2 +-
 scripts/saucelabs/start-tunnel.sh    | 2 +-
 test/karma.conf.js                   | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/browserstack/start-tunnel.sh b/scripts/browserstack/start-tunnel.sh
index 2ae2e0b74b4..bddbbfec0ba 100755
--- a/scripts/browserstack/start-tunnel.sh
+++ b/scripts/browserstack/start-tunnel.sh
@@ -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}"
diff --git a/scripts/saucelabs/start-tunnel.sh b/scripts/saucelabs/start-tunnel.sh
index 21da8866938..d2618a6b3be 100755
--- a/scripts/saucelabs/start-tunnel.sh
+++ b/scripts/saucelabs/start-tunnel.sh
@@ -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}"
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 5489c81ad14..fe643faef96 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -95,8 +95,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') {