Merge pull request #15 from sinstein/master

Username suffix for tracking sessions run via TeamCity
browserstack · May 2, 2017 · fc0cf34 · fc0cf34
2 parents fa7e21d + aeb92ac
commit fc0cf34
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/browserstack-teamcity-agent/pom.xml b/browserstack-teamcity-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browserstack-teamcity</artifactId>
         <groupId>com.browserstack</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>browserstack-teamcity-agent</artifactId>

diff --git a/...ity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java b/...ity-agent/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackLocalAgent.java
@@ -141,12 +141,16 @@ private void loadBuildFeature(final AgentRunningBuild build) {
      * @param config
      */
     private void exportEnvVars(final BuildRunnerContext runner, final Map<String, String> config) {
-        if (!config.containsKey(EnvVars.BROWSERSTACK_USERNAME) || !config.containsKey(EnvVars.BROWSERSTACK_ACCESS_KEY)) {
-            return;
+        if(!((config.containsKey(EnvVars.BROWSERSTACK_USERNAME) || config.containsKey(EnvVars.BROWSERSTACK_USER)) && (config.containsKey(EnvVars.BROWSERSTACK_ACCESS_KEY) || config.containsKey(EnvVars.BROWSERSTACK_ACCESSKEY)))) {
+          return;
         }
 
-        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_USERNAME, config.get(EnvVars.BROWSERSTACK_USERNAME));
-        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_ACCESS_KEY, config.get(EnvVars.BROWSERSTACK_ACCESS_KEY));
+        String username = config.get(EnvVars.BROWSERSTACK_USERNAME) == null ? config.get(EnvVars.BROWSERSTACK_USER) : config.get(EnvVars.BROWSERSTACK_USERNAME);
+        String accesskey = config.get(EnvVars.BROWSERSTACK_ACCESS_KEY) == null ? config.get(EnvVars.BROWSERSTACK_ACCESSKEY) : config.get(EnvVars.BROWSERSTACK_ACCESS_KEY);
+        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_USERNAME, username + "-teamcity");
+        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_USER, username + "-teamcity");
+        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_ACCESS_KEY, accesskey);
+        runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_ACCESSKEY, accesskey);
         runner.addEnvironmentVariable(EnvVars.BROWSERSTACK_LOCAL, config.get(EnvVars.BROWSERSTACK_LOCAL));
 
         BuildProgressLogger buildLogger = runner.getBuild().getBuildLogger();

diff --git a/browserstack-teamcity-common/pom.xml b/browserstack-teamcity-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browserstack-teamcity</artifactId>
         <groupId>com.browserstack</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <artifactId>browserstack-teamcity-common</artifactId>
     <packaging>jar</packaging>

diff --git a/...ty-common/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackParameters.java b/...ty-common/src/main/java/com/browserstack/automate/ci/teamcity/BrowserStackParameters.java
@@ -6,7 +6,9 @@ public class BrowserStackParameters {
 
     public interface EnvVars {
         String BROWSERSTACK_USERNAME = "BROWSERSTACK_USERNAME";
+        String BROWSERSTACK_USER = "BROWSERSTACK_USER";
         String BROWSERSTACK_ACCESS_KEY = "BROWSERSTACK_ACCESS_KEY";
+        String BROWSERSTACK_ACCESSKEY = "BROWSERSTACK_ACCESSKEY";
         String BROWSERSTACK_LOCAL = "BROWSERSTACK_LOCAL";
         String BROWSERSTACK_LOCAL_IDENTIFIER = "BROWSERSTACK_LOCAL_IDENTIFIER";
         String BROWSERSTACK_BUILD = "BROWSERSTACK_BUILD";

diff --git a/browserstack-teamcity-server/pom.xml b/browserstack-teamcity-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>browserstack-teamcity</artifactId>
     <groupId>com.browserstack</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
   <artifactId>browserstack-teamcity-server</artifactId>
   <packaging>jar</packaging>

diff --git a/build/pom.xml b/build/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browserstack-teamcity</artifactId>
         <groupId>com.browserstack</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>build</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.browserstack</groupId>
     <artifactId>browserstack-teamcity</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>pom</packaging>
 
     <properties>