Merge pull request #24 from SaranshBS/master

jenkins-pipleline-step-execution

Author: francisf

src/main/java/com/browserstack/automate/ci/jenkins/pipeline/AppUploadStepExecution.java

@@ -42,9 +42,8 @@ protected Void run() throws Exception {
             return null;
         }
 
-        EnvVars overrides = run.getEnvironment(taskListener);
-        overrides.put(BrowserStackEnvVars.BROWSERSTACK_APP_ID, appId);
-        HashMap<String, String> overridesMap = new HashMap<>(overrides);
+        HashMap<String, String> overridesMap = new HashMap<String, String>();
+        overridesMap.put(BrowserStackEnvVars.BROWSERSTACK_APP_ID, appId);
 
         body = getContext().newBodyInvoker()
                 .withContext(EnvironmentExpander.merge(getContext().get(EnvironmentExpander.class),

src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepExecution.java

@@ -16,7 +16,7 @@
 import org.jenkinsci.plugins.workflow.steps.BodyExecutionCallback;
 import org.jenkinsci.plugins.workflow.steps.EnvironmentExpander;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
-import org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution;
+import org.jenkinsci.plugins.workflow.steps.StepExecution;
 
 import java.io.IOException;
 import java.io.PrintStream;
@@ -25,7 +25,7 @@
 import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
 import static com.browserstack.automate.ci.common.logger.PluginLogger.logError;
 
-public class BrowserStackPipelineStepExecution extends SynchronousNonBlockingStepExecution<Void> {
+public class BrowserStackPipelineStepExecution extends StepExecution {
     private static final long serialVersionUID = -8810137779949881645L;
     private String credentialsId;
     private StepContext context;
@@ -42,7 +42,7 @@ protected BrowserStackPipelineStepExecution(StepContext context, String credenti
     }
 
     @Override
-    protected Void run() throws Exception {
+    public boolean start() throws Exception {
         Run run = context.get(Run.class);
         TaskListener taskListener = context.get(TaskListener.class);
         Launcher launcher = context.get(Launcher.class);
@@ -55,7 +55,8 @@ protected Void run() throws Exception {
         if (credentials == null) {
             logError(logger, "Credentials id is invalid. Aborting!!!");
             tracker.sendError("No Credentials Available", true, "PipelineExecution");
-            return null;
+            context.onFailure(new Exception("No Credentials Available"));
+            return true;
         }
 
         if (credentials.hasUsername() && credentials.hasAccesskey()) {
@@ -87,7 +88,8 @@ protected Void run() throws Exception {
                         localConfig, browserStackLocal);
 
         EnvVars overrides = run.getEnvironment(taskListener);
-        HashMap<String, String> overridesMap = new HashMap<String, String>(overrides);
+        HashMap<String, String> overridesMap = new HashMap<String, String>();
+        overridesMap.put(Constants.JENKINS_BUILD_TAG, overrides.get(Constants.JENKINS_BUILD_TAG));
         buildWrapperOperations.buildEnvVars(overridesMap);
 
         body = getContext()
@@ -97,7 +99,7 @@ protected Void run() throws Exception {
 
         tracker.pluginInitialized(overrides.get(Constants.JENKINS_BUILD_TAG),
                 (this.localConfig != null), true);
-        return null;
+        return false;
     }
 
     public void startBrowserStackLocal(String buildTag, PrintStream logger, String accessKey,