Check for both variants of username and access key

browserstack · Apr 28, 2017 · aeb92ac · aeb92ac
1 parent be029f3
commit aeb92ac
Showing 1 changed file with 3 additions and 2 deletions.
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,9 +141,10 @@ 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;
         }
+
         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");