From 0d1b3f814d0f9e23d8ed59944e12d896325397c0 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Thu, 6 Mar 2025 09:54:07 +0530
Subject: [PATCH 01/40] [maven-release-plugin] prepare release bstack-test

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34c6093..2fd97e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.16-SNAPSHOT</version>
+  <version>1.2.17</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>HEAD</tag>
+    <tag>bstack-test</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From 9cad71db5534b9ebf2bacfa6066a5827031f9adc Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Thu, 6 Mar 2025 09:54:08 +0530
Subject: [PATCH 02/40] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2fd97e7..7bea2db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.17</version>
+  <version>1.2.18-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>bstack-test</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From 4afaf2fbb79904a814d130ee4733be3a8ea2f109 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sat, 8 Mar 2025 18:17:23 +0530
Subject: [PATCH 03/40] [maven-release-plugin] prepare release
 browserstack-integration-1.2.18

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7bea2db..ae76a81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.18-SNAPSHOT</version>
+  <version>1.2.18</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>HEAD</tag>
+    <tag>browserstack-integration-1.2.18</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From 1f5e919ce04a900d208bcc7f96cffd36344cd788 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sat, 8 Mar 2025 18:17:24 +0530
Subject: [PATCH 04/40] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae76a81..8b94685 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.18</version>
+  <version>1.2.19-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>browserstack-integration-1.2.18</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From 74f637f86b8d868afc3dd844f53de11f055985b4 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sat, 8 Mar 2025 18:23:13 +0530
Subject: [PATCH 05/40] [maven-release-plugin] prepare release
 browserstack-integration-1.2.19

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b94685..2268686 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.19-SNAPSHOT</version>
+  <version>1.2.19</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>HEAD</tag>
+    <tag>browserstack-integration-1.2.19</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From 835e379788a13bb0525b3619cc0f0c1658b69732 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sat, 8 Mar 2025 18:23:13 +0530
Subject: [PATCH 06/40] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2268686..9b766aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.19</version>
+  <version>1.2.20-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>browserstack-integration-1.2.19</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From 98383b49043a0bd8e683b67333d5a868495db700 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sat, 8 Mar 2025 18:43:50 +0530
Subject: [PATCH 07/40] [maven-release-plugin] prepare release
 browserstack-integration-1.2.20

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9b766aa..885e966 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.20-SNAPSHOT</version>
+  <version>1.2.20</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>HEAD</tag>
+    <tag>browserstack-integration-1.2.20</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From f0f049d4a815d505d0abefa5da432f4371d9ee5e Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sat, 8 Mar 2025 18:43:51 +0530
Subject: [PATCH 08/40] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 885e966..1fecd92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.20</version>
+  <version>1.2.21-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>browserstack-integration-1.2.20</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From 4b2f799701e148d3df05a997f3a1afc2a087b4ea Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sun, 16 Mar 2025 18:08:24 +0530
Subject: [PATCH 09/40] intg 1575 adding support for showing bstack report in
 jenkins

---
 .../ci/common/BrowserStackEnvVars.java        |   2 +
 .../ci/common/constants/Constants.java        |   5 +
 ...ractBrowserStackReportFetcherForBuild.java |  29 ++++
 .../BrowserStackReportFetcherForBuild.java    | 106 ++++++++++++
 .../BrowserStackReportFetcherPublisher.java   | 163 ++++++++++++++++++
 .../automate/ci/jenkins/makeRequestsUtil.java |  26 +++
 .../index.jelly                               | 105 +++++++++++
 7 files changed, 436 insertions(+)
 create mode 100644 src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild.java
 create mode 100644 src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherForBuild.java
 create mode 100644 src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherPublisher.java
 create mode 100644 src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java
 create mode 100644 src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild/index.jelly

diff --git a/src/main/java/com/browserstack/automate/ci/common/BrowserStackEnvVars.java b/src/main/java/com/browserstack/automate/ci/common/BrowserStackEnvVars.java
index 9b717bc..578aa6d 100644
--- a/src/main/java/com/browserstack/automate/ci/common/BrowserStackEnvVars.java
+++ b/src/main/java/com/browserstack/automate/ci/common/BrowserStackEnvVars.java
@@ -9,6 +9,8 @@ public interface BrowserStackEnvVars {
     String BROWSERSTACK_LOCAL_IDENTIFIER = "BROWSERSTACK_LOCAL_IDENTIFIER";
     String BROWSERSTACK_BUILD = "BROWSERSTACK_BUILD";
     String BROWSERSTACK_BUILD_NAME = "BROWSERSTACK_BUILD_NAME";
+
+    String BROWSERSTACK_PROJECT_NAME = "BROWSERSTACK_PROJECT_NAME";
     String BROWSERSTACK_APP_ID = "BROWSERSTACK_APP_ID";
     String BROWSERSTACK_RERUN = "BROWSERSTACK_RERUN";
     String BROWSERSTACK_RERUN_TESTS = "BROWSERSTACK_RERUN_TESTS";
diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index 0b87979..331f4ff 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -15,6 +15,11 @@ public class Constants {
     public static final String BROWSERSTACK_REPORT_PATH_PATTERN = "**/browserstack-artifacts/*";
     public static final String JENKINS_CI_PLUGIN = "JenkinsCiPlugin";
 
+    public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "http://localhost:3002/api/v1/external/ci/report-config";
+
+    public static final String REPORT_COMPLETED_STATUS = "COMPLETED";
+    public static final String REPORT_IN_PROGRESS_STATUS = "IN_PROGRESS";
+
     // Product
     public static final String AUTOMATE = "automate";
     public static final String APP_AUTOMATE = "app-automate";
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild.java b/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild.java
new file mode 100644
index 0000000..903331b
--- /dev/null
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild.java
@@ -0,0 +1,29 @@
+package com.browserstack.automate.ci.jenkins;
+
+import com.browserstack.automate.ci.common.constants.Constants;
+import hudson.model.Run;
+import hudson.model.Action;
+
+public abstract class AbstractBrowserStackReportFetcherForBuild implements Action  {
+  private Run<?, ?> run;
+
+
+  @Override
+  public String getIconFileName() {
+    return Constants.BROWSERSTACK_LOGO;
+  }
+
+  @Override
+  public abstract  String getDisplayName();
+
+  @Override
+  public abstract String getUrlName();
+
+  public Run<?, ?> getBuild() {
+    return run;
+  }
+
+  public void setBuild(Run<?, ?> build) {
+    this.run = build;
+  }
+}
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherForBuild.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherForBuild.java
new file mode 100644
index 0000000..d540b3d
--- /dev/null
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherForBuild.java
@@ -0,0 +1,106 @@
+package com.browserstack.automate.ci.jenkins;
+
+import com.browserstack.automate.ci.common.constants.Constants;
+import hudson.model.Run;
+import org.json.JSONObject;
+import okhttp3.*;
+
+import java.io.PrintStream;
+
+import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
+import static com.browserstack.automate.ci.common.logger.PluginLogger.logError;
+
+public class BrowserStackReportFetcherForBuild extends AbstractBrowserStackReportFetcherForBuild {
+
+ private BrowserStackCredentials credentials;
+  private String reportUrl;
+  private final String UUID;
+  private String reportHtml;
+  private final transient PrintStream logger;
+  private String reportStyle;
+  private String reportName;
+  private String urlName;
+  private static final String REPORT_IN_PROGRESS = "REPORT_IN_PROGRESS";
+  private static final String REPORT_FAILED = "REPORT_FAILED";
+  private static final OkHttpClient client = new OkHttpClient();
+  makeRequestsUtil requestsUtil;
+
+  public BrowserStackReportFetcherForBuild(Run<?, ?> run, BrowserStackCredentials credentials, String reportUrl, String UUID, String reportName, String tabUrl, final PrintStream logger) {
+    super();
+    setBuild(run);
+    this.credentials = credentials;
+    this.reportUrl = reportUrl;
+    this.UUID = UUID;
+    this.reportHtml = null;
+    this.reportStyle = "";
+    this.logger = logger;
+    this.reportName = reportName;
+    this.urlName = tabUrl;
+    requestsUtil = new makeRequestsUtil();
+  }
+
+
+  public String getReportHtml() {
+    fetchReportConditions();
+    return reportHtml;
+  }
+  public String getReportStyle() {
+    fetchReportConditions();
+    return reportStyle;
+  }
+
+  private void fetchReportConditions() {
+    if ( reportHtml==null || reportHtml.equals(REPORT_IN_PROGRESS) || reportHtml.equals(REPORT_FAILED)) {
+      fetchReport();
+    }
+  }
+  private void fetchReport() {
+    String CIReportUrlWithParams = reportUrl + "?UUID=" + UUID + "&report_name=" + reportName;
+    log(logger, "Fetching report from" + CIReportUrlWithParams);
+    try {
+      Response response = requestsUtil.makeRequest(CIReportUrlWithParams, credentials);
+      if (response.isSuccessful()) {
+        JSONObject reportResponse = new JSONObject(response.body().string());
+        String reportStatus = reportResponse.optString("report_status");
+        if(reportStatus.equalsIgnoreCase(Constants.REPORT_COMPLETED_STATUS)) {
+          reportHtml = reportResponse.optString("report_html", null);
+          reportStyle = reportResponse.optString("report_style", "");
+        } else if(reportStatus.equalsIgnoreCase(Constants.REPORT_IN_PROGRESS_STATUS)){
+          reportHtml = REPORT_IN_PROGRESS;
+        } else {
+          reportHtml = REPORT_FAILED;
+        }
+        logError(logger, "Received Non success response while fetching report" + response.code());
+      }
+    } catch (Exception e) {
+      reportHtml = REPORT_FAILED;
+      logError(logger, "Exception while fetching the report" + e.getMessage());
+    }
+  }
+
+  public boolean isReportInProgress() {
+    return reportHtml.equals(REPORT_IN_PROGRESS);
+  }
+
+  public  boolean isReportFailed() {
+    return reportHtml.equals(REPORT_FAILED);
+  }
+
+  public boolean isReportAvailable() {
+    if(reportHtml!=null && !reportHtml.equals(REPORT_IN_PROGRESS) && !reportHtml.equals(REPORT_FAILED)){
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public  String getDisplayName() {
+    return this.reportName;
+  }
+
+  @Override
+  public String getUrlName(){
+    return this.urlName;
+  }
+
+}
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherPublisher.java
new file mode 100644
index 0000000..be139ed
--- /dev/null
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherPublisher.java
@@ -0,0 +1,163 @@
+package com.browserstack.automate.ci.jenkins;
+
+import com.browserstack.automate.ci.common.BrowserStackEnvVars;
+import com.browserstack.automate.ci.common.constants.Constants;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.EnvVars;
+import hudson.Extension;
+import hudson.model.AbstractProject;
+import hudson.model.Run;
+import hudson.model.TaskListener;
+import hudson.tasks.BuildStepDescriptor;
+import hudson.tasks.BuildStepMonitor;
+import hudson.tasks.Publisher;
+import hudson.tasks.Recorder;
+import hudson.FilePath;
+import hudson.Launcher;
+import jenkins.tasks.SimpleBuildStep;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import okhttp3.*;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
+import static com.browserstack.automate.ci.common.logger.PluginLogger.logError;
+
+public class BrowserStackReportFetcherPublisher extends Recorder implements SimpleBuildStep {
+  private static final Logger LOGGER = Logger.getLogger(BrowserStackReportFetcherPublisher.class.getName());
+  private static final OkHttpClient client = new OkHttpClient();
+  private static final int MAX_ATTEMPTS = 3;
+  private static final int RETRY_DELAY_SECONDS = 10;
+  private final Map<String, String> customEnvVars;
+
+  makeRequestsUtil requestsUtil;
+  @DataBoundConstructor
+  public BrowserStackReportFetcherPublisher(Map<String, String> customEnvVars) {
+    this.customEnvVars = customEnvVars != null ? new HashMap<>(customEnvVars) : new HashMap<>();
+    requestsUtil = new makeRequestsUtil();
+  }
+
+  @Override
+  public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launcher launcher, TaskListener listener) throws IOException, InterruptedException {
+    final PrintStream logger = listener.getLogger();
+    log(logger, "Adding BrowserStack Report");
+
+    EnvVars parentEnvs = build.getEnvironment(listener);
+    parentEnvs.putAll(getCustomEnvVars());
+
+    String browserStackBuildName = Optional.ofNullable(parentEnvs.get(BrowserStackEnvVars.BROWSERSTACK_BUILD_NAME))
+            .orElse(parentEnvs.get(Constants.JENKINS_BUILD_TAG));
+    String projectName = parentEnvs.get(BrowserStackEnvVars.BROWSERSTACK_PROJECT_NAME);
+
+    BrowserStackBuildAction buildAction = build.getAction(BrowserStackBuildAction.class);
+    if (buildAction == null || buildAction.getBrowserStackCredentials() == null) {
+      logError(logger, "No BrowserStackBuildAction or credentials found");
+      return;
+    }
+
+    BrowserStackCredentials credentials = buildAction.getBrowserStackCredentials();
+
+    LOGGER.info("Adding BrowserStack Report Action");
+
+    JSONObject reportConfigDetailsResponse = fetchConfigDetails(logger, Constants.BROWSERSTACK_CONFIG_DETAILS_ENDPOINT, credentials);
+    if (reportConfigDetailsResponse == null) {
+      logError(logger, "Could not fetch the report config details");
+      return;
+    }
+
+    JSONArray configDetails = reportConfigDetailsResponse.getJSONArray("config_details");
+    String lookUpURL = reportConfigDetailsResponse.getString("lookup_endpoint");
+
+    String UUID = fetchUUID(logger, lookUpURL, credentials, browserStackBuildName, projectName);
+    if (UUID == null) {
+      logError(logger, "Cannot find a build with name " + browserStackBuildName);
+      return;
+    }
+
+    for (int i = 0; i < configDetails.length(); i++) {
+      JSONObject config = configDetails.getJSONObject(i);
+
+      String reportUrl = config.getString("report_url");
+      String reportName = config.getString("report_name");
+      String reportTabUrl = config.getString("report_tab_url");
+
+      build.addAction(new BrowserStackReportFetcherForBuild(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
+    }
+
+  }
+
+  private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials , String buildName, String projectName) throws InterruptedException {
+    String lookUpURLWithParams = lookUpURL + "?build_name=" + buildName;
+    if(projectName != null) {
+      lookUpURLWithParams = lookUpURLWithParams + "&project_name" + projectName;
+    }
+
+    log(logger, "Fetching build....");
+    for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
+      try {
+        Response response = requestsUtil.makeRequest(lookUpURLWithParams, credentials);
+        if (response.isSuccessful()) {
+
+          JSONObject lookUpResponse = new JSONObject(response.body().string());
+          String UUID = lookUpResponse.optString("UUID", null);
+
+          if(UUID !=null) {
+            log(logger, "build found with "+ buildName + "and project name" + projectName);
+            return UUID;
+          }
+
+          LOGGER.info("build not found will retry in sometime.." + lookUpResponse.getString("message"));
+        }
+      } catch (Exception e) {
+        logError(logger, "Attempt " + (attempts + 1) + " failed: " + e.getMessage());
+      }
+      TimeUnit.SECONDS.sleep(RETRY_DELAY_SECONDS);
+    }
+
+    LOGGER.info("build not found even after "+ MAX_ATTEMPTS + "attempts");
+    return null;
+  }
+
+  private JSONObject fetchConfigDetails(PrintStream logger, String configDetailsURL, BrowserStackCredentials credentials) {
+    log(logger, "Fetching config details for reports");
+    try  {
+      Response response = requestsUtil.makeRequest(configDetailsURL, credentials);
+      if (response.isSuccessful()) {
+        return new JSONObject(response.body().string());
+      }
+      logError(logger, "Failed to fetch config details: " + response.code());
+    } catch (Exception e) {
+      logError(logger, "Exception occurred while fetching config details: " + e.getMessage());
+    }
+    return null;
+  }
+
+  public Map<String, String> getCustomEnvVars() {
+    return customEnvVars;
+  }
+
+  @Override
+  public BuildStepMonitor getRequiredMonitorService() {
+    return BuildStepMonitor.NONE;
+  }
+
+  @Extension
+  public static final class DescriptorImpl extends BuildStepDescriptor<Publisher> {
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public boolean isApplicable(Class<? extends AbstractProject> aClass) {
+      // indicates that this builder can be used with all kinds of project types
+      return true;
+    }
+
+  }
+}
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java b/src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java
new file mode 100644
index 0000000..7ae9665
--- /dev/null
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java
@@ -0,0 +1,26 @@
+package com.browserstack.automate.ci.jenkins;
+
+import okhttp3.Credentials;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+
+public class makeRequestsUtil {
+  OkHttpClient client = new OkHttpClient();
+
+  public Response makeRequest(String getUrl, BrowserStackCredentials browserStackCredentials) throws Exception{
+    try {
+      Request request = new Request.Builder()
+              .url(getUrl)
+              .header("Authorization", Credentials.basic(browserStackCredentials.getUsername(), browserStackCredentials.getDecryptedAccesskey()))
+              .build();
+      Response response = client.newCall(request).execute();
+      return response;
+    } catch(IOException e) {
+      e.printStackTrace();
+      throw e;
+    }
+  }
+}
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild/index.jelly
new file mode 100644
index 0000000..3c3d67a
--- /dev/null
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild/index.jelly
@@ -0,0 +1,105 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+    <style>
+        .report-container {
+        font-family: HelveticaNeue;
+        width: 80%;
+        margin: 0 auto;
+        margin-top: 8px;
+        border: solid 1px #dddddd;
+        background-color: #f7f7f7;
+        }
+
+        .build-header {
+        padding: 10px 16px;
+        display: flex;
+        background-color: #f7f7f7;
+        border: solid 1px #ddd;
+        }
+
+        .build-meta {
+        flex-grow: 1;
+        flex-direction: column;
+        display: flex;
+        }
+
+        .spec-meta {
+        flex-direction: column;
+        display: flex;
+        padding: 16px;
+        justify-content: center;
+        margin-right: 40px;
+        }
+
+        .build-name {
+        font-size: 18px;
+        font-weight: bold;
+        color: #333;
+        }
+
+        .project-name {
+        font-size: 12px;
+        color: #666;
+        }
+
+        .build-link {
+        display: flex;
+        align-items: center;
+        }
+
+        .build-link a {
+        cursor: pointer;
+        font-size: 12px;
+        color: #009cfc;
+        text-decoration: none;
+        }
+
+        .spec-row {
+        display: flex;
+        border: solid 1px #ddd;
+        }
+
+        .spec-row:nth-child(odd) {
+        background-color: #fff;
+        }
+
+        .spec-row:nth-child(even) {
+        background-color: #fbfbfb;
+        }
+        <j:out value="${it.getReportStyle()}"/>
+    </style>
+    <l:layout title="BrowserStacks Report">
+        <st:include it="${it.build}" page="sidepanel.jelly" optional="true"/>
+            <l:main-panel>
+                <j:if test="${(!it.isReportAvailable())}">
+                    <div class="new-container">
+                        <div class="report-row">
+                            <j:if test="${(it.isReportInProgress())}">
+                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Test Report In Progress</strong></p>
+                            </j:if>
+                            <j:if test="${(it.isReportFailed())}">
+                                <p class="no-report-para"><strong class="strong-font-custom">No BrowserStack Test Report Available</strong></p>
+                                <br/>
+                                <p class="no-report-para">BrowserStack test report could not be generated for this build. Please ensure that:</p>
+                                <br/>
+                                <ul class="bullet-points">
+                                    <li class="bullet-item">You have set valid BrowserStack credentials via BrowserStack Plugin.</li>
+                                    <li class="bullet-item">You have used BROWSERSTACK_BUILD_NAME as your build name</li>
+                                    <li class="bullet-item">try passing BROWSERSTACK_PROJECT_NAME environment variable</li>
+
+                                </ul>
+                            </j:if>
+                        </div>
+                    </div>
+                </j:if>
+
+                <j:if test="${(it.isReportAvailable())}">
+                    <h2>BrowserStack Report</h2>
+                    <h3>Report:</h3>
+                    <div>
+                        <j:out value="${it.getReportHtml()}"/>
+                    </div>
+                </j:if>
+            </l:main-panel>
+    </l:layout>
+</j:jelly>

From 43b637bca2e1bd254ec289b3d1e1652e197730f8 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sun, 16 Mar 2025 21:54:54 +0530
Subject: [PATCH 10/40] intg 1575 rename classes for report

---
 ...d.java => AbstractBrowserStackTestReportForBuild.java} | 2 +-
 ...rForBuild.java => BrowserStackTestReportForBuild.java} | 4 ++--
 ...ublisher.java => BrowserStackTestReportPublisher.java} | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/java/com/browserstack/automate/ci/jenkins/{AbstractBrowserStackReportFetcherForBuild.java => AbstractBrowserStackTestReportForBuild.java} (85%)
 rename src/main/java/com/browserstack/automate/ci/jenkins/{BrowserStackReportFetcherForBuild.java => BrowserStackTestReportForBuild.java} (91%)
 rename src/main/java/com/browserstack/automate/ci/jenkins/{BrowserStackReportFetcherPublisher.java => BrowserStackTestReportPublisher.java} (94%)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild.java b/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild.java
similarity index 85%
rename from src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild.java
rename to src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild.java
index 903331b..e022aa2 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild.java
@@ -4,7 +4,7 @@
 import hudson.model.Run;
 import hudson.model.Action;
 
-public abstract class AbstractBrowserStackReportFetcherForBuild implements Action  {
+public abstract class AbstractBrowserStackTestReportForBuild implements Action  {
   private Run<?, ?> run;
 
 
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherForBuild.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
similarity index 91%
rename from src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherForBuild.java
rename to src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
index d540b3d..0cc14a8 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherForBuild.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
@@ -10,7 +10,7 @@
 import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
 import static com.browserstack.automate.ci.common.logger.PluginLogger.logError;
 
-public class BrowserStackReportFetcherForBuild extends AbstractBrowserStackReportFetcherForBuild {
+public class BrowserStackTestReportForBuild extends AbstractBrowserStackTestReportForBuild {
 
  private BrowserStackCredentials credentials;
   private String reportUrl;
@@ -25,7 +25,7 @@ public class BrowserStackReportFetcherForBuild extends AbstractBrowserStackRepor
   private static final OkHttpClient client = new OkHttpClient();
   makeRequestsUtil requestsUtil;
 
-  public BrowserStackReportFetcherForBuild(Run<?, ?> run, BrowserStackCredentials credentials, String reportUrl, String UUID, String reportName, String tabUrl, final PrintStream logger) {
+  public BrowserStackTestReportForBuild(Run<?, ?> run, BrowserStackCredentials credentials, String reportUrl, String UUID, String reportName, String tabUrl, final PrintStream logger) {
     super();
     setBuild(run);
     this.credentials = credentials;
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
similarity index 94%
rename from src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherPublisher.java
rename to src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
index be139ed..5d6acdb 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportFetcherPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
@@ -31,8 +31,8 @@
 import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
 import static com.browserstack.automate.ci.common.logger.PluginLogger.logError;
 
-public class BrowserStackReportFetcherPublisher extends Recorder implements SimpleBuildStep {
-  private static final Logger LOGGER = Logger.getLogger(BrowserStackReportFetcherPublisher.class.getName());
+public class BrowserStackTestReportPublisher extends Recorder implements SimpleBuildStep {
+  private static final Logger LOGGER = Logger.getLogger(BrowserStackTestReportPublisher.class.getName());
   private static final OkHttpClient client = new OkHttpClient();
   private static final int MAX_ATTEMPTS = 3;
   private static final int RETRY_DELAY_SECONDS = 10;
@@ -40,7 +40,7 @@ public class BrowserStackReportFetcherPublisher extends Recorder implements Simp
 
   makeRequestsUtil requestsUtil;
   @DataBoundConstructor
-  public BrowserStackReportFetcherPublisher(Map<String, String> customEnvVars) {
+  public BrowserStackTestReportPublisher(Map<String, String> customEnvVars) {
     this.customEnvVars = customEnvVars != null ? new HashMap<>(customEnvVars) : new HashMap<>();
     requestsUtil = new makeRequestsUtil();
   }
@@ -89,7 +89,7 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
       String reportName = config.getString("report_name");
       String reportTabUrl = config.getString("report_tab_url");
 
-      build.addAction(new BrowserStackReportFetcherForBuild(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
+      build.addAction(new BrowserStackTestReportForBuild(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
     }
 
   }

From 739aa743e3da42e53772b6db939344d56ec6aaec Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sun, 16 Mar 2025 22:46:48 +0530
Subject: [PATCH 11/40] intg 1575 edge cases handling

---
 .../BrowserStackTestReportForBuild.java       |  4 ++--
 .../BrowserStackTestReportPublisher.java      | 20 +++++++++++++++----
 .../index.jelly                               |  0
 3 files changed, 18 insertions(+), 6 deletions(-)
 rename src/main/resources/com/browserstack/automate/ci/jenkins/{AbstractBrowserStackReportFetcherForBuild => AbstractBrowserStackTestReportForBuild}/index.jelly (100%)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
index 0cc14a8..7d4eeb6 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
@@ -31,7 +31,7 @@ public BrowserStackTestReportForBuild(Run<?, ?> run, BrowserStackCredentials cre
     this.credentials = credentials;
     this.reportUrl = reportUrl;
     this.UUID = UUID;
-    this.reportHtml = null;
+    this.reportHtml = UUID == null ? REPORT_FAILED : null;
     this.reportStyle = "";
     this.logger = logger;
     this.reportName = reportName;
@@ -50,7 +50,7 @@ public String getReportStyle() {
   }
 
   private void fetchReportConditions() {
-    if ( reportHtml==null || reportHtml.equals(REPORT_IN_PROGRESS) || reportHtml.equals(REPORT_FAILED)) {
+    if ( reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS)) {
       fetchReport();
     }
   }
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
index 5d6acdb..b7e4338 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
@@ -22,6 +22,9 @@
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -75,11 +78,18 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
 
     JSONArray configDetails = reportConfigDetailsResponse.getJSONArray("config_details");
     String lookUpURL = reportConfigDetailsResponse.getString("lookup_endpoint");
+    Date buildTimestamp = new Date(build.getStartTimeInMillis());
 
-    String UUID = fetchUUID(logger, lookUpURL, credentials, browserStackBuildName, projectName);
+    // Format the timestamp (e.g., YYYY-MM-DD HH:MM:SS)
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
+    String formattedTime = sdf.format(buildTimestamp);
+
+    // Encode the timestamp to make it URL-safe
+    String encodedTimestamp = URLEncoder.encode(formattedTime, "UTF-8");
+
+    String UUID = fetchUUID(logger, lookUpURL, credentials, browserStackBuildName, projectName, encodedTimestamp);
     if (UUID == null) {
       logError(logger, "Cannot find a build with name " + browserStackBuildName);
-      return;
     }
 
     for (int i = 0; i < configDetails.length(); i++) {
@@ -94,11 +104,13 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
 
   }
 
-  private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials , String buildName, String projectName) throws InterruptedException {
+  private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials , String buildName, String projectName, String encodedTimestamp) throws InterruptedException {
     String lookUpURLWithParams = lookUpURL + "?build_name=" + buildName;
     if(projectName != null) {
-      lookUpURLWithParams = lookUpURLWithParams + "&project_name" + projectName;
+      lookUpURLWithParams = lookUpURLWithParams + "&project_name=" + projectName;
     }
+    lookUpURLWithParams = lookUpURLWithParams + "&pipeline_timestamp=" + encodedTimestamp;
+
 
     log(logger, "Fetching build....");
     for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild/index.jelly
similarity index 100%
rename from src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackReportFetcherForBuild/index.jelly
rename to src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild/index.jelly

From 7844fe80d14a15d98a5516414c63b5642c25cefb Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Wed, 19 Mar 2025 09:10:51 +0530
Subject: [PATCH 12/40] intg 1575 refactoring building query params

---
 .../ci/common/constants/Constants.java        |  5 ++-
 .../BrowserStackTestReportForBuild.java       | 17 +++++++--
 .../BrowserStackTestReportPublisher.java      | 37 ++++++++++++++-----
 .../automate/ci/jenkins/makeRequestsUtil.java | 22 ++++++++++-
 4 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index 331f4ff..a93fbed 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -15,7 +15,10 @@ public class Constants {
     public static final String BROWSERSTACK_REPORT_PATH_PATTERN = "**/browserstack-artifacts/*";
     public static final String JENKINS_CI_PLUGIN = "JenkinsCiPlugin";
 
-    public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "http://localhost:3002/api/v1/external/ci/report-config";
+    public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "http://localhost:3002/api/ci-tools/v1/events/report-config";
+    public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
+
+    public static  final String REPORT_CONFIG_OPERATION_NAME = "report-config";
 
     public static final String REPORT_COMPLETED_STATUS = "COMPLETED";
     public static final String REPORT_IN_PROGRESS_STATUS = "IN_PROGRESS";
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
index 7d4eeb6..6fabd4c 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
@@ -6,6 +6,8 @@
 import okhttp3.*;
 
 import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.Map;
 
 import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
 import static com.browserstack.automate.ci.common.logger.PluginLogger.logError;
@@ -31,7 +33,7 @@ public BrowserStackTestReportForBuild(Run<?, ?> run, BrowserStackCredentials cre
     this.credentials = credentials;
     this.reportUrl = reportUrl;
     this.UUID = UUID;
-    this.reportHtml = UUID == null ? REPORT_FAILED : null;
+    this.reportHtml = null;
     this.reportStyle = "";
     this.logger = logger;
     this.reportName = reportName;
@@ -55,9 +57,18 @@ private void fetchReportConditions() {
     }
   }
   private void fetchReport() {
-    String CIReportUrlWithParams = reportUrl + "?UUID=" + UUID + "&report_name=" + reportName;
-    log(logger, "Fetching report from" + CIReportUrlWithParams);
+    if( UUID == null ) {
+      reportHtml = REPORT_FAILED;
+      return;
+    }
+    Map<String, String> params = new HashMap<>();
+    params.put("UUID", UUID);
+    params.put("report_name",reportName);
+    params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
+
     try {
+      String CIReportUrlWithParams = requestsUtil.buildQueryParams(reportUrl, params);
+      log(logger, "Fetching browserstack report " + reportName );
       Response response = requestsUtil.makeRequest(CIReportUrlWithParams, credentials);
       if (response.isSuccessful()) {
         JSONObject reportResponse = new JSONObject(response.body().string());
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
index b7e4338..599ea48 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -95,34 +96,47 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
     for (int i = 0; i < configDetails.length(); i++) {
       JSONObject config = configDetails.getJSONObject(i);
 
-      String reportUrl = config.getString("report_url");
+      String reportUrl = config.getString("report_fetch_url");
       String reportName = config.getString("report_name");
       String reportTabUrl = config.getString("report_tab_url");
-
+      log(logger, reportUrl+" "+ UUID );
       build.addAction(new BrowserStackTestReportForBuild(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
     }
 
   }
 
   private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials , String buildName, String projectName, String encodedTimestamp) throws InterruptedException {
-    String lookUpURLWithParams = lookUpURL + "?build_name=" + buildName;
+
+    Map<String, String> params = new HashMap<>();
+    params.put("build_name",buildName);
+    params.put("pipeline_timestamp", encodedTimestamp);
+    params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
     if(projectName != null) {
-      lookUpURLWithParams = lookUpURLWithParams + "&project_name=" + projectName;
+      params.put("project_name",projectName);
     }
-    lookUpURLWithParams = lookUpURLWithParams + "&pipeline_timestamp=" + encodedTimestamp;
-
 
     log(logger, "Fetching build....");
+    String lookUpURLWithParams;
+
+    //constructing build params
+    try {
+      lookUpURLWithParams = requestsUtil.buildQueryParams(lookUpURL, params);
+    } catch (URISyntaxException uriSyntaxException) {
+      logError(logger, "Could not build look up url with params" + uriSyntaxException.getMessage());
+      return null;
+    }
+
+    //making attempts
     for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
       try {
         Response response = requestsUtil.makeRequest(lookUpURLWithParams, credentials);
         if (response.isSuccessful()) {
-
+          assert response.body() != null;
           JSONObject lookUpResponse = new JSONObject(response.body().string());
           String UUID = lookUpResponse.optString("UUID", null);
 
           if(UUID !=null) {
-            log(logger, "build found with "+ buildName + "and project name" + projectName);
+            log(logger, "build found with "+ buildName + " and project name " + projectName);
             return UUID;
           }
 
@@ -140,9 +154,14 @@ private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCrede
 
   private JSONObject fetchConfigDetails(PrintStream logger, String configDetailsURL, BrowserStackCredentials credentials) {
     log(logger, "Fetching config details for reports");
+    Map<String, String> params = new HashMap<>();
+    params.put("tool",Constants.INTEGRATIONS_TOOL_KEY);
+    params.put("operation",Constants.REPORT_CONFIG_OPERATION_NAME);
     try  {
-      Response response = requestsUtil.makeRequest(configDetailsURL, credentials);
+      String configDetailsURLWithParams = requestsUtil.buildQueryParams(configDetailsURL, params);
+      Response response = requestsUtil.makeRequest(configDetailsURLWithParams, credentials);
       if (response.isSuccessful()) {
+        assert response.body() != null;
         return new JSONObject(response.body().string());
       }
       logError(logger, "Failed to fetch config details: " + response.code());
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java b/src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java
index 7ae9665..25be474 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java
@@ -4,13 +4,16 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import org.apache.http.client.utils.URIBuilder;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Map;
 
 public class makeRequestsUtil {
   OkHttpClient client = new OkHttpClient();
 
-  public Response makeRequest(String getUrl, BrowserStackCredentials browserStackCredentials) throws Exception{
+  public Response makeRequest(String getUrl, BrowserStackCredentials browserStackCredentials) throws Exception {
     try {
       Request request = new Request.Builder()
               .url(getUrl)
@@ -18,9 +21,24 @@ public Response makeRequest(String getUrl, BrowserStackCredentials browserStackC
               .build();
       Response response = client.newCall(request).execute();
       return response;
-    } catch(IOException e) {
+    } catch (IOException e) {
       e.printStackTrace();
       throw e;
     }
   }
+
+  public String buildQueryParams(String url, Map<String, String> params) throws URISyntaxException {
+    try {
+      URIBuilder builder = new URIBuilder(url);
+      for (String key : params.keySet()) {
+        builder.addParameter(key, params.get(key));
+      }
+      String fullUrl = builder.build().toString();
+      return fullUrl;
+    } catch (URISyntaxException uriSyntaxException) {
+      uriSyntaxException.printStackTrace();
+      throw uriSyntaxException;
+    }
+  }
 }
+

From 6b0360ccf79892d33b01692596b2d1eb723a7114 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Wed, 19 Mar 2025 13:36:00 +0530
Subject: [PATCH 13/40] updating hosts intg 1575

---
 .../browserstack/automate/ci/common/constants/Constants.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index a93fbed..99bc136 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -15,7 +15,7 @@ public class Constants {
     public static final String BROWSERSTACK_REPORT_PATH_PATTERN = "**/browserstack-artifacts/*";
     public static final String JENKINS_CI_PLUGIN = "JenkinsCiPlugin";
 
-    public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "http://localhost:3002/api/ci-tools/v1/events/report-config";
+    public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "https://integrate.browserstack.com/api/ci-tools/v1/events/report-config";
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
 
     public static  final String REPORT_CONFIG_OPERATION_NAME = "report-config";

From 943c3abe1adfcf8dd97f6cb4e52a2d6aa1290157 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Wed, 19 Mar 2025 22:31:32 +0530
Subject: [PATCH 14/40] intg 1575 refactoring under integration service package

---
 ...bstractBrowserStackTestReportForBuild.java | 29 ------------
 .../BrowserStackTestReportAction.java}        | 47 +++++++++++++------
 .../BrowserStackTestReportPublisher.java      | 29 ++++++------
 .../RequestsUtil.java}                        |  2 +-
 .../BrowserStackTestReportAction}/index.jelly |  0
 5 files changed, 48 insertions(+), 59 deletions(-)
 delete mode 100644 src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild.java
 rename src/main/java/com/browserstack/automate/ci/jenkins/{BrowserStackTestReportForBuild.java => integrationService/BrowserStackTestReportAction.java} (69%)
 rename src/main/java/com/browserstack/automate/ci/jenkins/{ => integrationService}/BrowserStackTestReportPublisher.java (89%)
 rename src/main/java/com/browserstack/automate/ci/jenkins/{makeRequestsUtil.java => integrationService/RequestsUtil.java} (97%)
 rename src/main/resources/com/browserstack/automate/ci/jenkins/{AbstractBrowserStackTestReportForBuild => integrationService/BrowserStackTestReportAction}/index.jelly (100%)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild.java b/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild.java
deleted file mode 100644
index e022aa2..0000000
--- a/src/main/java/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.browserstack.automate.ci.jenkins;
-
-import com.browserstack.automate.ci.common.constants.Constants;
-import hudson.model.Run;
-import hudson.model.Action;
-
-public abstract class AbstractBrowserStackTestReportForBuild implements Action  {
-  private Run<?, ?> run;
-
-
-  @Override
-  public String getIconFileName() {
-    return Constants.BROWSERSTACK_LOGO;
-  }
-
-  @Override
-  public abstract  String getDisplayName();
-
-  @Override
-  public abstract String getUrlName();
-
-  public Run<?, ?> getBuild() {
-    return run;
-  }
-
-  public void setBuild(Run<?, ?> build) {
-    this.run = build;
-  }
-}
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
similarity index 69%
rename from src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
rename to src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index 6fabd4c..cb118c7 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportForBuild.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -1,6 +1,7 @@
 package com.browserstack.automate.ci.jenkins;
 
 import com.browserstack.automate.ci.common.constants.Constants;
+import hudson.model.Action;
 import hudson.model.Run;
 import org.json.JSONObject;
 import okhttp3.*;
@@ -12,9 +13,10 @@
 import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
 import static com.browserstack.automate.ci.common.logger.PluginLogger.logError;
 
-public class BrowserStackTestReportForBuild extends AbstractBrowserStackTestReportForBuild {
+public class BrowserStackTestReportAction implements Action {
 
- private BrowserStackCredentials credentials;
+  private Run<?, ?> run;
+  private BrowserStackCredentials credentials;
   private String reportUrl;
   private final String UUID;
   private String reportHtml;
@@ -25,9 +27,9 @@ public class BrowserStackTestReportForBuild extends AbstractBrowserStackTestRepo
   private static final String REPORT_IN_PROGRESS = "REPORT_IN_PROGRESS";
   private static final String REPORT_FAILED = "REPORT_FAILED";
   private static final OkHttpClient client = new OkHttpClient();
-  makeRequestsUtil requestsUtil;
+  RequestsUtil requestsUtil;
 
-  public BrowserStackTestReportForBuild(Run<?, ?> run, BrowserStackCredentials credentials, String reportUrl, String UUID, String reportName, String tabUrl, final PrintStream logger) {
+  public BrowserStackTestReportAction(Run<?, ?> run, BrowserStackCredentials credentials, String reportUrl, String UUID, String reportName, String tabUrl, final PrintStream logger) {
     super();
     setBuild(run);
     this.credentials = credentials;
@@ -38,7 +40,7 @@ public BrowserStackTestReportForBuild(Run<?, ?> run, BrowserStackCredentials cre
     this.logger = logger;
     this.reportName = reportName;
     this.urlName = tabUrl;
-    requestsUtil = new makeRequestsUtil();
+    requestsUtil = new RequestsUtil();
   }
 
 
@@ -46,37 +48,39 @@ public String getReportHtml() {
     fetchReportConditions();
     return reportHtml;
   }
+
   public String getReportStyle() {
     fetchReportConditions();
     return reportStyle;
   }
 
   private void fetchReportConditions() {
-    if ( reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS)) {
+    if (reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS)) {
       fetchReport();
     }
   }
+
   private void fetchReport() {
-    if( UUID == null ) {
+    if (UUID == null) {
       reportHtml = REPORT_FAILED;
       return;
     }
     Map<String, String> params = new HashMap<>();
     params.put("UUID", UUID);
-    params.put("report_name",reportName);
+    params.put("report_name", reportName);
     params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
 
     try {
       String CIReportUrlWithParams = requestsUtil.buildQueryParams(reportUrl, params);
-      log(logger, "Fetching browserstack report " + reportName );
+      log(logger, "Fetching browserstack report " + reportName);
       Response response = requestsUtil.makeRequest(CIReportUrlWithParams, credentials);
       if (response.isSuccessful()) {
         JSONObject reportResponse = new JSONObject(response.body().string());
         String reportStatus = reportResponse.optString("report_status");
-        if(reportStatus.equalsIgnoreCase(Constants.REPORT_COMPLETED_STATUS)) {
+        if (reportStatus.equalsIgnoreCase(String.valueOf(Constants.REPORT_STATUS.COMPLETED))) {
           reportHtml = reportResponse.optString("report_html", null);
           reportStyle = reportResponse.optString("report_style", "");
-        } else if(reportStatus.equalsIgnoreCase(Constants.REPORT_IN_PROGRESS_STATUS)){
+        } else if (reportStatus.equalsIgnoreCase(String.valueOf(Constants.REPORT_STATUS.IN_PROGRESS))) {
           reportHtml = REPORT_IN_PROGRESS;
         } else {
           reportHtml = REPORT_FAILED;
@@ -93,24 +97,37 @@ public boolean isReportInProgress() {
     return reportHtml.equals(REPORT_IN_PROGRESS);
   }
 
-  public  boolean isReportFailed() {
+  public boolean isReportFailed() {
     return reportHtml.equals(REPORT_FAILED);
   }
 
   public boolean isReportAvailable() {
-    if(reportHtml!=null && !reportHtml.equals(REPORT_IN_PROGRESS) && !reportHtml.equals(REPORT_FAILED)){
+    if (reportHtml != null && !reportHtml.equals(REPORT_IN_PROGRESS) && !reportHtml.equals(REPORT_FAILED)) {
       return true;
     }
     return false;
   }
 
+  public Run<?, ?> getBuild() {
+    return run;
+  }
+
+  public void setBuild(Run<?, ?> build) {
+    this.run = build;
+  }
+
+  @Override
+  public String getIconFileName() {
+    return Constants.BROWSERSTACK_LOGO;
+  }
+
   @Override
-  public  String getDisplayName() {
+  public String getDisplayName() {
     return this.reportName;
   }
 
   @Override
-  public String getUrlName(){
+  public String getUrlName() {
     return this.urlName;
   }
 
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
similarity index 89%
rename from src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
rename to src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 599ea48..831b9ef 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -42,11 +42,12 @@ public class BrowserStackTestReportPublisher extends Recorder implements SimpleB
   private static final int RETRY_DELAY_SECONDS = 10;
   private final Map<String, String> customEnvVars;
 
-  makeRequestsUtil requestsUtil;
+  RequestsUtil requestsUtil;
+
   @DataBoundConstructor
   public BrowserStackTestReportPublisher(Map<String, String> customEnvVars) {
     this.customEnvVars = customEnvVars != null ? new HashMap<>(customEnvVars) : new HashMap<>();
-    requestsUtil = new makeRequestsUtil();
+    requestsUtil = new RequestsUtil();
   }
 
   @Override
@@ -99,20 +100,20 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
       String reportUrl = config.getString("report_fetch_url");
       String reportName = config.getString("report_name");
       String reportTabUrl = config.getString("report_tab_url");
-      log(logger, reportUrl+" "+ UUID );
-      build.addAction(new BrowserStackTestReportForBuild(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
+      log(logger, reportUrl + " " + UUID);
+      build.addAction(new BrowserStackTestReportAction(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
     }
 
   }
 
-  private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials , String buildName, String projectName, String encodedTimestamp) throws InterruptedException {
+  private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials, String buildName, String projectName, String encodedTimestamp) throws InterruptedException {
 
     Map<String, String> params = new HashMap<>();
-    params.put("build_name",buildName);
+    params.put("build_name", buildName);
     params.put("pipeline_timestamp", encodedTimestamp);
     params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
-    if(projectName != null) {
-      params.put("project_name",projectName);
+    if (projectName != null) {
+      params.put("project_name", projectName);
     }
 
     log(logger, "Fetching build....");
@@ -135,8 +136,8 @@ private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCrede
           JSONObject lookUpResponse = new JSONObject(response.body().string());
           String UUID = lookUpResponse.optString("UUID", null);
 
-          if(UUID !=null) {
-            log(logger, "build found with "+ buildName + " and project name " + projectName);
+          if (UUID != null) {
+            log(logger, "build found with " + buildName + " and project name " + projectName);
             return UUID;
           }
 
@@ -148,16 +149,16 @@ private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCrede
       TimeUnit.SECONDS.sleep(RETRY_DELAY_SECONDS);
     }
 
-    LOGGER.info("build not found even after "+ MAX_ATTEMPTS + "attempts");
+    LOGGER.info("build not found even after " + MAX_ATTEMPTS + "attempts");
     return null;
   }
 
   private JSONObject fetchConfigDetails(PrintStream logger, String configDetailsURL, BrowserStackCredentials credentials) {
     log(logger, "Fetching config details for reports");
     Map<String, String> params = new HashMap<>();
-    params.put("tool",Constants.INTEGRATIONS_TOOL_KEY);
-    params.put("operation",Constants.REPORT_CONFIG_OPERATION_NAME);
-    try  {
+    params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
+    params.put("operation", Constants.REPORT_CONFIG_OPERATION_NAME);
+    try {
       String configDetailsURLWithParams = requestsUtil.buildQueryParams(configDetailsURL, params);
       Response response = requestsUtil.makeRequest(configDetailsURLWithParams, credentials);
       if (response.isSuccessful()) {
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
similarity index 97%
rename from src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java
rename to src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
index 25be474..e246631 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/makeRequestsUtil.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
@@ -10,7 +10,7 @@
 import java.net.URISyntaxException;
 import java.util.Map;
 
-public class makeRequestsUtil {
+public class RequestsUtil {
   OkHttpClient client = new OkHttpClient();
 
   public Response makeRequest(String getUrl, BrowserStackCredentials browserStackCredentials) throws Exception {
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
similarity index 100%
rename from src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackTestReportForBuild/index.jelly
rename to src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly

From 598f38036b88a34d12ddb0aaffa5af0034e22031 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Wed, 19 Mar 2025 22:32:45 +0530
Subject: [PATCH 15/40] intg 1575 refactoring

---
 .../automate/ci/common/constants/Constants.java           | 8 +++++---
 .../integrationService/BrowserStackTestReportAction.java  | 7 ++++---
 .../BrowserStackTestReportPublisher.java                  | 4 +++-
 .../ci/jenkins/integrationService/RequestsUtil.java       | 3 ++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index 99bc136..28b2b5c 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -20,9 +20,11 @@ public class Constants {
 
     public static  final String REPORT_CONFIG_OPERATION_NAME = "report-config";
 
-    public static final String REPORT_COMPLETED_STATUS = "COMPLETED";
-    public static final String REPORT_IN_PROGRESS_STATUS = "IN_PROGRESS";
-
+    public static enum REPORT_STATUS {
+      IN_PROGRESS,
+      COMPLETED,
+      FAILED
+    }
     // Product
     public static final String AUTOMATE = "automate";
     public static final String APP_AUTOMATE = "app-automate";
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index cb118c7..d285978 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -1,6 +1,7 @@
-package com.browserstack.automate.ci.jenkins;
+package com.browserstack.automate.ci.jenkins.integrationService;
 
 import com.browserstack.automate.ci.common.constants.Constants;
+import com.browserstack.automate.ci.jenkins.BrowserStackCredentials;
 import hudson.model.Action;
 import hudson.model.Run;
 import org.json.JSONObject;
@@ -71,9 +72,9 @@ private void fetchReport() {
     params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
 
     try {
-      String CIReportUrlWithParams = requestsUtil.buildQueryParams(reportUrl, params);
+      String ciReportUrlWithParams = requestsUtil.buildQueryParams(reportUrl, params);
       log(logger, "Fetching browserstack report " + reportName);
-      Response response = requestsUtil.makeRequest(CIReportUrlWithParams, credentials);
+      Response response = requestsUtil.makeRequest(ciReportUrlWithParams, credentials);
       if (response.isSuccessful()) {
         JSONObject reportResponse = new JSONObject(response.body().string());
         String reportStatus = reportResponse.optString("report_status");
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 831b9ef..0c494f2 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -1,7 +1,9 @@
-package com.browserstack.automate.ci.jenkins;
+package com.browserstack.automate.ci.jenkins.integrationService;
 
 import com.browserstack.automate.ci.common.BrowserStackEnvVars;
 import com.browserstack.automate.ci.common.constants.Constants;
+import com.browserstack.automate.ci.jenkins.BrowserStackBuildAction;
+import com.browserstack.automate.ci.jenkins.BrowserStackCredentials;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.EnvVars;
 import hudson.Extension;
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
index e246631..b079a99 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
@@ -1,5 +1,6 @@
-package com.browserstack.automate.ci.jenkins;
+package com.browserstack.automate.ci.jenkins.integrationService;
 
+import com.browserstack.automate.ci.jenkins.BrowserStackCredentials;
 import okhttp3.Credentials;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;

From ca8bde42f02c9454576a2b838ee86c62dd6999b4 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Thu, 20 Mar 2025 08:38:42 +0530
Subject: [PATCH 16/40] intg 1575 operation name update

---
 .../browserstack/automate/ci/common/constants/Constants.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index 28b2b5c..f40ae96 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -18,7 +18,7 @@ public class Constants {
     public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "https://integrate.browserstack.com/api/ci-tools/v1/events/report-config";
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
 
-    public static  final String REPORT_CONFIG_OPERATION_NAME = "report-config";
+    public static  final String REPORT_CONFIG_OPERATION_NAME = "report-config-details";
 
     public static enum REPORT_STATUS {
       IN_PROGRESS,

From 035d1ec8ebef6c1f263d3f2c54afc18f0ee54c54 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Thu, 20 Mar 2025 09:32:40 +0530
Subject: [PATCH 17/40] intg 1575 adding symbol to invoke action

---
 .../integrationService/BrowserStackTestReportPublisher.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 0c494f2..bbb39f8 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -17,6 +17,7 @@
 import hudson.FilePath;
 import hudson.Launcher;
 import jenkins.tasks.SimpleBuildStep;
+import org.jenkinsci.Symbol;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import okhttp3.*;
@@ -183,6 +184,7 @@ public BuildStepMonitor getRequiredMonitorService() {
     return BuildStepMonitor.NONE;
   }
 
+  @Symbol("browserStackReport")
   @Extension
   public static final class DescriptorImpl extends BuildStepDescriptor<Publisher> {
 

From d097b0b695afebefd69050f861aef2e2aa9d56cf Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Thu, 20 Mar 2025 22:16:17 +0530
Subject: [PATCH 18/40] intg 1575 symbol name change

---
 .../integrationService/BrowserStackTestReportPublisher.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index bbb39f8..245eda4 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -184,7 +184,7 @@ public BuildStepMonitor getRequiredMonitorService() {
     return BuildStepMonitor.NONE;
   }
 
-  @Symbol("browserStackReport")
+  @Symbol("browserStackTestReports")
   @Extension
   public static final class DescriptorImpl extends BuildStepDescriptor<Publisher> {
 

From 3f95ab74a2241241f2f2c863a8c72236c0dcbb8e Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Fri, 21 Mar 2025 23:20:40 +0530
Subject: [PATCH 19/40] intg 1575 demo enhancements

---
 .../BrowserStackTestReportAction.java         | 25 ++++++++++++++++---
 .../BrowserStackTestReportPublisher.java      |  7 +++++-
 .../BrowserStackTestReportAction/index.jelly  |  5 ++--
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index d285978..26a4df8 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -25,8 +25,14 @@ public class BrowserStackTestReportAction implements Action {
   private String reportStyle;
   private String reportName;
   private String urlName;
+
+  private int maxRetryReportAttempt;
   private static final String REPORT_IN_PROGRESS = "REPORT_IN_PROGRESS";
   private static final String REPORT_FAILED = "REPORT_FAILED";
+
+  private static final String RETRY_REPORT = "RETRY_REPORT";
+
+  private static final int MAX_ATTEMPTS = 3;
   private static final OkHttpClient client = new OkHttpClient();
   RequestsUtil requestsUtil;
 
@@ -41,6 +47,8 @@ public BrowserStackTestReportAction(Run<?, ?> run, BrowserStackCredentials crede
     this.logger = logger;
     this.reportName = reportName;
     this.urlName = tabUrl;
+    this.maxRetryReportAttempt = MAX_ATTEMPTS;
+
     requestsUtil = new RequestsUtil();
   }
 
@@ -56,7 +64,7 @@ public String getReportStyle() {
   }
 
   private void fetchReportConditions() {
-    if (reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS)) {
+    if (reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS) || reportHtml.equals(RETRY_REPORT)) {
       fetchReport();
     }
   }
@@ -79,7 +87,8 @@ private void fetchReport() {
         JSONObject reportResponse = new JSONObject(response.body().string());
         String reportStatus = reportResponse.optString("report_status");
         if (reportStatus.equalsIgnoreCase(String.valueOf(Constants.REPORT_STATUS.COMPLETED))) {
-          reportHtml = reportResponse.optString("report_html", null);
+          String defaultHTML = "<h1>No Report Found</h1>";
+          reportHtml = reportResponse.optString("report_html", defaultHTML);
           reportStyle = reportResponse.optString("report_style", "");
         } else if (reportStatus.equalsIgnoreCase(String.valueOf(Constants.REPORT_STATUS.IN_PROGRESS))) {
           reportHtml = REPORT_IN_PROGRESS;
@@ -89,7 +98,11 @@ private void fetchReport() {
         logError(logger, "Received Non success response while fetching report" + response.code());
       }
     } catch (Exception e) {
-      reportHtml = REPORT_FAILED;
+      reportHtml = RETRY_REPORT;
+      this.maxRetryReportAttempt--;
+      if(this.maxRetryReportAttempt < 0) {
+        reportHtml = REPORT_FAILED;
+      }
       logError(logger, "Exception while fetching the report" + e.getMessage());
     }
   }
@@ -102,8 +115,12 @@ public boolean isReportFailed() {
     return reportHtml.equals(REPORT_FAILED);
   }
 
+  public boolean reportRetryRequired() {
+    return reportHtml.equals(RETRY_REPORT);
+  }
+
   public boolean isReportAvailable() {
-    if (reportHtml != null && !reportHtml.equals(REPORT_IN_PROGRESS) && !reportHtml.equals(REPORT_FAILED)) {
+    if (reportHtml != null && !reportHtml.equals(REPORT_IN_PROGRESS) && !reportHtml.equals(REPORT_FAILED) && !reportHtml.equals(RETRY_REPORT)) {
       return true;
     }
     return false;
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 245eda4..7c14bbd 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -184,7 +184,7 @@ public BuildStepMonitor getRequiredMonitorService() {
     return BuildStepMonitor.NONE;
   }
 
-  @Symbol("browserStackTestReports")
+  @Symbol("browserStackBuildTestReports")
   @Extension
   public static final class DescriptorImpl extends BuildStepDescriptor<Publisher> {
 
@@ -195,5 +195,10 @@ public boolean isApplicable(Class<? extends AbstractProject> aClass) {
       return true;
     }
 
+    @Override
+    public String getDisplayName() {
+      return Constants.BROWSERSTACK_TEST_REPORT_DISPLAY_NAME;
+    }
+
   }
 }
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
index 3c3d67a..882f0ee 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
@@ -89,13 +89,14 @@
 
                                 </ul>
                             </j:if>
+                            <j:if test="${it.reportRetryRequired()}">
+                                <p class="no-report-para"><strong class="strong-font-custom">Unable to Fetch Report try refreshing...</strong></p>
+                            </j:if>
                         </div>
                     </div>
                 </j:if>
 
                 <j:if test="${(it.isReportAvailable())}">
-                    <h2>BrowserStack Report</h2>
-                    <h3>Report:</h3>
                     <div>
                         <j:out value="${it.getReportHtml()}"/>
                     </div>

From 8820fe6db983434c162bcb05fae196a4c8ad4e85 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Fri, 21 Mar 2025 23:22:01 +0530
Subject: [PATCH 20/40] intg 1575 formatting constants

---
 .../browserstack/automate/ci/common/constants/Constants.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index f40ae96..6a8fa89 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -16,10 +16,9 @@ public class Constants {
     public static final String JENKINS_CI_PLUGIN = "JenkinsCiPlugin";
 
     public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "https://integrate.browserstack.com/api/ci-tools/v1/events/report-config";
+    public static final String BROWSERSTACK_TEST_REPORT_DISPLAY_NAME = "BrowserStack Build Test Reports";
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
-
     public static  final String REPORT_CONFIG_OPERATION_NAME = "report-config-details";
-
     public static enum REPORT_STATUS {
       IN_PROGRESS,
       COMPLETED,

From 3b71266f8116feccf9cfccd721daf71af2fd3554 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Fri, 21 Mar 2025 23:23:33 +0530
Subject: [PATCH 21/40] intg 1575 format actions

---
 .../integrationService/BrowserStackTestReportAction.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index 26a4df8..c1f28bf 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -100,7 +100,7 @@ private void fetchReport() {
     } catch (Exception e) {
       reportHtml = RETRY_REPORT;
       this.maxRetryReportAttempt--;
-      if(this.maxRetryReportAttempt < 0) {
+      if (this.maxRetryReportAttempt < 0) {
         reportHtml = REPORT_FAILED;
       }
       logError(logger, "Exception while fetching the report" + e.getMessage());

From d46db06ca3ee71e7b692333772f4ee4a91001fa6 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sun, 23 Mar 2025 09:14:39 +0530
Subject: [PATCH 22/40] intg 1575 demo updates

---
 .../integrationService/BrowserStackTestReportAction.java | 9 +++++++--
 .../BrowserStackTestReportPublisher.java                 | 2 +-
 .../BrowserStackTestReportAction/index.jelly             | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index c1f28bf..d017845 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -23,8 +23,8 @@ public class BrowserStackTestReportAction implements Action {
   private String reportHtml;
   private final transient PrintStream logger;
   private String reportStyle;
-  private String reportName;
-  private String urlName;
+  public String reportName;
+  public String urlName;
 
   private int maxRetryReportAttempt;
   private static final String REPORT_IN_PROGRESS = "REPORT_IN_PROGRESS";
@@ -126,6 +126,11 @@ public boolean isReportAvailable() {
     return false;
   }
 
+  public boolean reportHasStatus() {
+    if (reportHtml == null) return false;
+    return reportHtml.equals(REPORT_IN_PROGRESS) || reportHtml.equals(REPORT_FAILED);
+  }
+
   public Run<?, ?> getBuild() {
     return run;
   }
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 7c14bbd..80dffea 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -49,7 +49,7 @@ public class BrowserStackTestReportPublisher extends Recorder implements SimpleB
 
   @DataBoundConstructor
   public BrowserStackTestReportPublisher(Map<String, String> customEnvVars) {
-    this.customEnvVars = customEnvVars != null ? new HashMap<>(customEnvVars) : new HashMap<>();
+    this.customEnvVars = customEnvVars != null && !customEnvVars.isEmpty() ? new HashMap<>(customEnvVars) : new HashMap<>();
     requestsUtil = new RequestsUtil();
   }
 
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
index 882f0ee..a27b9dc 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
@@ -75,10 +75,10 @@
                     <div class="new-container">
                         <div class="report-row">
                             <j:if test="${(it.isReportInProgress())}">
-                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Test Report In Progress</strong></p>
+                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack ${it.reportName} Report In Progress</strong></p>
                             </j:if>
                             <j:if test="${(it.isReportFailed())}">
-                                <p class="no-report-para"><strong class="strong-font-custom">No BrowserStack Test Report Available</strong></p>
+                                <p class="no-report-para"><strong class="strong-font-custom">No BrowserStack ${it.reportName} Report Available</strong></p>
                                 <br/>
                                 <p class="no-report-para">BrowserStack test report could not be generated for this build. Please ensure that:</p>
                                 <br/>

From 259e14f0d8e1ef0bab87a06060e346198be6c398 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sun, 23 Mar 2025 10:24:00 +0530
Subject: [PATCH 23/40] intg 1575 adding report summary on status page

---
 .../summary.jelly                             | 121 ++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/summary.jelly

diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/summary.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/summary.jelly
new file mode 100644
index 0000000..cf236ac
--- /dev/null
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/summary.jelly
@@ -0,0 +1,121 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+    <style>
+        .new-container {
+        margin-top: 10px;
+        padding: 16px 24px;
+        border: 1px solid #ccc;
+        border-radius: 4px;
+        font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji, sans-serif;
+        font-size: 14px;
+        /* box-sizing: border-box; */
+        }
+
+        .report-row + .report-row {
+        margin-top: 16px;
+        }
+
+        .meta-label {
+        font-size: 11px;
+        color: #666;
+        display: inline-block;
+        }
+
+        .build-meta {
+        color: #333;
+        font-size: 14px;
+        font-weight: 600;
+        font-family: SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace;
+        }
+
+        .duration {
+        font-family: monospace;
+        color: #333;
+        padding: 2px 8px;
+        border-radius: 4px;
+        border: 1px solid #aaa;
+        margin-left: 10px;
+        font-weight: 400;
+        font-size: 12px;
+        }
+
+        .build-errors {
+        font-family: monospace;
+        color: #333;
+        padding: 2px 8px;
+        border-radius: 4px;
+        border: 1px solid #aaa;
+        margin-left: 10px;
+        font-weight: 400;
+        font-size: 12px;
+        color: #DD4B4B;
+        border-color: #DD4B4B;
+        }
+
+        .cta {
+        padding-top: 8px;
+        }
+
+        .no-report-para {
+        line-height: 1.5;
+        color: #333;
+        }
+
+        .strong-font-custom {
+        font-weight: 700;
+        }
+
+        .bullet-points {
+        list-style: disc;
+        }
+
+        .bullet-item {
+        color: #333;
+        margin: 8px 0;
+        line-height: 1.5;
+        margin-left: 24px;
+        }
+
+    </style>
+    <t:summary icon="/plugin/browserstack-integration/images/logo.png">
+        <j:if test="${(it.reportHasStatus())}">
+            <div class="new-container">
+                <div class="report-row">
+                    <j:if test="${(it.isReportInProgress())}">
+                        <div class="report-row">
+                            <span class="meta-label">BUILD</span>
+                            <h1 class="build-meta">${it.build}</h1>
+                        </div>
+                        <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Test Report In Progress...</strong></p>
+                        <div class="report-row cta">
+                            <a href="${it.urlName}">View BrowserStack ${it.reportName} Report</a>
+                        </div>
+                    </j:if>
+                    <j:if test="${(it.isReportFailed())}">
+                        <p class="no-report-para"><strong class="strong-font-custom">No BrowserStack Test Report Available</strong></p>
+                        <br/>
+                        <p class="no-report-para">BrowserStack test report could not be generated for this build. Please ensure that:</p>
+                        <br/>
+                        <ul class="bullet-points">
+                            <li class="bullet-item">You have set valid BrowserStack credentials via BrowserStack Plugin.</li>
+                            <li class="bullet-item">You have used BROWSERSTACK_BUILD_NAME as your build name</li>
+                            <li class="bullet-item">try passing BROWSERSTACK_PROJECT_NAME environment variable</li>
+
+                        </ul>
+                    </j:if>
+                </div>
+            </div>
+        </j:if>
+        <j:if test="${(!it.reportHasStatus())}">
+            <div class="new-container">
+                <div class="report-row">
+                    <span class="meta-label">BUILD</span>
+                    <h1 class="build-meta">${it.build}</h1>
+                </div>
+                <div class="report-row cta">
+                    <a href="${it.urlName}">View BrowserStack ${it.reportName} Report</a>
+                </div>
+            </div>
+        </j:if>
+    </t:summary>
+</j:jelly>

From f2342111a9eb644c3409e2e29db3abfe8ee7eaa5 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Mon, 24 Mar 2025 15:41:30 +0530
Subject: [PATCH 24/40] intg 1575 review comments resolution

---
 .../automate/ci/common/constants/Constants.java   |  6 +-----
 .../BrowserStackReportStatus.java                 |  7 +++++++
 .../BrowserStackTestReportAction.java             |  7 ++++---
 .../BrowserStackTestReportPublisher.java          | 15 ++++++---------
 .../BrowserStackTestReportPublisher/config.jelly  |  4 ++++
 5 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java
 create mode 100644 src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher/config.jelly

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index 6a8fa89..4d618ce 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -19,11 +19,7 @@ public class Constants {
     public static final String BROWSERSTACK_TEST_REPORT_DISPLAY_NAME = "BrowserStack Build Test Reports";
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
     public static  final String REPORT_CONFIG_OPERATION_NAME = "report-config-details";
-    public static enum REPORT_STATUS {
-      IN_PROGRESS,
-      COMPLETED,
-      FAILED
-    }
+
     // Product
     public static final String AUTOMATE = "automate";
     public static final String APP_AUTOMATE = "app-automate";
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java
new file mode 100644
index 0000000..7bc62eb
--- /dev/null
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java
@@ -0,0 +1,7 @@
+package com.browserstack.automate.ci.jenkins.integrationService;
+
+public enum BrowserStackReportStatus {
+  IN_PROGRESS,
+  COMPLETED,
+  FAILED
+}
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index d017845..15b3b93 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -8,6 +8,7 @@
 import okhttp3.*;
 
 import java.io.PrintStream;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -86,11 +87,11 @@ private void fetchReport() {
       if (response.isSuccessful()) {
         JSONObject reportResponse = new JSONObject(response.body().string());
         String reportStatus = reportResponse.optString("report_status");
-        if (reportStatus.equalsIgnoreCase(String.valueOf(Constants.REPORT_STATUS.COMPLETED))) {
+        if (reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.COMPLETED))) {
           String defaultHTML = "<h1>No Report Found</h1>";
           reportHtml = reportResponse.optString("report_html", defaultHTML);
           reportStyle = reportResponse.optString("report_style", "");
-        } else if (reportStatus.equalsIgnoreCase(String.valueOf(Constants.REPORT_STATUS.IN_PROGRESS))) {
+        } else if (reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.IN_PROGRESS))) {
           reportHtml = REPORT_IN_PROGRESS;
         } else {
           reportHtml = REPORT_FAILED;
@@ -103,7 +104,7 @@ private void fetchReport() {
       if (this.maxRetryReportAttempt < 0) {
         reportHtml = REPORT_FAILED;
       }
-      logError(logger, "Exception while fetching the report" + e.getMessage());
+      logError(logger, "Exception while fetching the report" + Arrays.toString(e.getStackTrace()));
     }
   }
 
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 80dffea..58c1084 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -28,10 +28,7 @@
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
@@ -92,7 +89,7 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
     // Encode the timestamp to make it URL-safe
     String encodedTimestamp = URLEncoder.encode(formattedTime, "UTF-8");
 
-    String UUID = fetchUUID(logger, lookUpURL, credentials, browserStackBuildName, projectName, encodedTimestamp);
+    String UUID = fetchBuildUUID(logger, lookUpURL, credentials, browserStackBuildName, projectName, encodedTimestamp);
     if (UUID == null) {
       logError(logger, "Cannot find a build with name " + browserStackBuildName);
     }
@@ -109,7 +106,7 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
 
   }
 
-  private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials, String buildName, String projectName, String encodedTimestamp) throws InterruptedException {
+  private String fetchBuildUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials, String buildName, String projectName, String encodedTimestamp) throws InterruptedException {
 
     Map<String, String> params = new HashMap<>();
     params.put("build_name", buildName);
@@ -126,7 +123,7 @@ private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCrede
     try {
       lookUpURLWithParams = requestsUtil.buildQueryParams(lookUpURL, params);
     } catch (URISyntaxException uriSyntaxException) {
-      logError(logger, "Could not build look up url with params" + uriSyntaxException.getMessage());
+      logError(logger, "Could not build look up url with params" + Arrays.toString(uriSyntaxException.getStackTrace()));
       return null;
     }
 
@@ -147,7 +144,7 @@ private String fetchUUID(PrintStream logger, String lookUpURL, BrowserStackCrede
           LOGGER.info("build not found will retry in sometime.." + lookUpResponse.getString("message"));
         }
       } catch (Exception e) {
-        logError(logger, "Attempt " + (attempts + 1) + " failed: " + e.getMessage());
+        logError(logger, "Attempt " + (attempts + 1) + " failed: " + Arrays.toString(e.getStackTrace()));
       }
       TimeUnit.SECONDS.sleep(RETRY_DELAY_SECONDS);
     }
@@ -170,7 +167,7 @@ private JSONObject fetchConfigDetails(PrintStream logger, String configDetailsUR
       }
       logError(logger, "Failed to fetch config details: " + response.code());
     } catch (Exception e) {
-      logError(logger, "Exception occurred while fetching config details: " + e.getMessage());
+      logError(logger, "Exception occurred while fetching config details: " + Arrays.toString(e.getStackTrace()));
     }
     return null;
   }
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher/config.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher/config.jelly
new file mode 100644
index 0000000..a2a8325
--- /dev/null
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher/config.jelly
@@ -0,0 +1,4 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
+    This step will generate BrowserStack Test Report by utilising the build name from the environment variable BROWSERSTACK_BUILD_NAME set by the BrowserStack plugin
+</j:jelly>

From 19f19eef37bbdac8e9c03d5e520d4b973e0755d7 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Mon, 24 Mar 2025 16:33:43 +0530
Subject: [PATCH 25/40] intg 1575 updating retry time

---
 .../integrationService/BrowserStackTestReportPublisher.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 58c1084..78e6465 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -39,7 +39,7 @@ public class BrowserStackTestReportPublisher extends Recorder implements SimpleB
   private static final Logger LOGGER = Logger.getLogger(BrowserStackTestReportPublisher.class.getName());
   private static final OkHttpClient client = new OkHttpClient();
   private static final int MAX_ATTEMPTS = 3;
-  private static final int RETRY_DELAY_SECONDS = 10;
+  private static final int RETRY_DELAY_SECONDS = 5;
   private final Map<String, String> customEnvVars;
 
   RequestsUtil requestsUtil;

From ad22c2f859b7f7b87fa0645b63e3b0da6e7e6e83 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Mon, 24 Mar 2025 21:19:35 +0530
Subject: [PATCH 26/40] intg 1575 url endpoints constants

---
 .../automate/ci/common/constants/Constants.java           | 4 +++-
 .../BrowserStackTestReportPublisher.java                  | 8 ++++----
 .../ci/jenkins/integrationService/RequestsUtil.java       | 6 +++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index 4d618ce..e23f034 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -15,7 +15,9 @@ public class Constants {
     public static final String BROWSERSTACK_REPORT_PATH_PATTERN = "**/browserstack-artifacts/*";
     public static final String JENKINS_CI_PLUGIN = "JenkinsCiPlugin";
 
-    public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "https://integrate.browserstack.com/api/ci-tools/v1/events/report-config";
+    public static final String INTEGRATE_BASE_URL = "https://integrate.browserstack.com/api";
+    public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "/ci-tools/v1/events/report-config";
+
     public static final String BROWSERSTACK_TEST_REPORT_DISPLAY_NAME = "BrowserStack Build Test Reports";
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
     public static  final String REPORT_CONFIG_OPERATION_NAME = "report-config-details";
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 78e6465..246c8b0 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -29,6 +29,7 @@
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
@@ -37,7 +38,6 @@
 
 public class BrowserStackTestReportPublisher extends Recorder implements SimpleBuildStep {
   private static final Logger LOGGER = Logger.getLogger(BrowserStackTestReportPublisher.class.getName());
-  private static final OkHttpClient client = new OkHttpClient();
   private static final int MAX_ATTEMPTS = 3;
   private static final int RETRY_DELAY_SECONDS = 5;
   private final Map<String, String> customEnvVars;
@@ -46,7 +46,7 @@ public class BrowserStackTestReportPublisher extends Recorder implements SimpleB
 
   @DataBoundConstructor
   public BrowserStackTestReportPublisher(Map<String, String> customEnvVars) {
-    this.customEnvVars = customEnvVars != null && !customEnvVars.isEmpty() ? new HashMap<>(customEnvVars) : new HashMap<>();
+    this.customEnvVars = customEnvVars != null && !customEnvVars.isEmpty() ? new ConcurrentHashMap<>(customEnvVars) : new ConcurrentHashMap<>();
     requestsUtil = new RequestsUtil();
   }
 
@@ -72,7 +72,8 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
 
     LOGGER.info("Adding BrowserStack Report Action");
 
-    JSONObject reportConfigDetailsResponse = fetchConfigDetails(logger, Constants.BROWSERSTACK_CONFIG_DETAILS_ENDPOINT, credentials);
+    String configDetailsEndpoint = Constants.INTEGRATE_BASE_URL + Constants.BROWSERSTACK_CONFIG_DETAILS_ENDPOINT;
+    JSONObject reportConfigDetailsResponse = fetchConfigDetails(logger, configDetailsEndpoint, credentials);
     if (reportConfigDetailsResponse == null) {
       logError(logger, "Could not fetch the report config details");
       return;
@@ -100,7 +101,6 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
       String reportUrl = config.getString("report_fetch_url");
       String reportName = config.getString("report_name");
       String reportTabUrl = config.getString("report_tab_url");
-      log(logger, reportUrl + " " + UUID);
       build.addAction(new BrowserStackTestReportAction(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
     }
 
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
index b079a99..24d09b3 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
@@ -12,7 +12,11 @@
 import java.util.Map;
 
 public class RequestsUtil {
-  OkHttpClient client = new OkHttpClient();
+  private transient OkHttpClient client;
+
+  public RequestsUtil() {
+    this.client = new OkHttpClient();
+  }
 
   public Response makeRequest(String getUrl, BrowserStackCredentials browserStackCredentials) throws Exception {
     try {

From 5aec015f7b8314a5d3deae4b0011bded72bd2847 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Tue, 25 Mar 2025 01:32:12 +0530
Subject: [PATCH 27/40] intg 1575 freestyle job refactor

---
 .../BrowserStackTestReportAction.java                |  5 ++---
 .../BrowserStackTestReportPublisher.java             |  4 ++--
 .../ci/jenkins/integrationService/RequestsUtil.java  | 12 ++++++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index 15b3b93..aa236b7 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -34,8 +34,7 @@ public class BrowserStackTestReportAction implements Action {
   private static final String RETRY_REPORT = "RETRY_REPORT";
 
   private static final int MAX_ATTEMPTS = 3;
-  private static final OkHttpClient client = new OkHttpClient();
-  RequestsUtil requestsUtil;
+  private RequestsUtil requestsUtil;
 
   public BrowserStackTestReportAction(Run<?, ?> run, BrowserStackCredentials credentials, String reportUrl, String UUID, String reportName, String tabUrl, final PrintStream logger) {
     super();
@@ -50,7 +49,7 @@ public BrowserStackTestReportAction(Run<?, ?> run, BrowserStackCredentials crede
     this.urlName = tabUrl;
     this.maxRetryReportAttempt = MAX_ATTEMPTS;
 
-    requestsUtil = new RequestsUtil();
+    this.requestsUtil = new RequestsUtil();
   }
 
 
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 246c8b0..e19855b 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -42,12 +42,12 @@ public class BrowserStackTestReportPublisher extends Recorder implements SimpleB
   private static final int RETRY_DELAY_SECONDS = 5;
   private final Map<String, String> customEnvVars;
 
-  RequestsUtil requestsUtil;
+  private RequestsUtil requestsUtil;
 
   @DataBoundConstructor
   public BrowserStackTestReportPublisher(Map<String, String> customEnvVars) {
     this.customEnvVars = customEnvVars != null && !customEnvVars.isEmpty() ? new ConcurrentHashMap<>(customEnvVars) : new ConcurrentHashMap<>();
-    requestsUtil = new RequestsUtil();
+    this.requestsUtil = new RequestsUtil();
   }
 
   @Override
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
index 24d09b3..9e99730 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
@@ -14,9 +14,6 @@
 public class RequestsUtil {
   private transient OkHttpClient client;
 
-  public RequestsUtil() {
-    this.client = new OkHttpClient();
-  }
 
   public Response makeRequest(String getUrl, BrowserStackCredentials browserStackCredentials) throws Exception {
     try {
@@ -24,7 +21,7 @@ public Response makeRequest(String getUrl, BrowserStackCredentials browserStackC
               .url(getUrl)
               .header("Authorization", Credentials.basic(browserStackCredentials.getUsername(), browserStackCredentials.getDecryptedAccesskey()))
               .build();
-      Response response = client.newCall(request).execute();
+      Response response = getClient().newCall(request).execute();
       return response;
     } catch (IOException e) {
       e.printStackTrace();
@@ -45,5 +42,12 @@ public String buildQueryParams(String url, Map<String, String> params) throws UR
       throw uriSyntaxException;
     }
   }
+
+  private OkHttpClient getClient() {
+    if (client == null) {
+      client = new OkHttpClient();
+    }
+    return client;
+  }
 }
 

From aa4225f22baf23c1a86465508e6aa18e48ad6389 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Tue, 25 Mar 2025 01:37:09 +0530
Subject: [PATCH 28/40] intg 1575 version update

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1fecd92..b331561 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.21-SNAPSHOT</version>
+  <version>1.2.17-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>

From ee5802c921fd358f68c5cc729ac066952659d02f Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Fri, 16 May 2025 09:10:46 +0530
Subject: [PATCH 29/40] revamp based on new architecture

---
 .../ci/common/constants/Constants.java        |   6 +-
 .../BrowserStackReportStatus.java             |   5 +-
 .../BrowserStackTestReportAction.java         |  49 +++++----
 .../BrowserStackTestReportPublisher.java      | 100 +-----------------
 .../BrowserStackTestReportAction/index.jelly  |   4 +-
 5 files changed, 40 insertions(+), 124 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index e23f034..cd9e8d4 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -15,12 +15,12 @@ public class Constants {
     public static final String BROWSERSTACK_REPORT_PATH_PATTERN = "**/browserstack-artifacts/*";
     public static final String JENKINS_CI_PLUGIN = "JenkinsCiPlugin";
 
-    public static final String INTEGRATE_BASE_URL = "https://integrate.browserstack.com/api";
-    public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "/ci-tools/v1/events/report-config";
+    public static final String CAD_BASE_URL = "https://api-observability.browserstack.com//api";
+    public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "/v1/builds/buildReport";
 
     public static final String BROWSERSTACK_TEST_REPORT_DISPLAY_NAME = "BrowserStack Build Test Reports";
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
-    public static  final String REPORT_CONFIG_OPERATION_NAME = "report-config-details";
+    public static  final String REPORT_FORMAT = "richHtml";
 
     // Product
     public static final String AUTOMATE = "automate";
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java
index 7bc62eb..f741d0a 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java
@@ -3,5 +3,8 @@
 public enum BrowserStackReportStatus {
   IN_PROGRESS,
   COMPLETED,
-  FAILED
+  TEST_AVAILABLE,
+  NOT_AVAILABLE,
+  BUILD_NOT_FOUND,
+  MULTIPLE_BUILD_FOUND
 }
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index aa236b7..6a1a65c 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -7,6 +7,7 @@
 import org.json.JSONObject;
 import okhttp3.*;
 
+import javax.xml.bind.annotation.XmlType;
 import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -19,15 +20,18 @@ public class BrowserStackTestReportAction implements Action {
 
   private Run<?, ?> run;
   private BrowserStackCredentials credentials;
-  private String reportUrl;
-  private final String UUID;
   private String reportHtml;
+
+  private String buildName;
+  private String buildCreatedAt;
   private final transient PrintStream logger;
   private String reportStyle;
   public String reportName;
   public String urlName;
 
   private int maxRetryReportAttempt;
+
+  private static final String DEFAULT_REPORT_TIMEOUT = "120";
   private static final String REPORT_IN_PROGRESS = "REPORT_IN_PROGRESS";
   private static final String REPORT_FAILED = "REPORT_FAILED";
 
@@ -36,18 +40,16 @@ public class BrowserStackTestReportAction implements Action {
   private static final int MAX_ATTEMPTS = 3;
   private RequestsUtil requestsUtil;
 
-  public BrowserStackTestReportAction(Run<?, ?> run, BrowserStackCredentials credentials, String reportUrl, String UUID, String reportName, String tabUrl, final PrintStream logger) {
+  public BrowserStackTestReportAction(Run<?, ?> run, BrowserStackCredentials credentials, String buildName, String builldCreatedAt, final PrintStream logger) {
     super();
     setBuild(run);
     this.credentials = credentials;
-    this.reportUrl = reportUrl;
-    this.UUID = UUID;
+    this.buildName = buildName;
+    this.buildCreatedAt = builldCreatedAt;
     this.reportHtml = null;
     this.reportStyle = "";
+    maxRetryReportAttempt = MAX_ATTEMPTS;
     this.logger = logger;
-    this.reportName = reportName;
-    this.urlName = tabUrl;
-    this.maxRetryReportAttempt = MAX_ATTEMPTS;
 
     this.requestsUtil = new RequestsUtil();
   }
@@ -70,28 +72,37 @@ private void fetchReportConditions() {
   }
 
   private void fetchReport() {
-    if (UUID == null) {
-      reportHtml = REPORT_FAILED;
-      return;
-    }
     Map<String, String> params = new HashMap<>();
-    params.put("UUID", UUID);
-    params.put("report_name", reportName);
-    params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
+    String pollValue = "FIRST";
+    params.put("buildCreatedAt", buildCreatedAt);
+    params.put("buildName", buildName);
+    params.put("requestingCi", Constants.INTEGRATIONS_TOOL_KEY);
+    params.put("reportFormat", Arrays.asList(Constants.REPORT_FORMAT).toString());
+    params.put("requestType", pollValue);
+    params.put("userTimeout", DEFAULT_REPORT_TIMEOUT);
 
     try {
+      String reportUrl = Constants.CAD_BASE_URL + Constants.BROWSERSTACK_CONFIG_DETAILS_ENDPOINT;
       String ciReportUrlWithParams = requestsUtil.buildQueryParams(reportUrl, params);
       log(logger, "Fetching browserstack report " + reportName);
       Response response = requestsUtil.makeRequest(ciReportUrlWithParams, credentials);
       if (response.isSuccessful()) {
+        assert response.body() != null;
         JSONObject reportResponse = new JSONObject(response.body().string());
-        String reportStatus = reportResponse.optString("report_status");
-        if (reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.COMPLETED))) {
+        String reportStatus = reportResponse.optString("reportStatus");
+        if (reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.COMPLETED)) ||
+                reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.TEST_AVAILABLE)) ||
+                reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.NOT_AVAILABLE))) {
+
           String defaultHTML = "<h1>No Report Found</h1>";
-          reportHtml = reportResponse.optString("report_html", defaultHTML);
-          reportStyle = reportResponse.optString("report_style", "");
+          JSONObject report = reportResponse.optJSONObject("report");
+          reportHtml = report != null ? report.optString("report_html", defaultHTML) : defaultHTML;
+          reportStyle = report != null ? report.optString("report_style", "") : "";
+
         } else if (reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.IN_PROGRESS))) {
+
           reportHtml = REPORT_IN_PROGRESS;
+
         } else {
           reportHtml = REPORT_FAILED;
         }
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index e19855b..583efc7 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -18,19 +18,14 @@
 import hudson.Launcher;
 import jenkins.tasks.SimpleBuildStep;
 import org.jenkinsci.Symbol;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import okhttp3.*;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.io.IOException;
 import java.io.PrintStream;
-import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
 import static com.browserstack.automate.ci.common.logger.PluginLogger.log;
@@ -38,16 +33,11 @@
 
 public class BrowserStackTestReportPublisher extends Recorder implements SimpleBuildStep {
   private static final Logger LOGGER = Logger.getLogger(BrowserStackTestReportPublisher.class.getName());
-  private static final int MAX_ATTEMPTS = 3;
-  private static final int RETRY_DELAY_SECONDS = 5;
   private final Map<String, String> customEnvVars;
 
-  private RequestsUtil requestsUtil;
-
   @DataBoundConstructor
   public BrowserStackTestReportPublisher(Map<String, String> customEnvVars) {
     this.customEnvVars = customEnvVars != null && !customEnvVars.isEmpty() ? new ConcurrentHashMap<>(customEnvVars) : new ConcurrentHashMap<>();
-    this.requestsUtil = new RequestsUtil();
   }
 
   @Override
@@ -60,7 +50,6 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
 
     String browserStackBuildName = Optional.ofNullable(parentEnvs.get(BrowserStackEnvVars.BROWSERSTACK_BUILD_NAME))
             .orElse(parentEnvs.get(Constants.JENKINS_BUILD_TAG));
-    String projectName = parentEnvs.get(BrowserStackEnvVars.BROWSERSTACK_PROJECT_NAME);
 
     BrowserStackBuildAction buildAction = build.getAction(BrowserStackBuildAction.class);
     if (buildAction == null || buildAction.getBrowserStackCredentials() == null) {
@@ -72,15 +61,7 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
 
     LOGGER.info("Adding BrowserStack Report Action");
 
-    String configDetailsEndpoint = Constants.INTEGRATE_BASE_URL + Constants.BROWSERSTACK_CONFIG_DETAILS_ENDPOINT;
-    JSONObject reportConfigDetailsResponse = fetchConfigDetails(logger, configDetailsEndpoint, credentials);
-    if (reportConfigDetailsResponse == null) {
-      logError(logger, "Could not fetch the report config details");
-      return;
-    }
 
-    JSONArray configDetails = reportConfigDetailsResponse.getJSONArray("config_details");
-    String lookUpURL = reportConfigDetailsResponse.getString("lookup_endpoint");
     Date buildTimestamp = new Date(build.getStartTimeInMillis());
 
     // Format the timestamp (e.g., YYYY-MM-DD HH:MM:SS)
@@ -88,89 +69,12 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
     String formattedTime = sdf.format(buildTimestamp);
 
     // Encode the timestamp to make it URL-safe
-    String encodedTimestamp = URLEncoder.encode(formattedTime, "UTF-8");
-
-    String UUID = fetchBuildUUID(logger, lookUpURL, credentials, browserStackBuildName, projectName, encodedTimestamp);
-    if (UUID == null) {
-      logError(logger, "Cannot find a build with name " + browserStackBuildName);
-    }
+    String buildCreatedAt = URLEncoder.encode(formattedTime, "UTF-8");
 
-    for (int i = 0; i < configDetails.length(); i++) {
-      JSONObject config = configDetails.getJSONObject(i);
-
-      String reportUrl = config.getString("report_fetch_url");
-      String reportName = config.getString("report_name");
-      String reportTabUrl = config.getString("report_tab_url");
-      build.addAction(new BrowserStackTestReportAction(build, credentials, reportUrl, UUID, reportName, reportTabUrl, logger));
-    }
+    build.addAction(new BrowserStackTestReportAction(build, credentials, browserStackBuildName,buildCreatedAt, logger));
 
   }
 
-  private String fetchBuildUUID(PrintStream logger, String lookUpURL, BrowserStackCredentials credentials, String buildName, String projectName, String encodedTimestamp) throws InterruptedException {
-
-    Map<String, String> params = new HashMap<>();
-    params.put("build_name", buildName);
-    params.put("pipeline_timestamp", encodedTimestamp);
-    params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
-    if (projectName != null) {
-      params.put("project_name", projectName);
-    }
-
-    log(logger, "Fetching build....");
-    String lookUpURLWithParams;
-
-    //constructing build params
-    try {
-      lookUpURLWithParams = requestsUtil.buildQueryParams(lookUpURL, params);
-    } catch (URISyntaxException uriSyntaxException) {
-      logError(logger, "Could not build look up url with params" + Arrays.toString(uriSyntaxException.getStackTrace()));
-      return null;
-    }
-
-    //making attempts
-    for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
-      try {
-        Response response = requestsUtil.makeRequest(lookUpURLWithParams, credentials);
-        if (response.isSuccessful()) {
-          assert response.body() != null;
-          JSONObject lookUpResponse = new JSONObject(response.body().string());
-          String UUID = lookUpResponse.optString("UUID", null);
-
-          if (UUID != null) {
-            log(logger, "build found with " + buildName + " and project name " + projectName);
-            return UUID;
-          }
-
-          LOGGER.info("build not found will retry in sometime.." + lookUpResponse.getString("message"));
-        }
-      } catch (Exception e) {
-        logError(logger, "Attempt " + (attempts + 1) + " failed: " + Arrays.toString(e.getStackTrace()));
-      }
-      TimeUnit.SECONDS.sleep(RETRY_DELAY_SECONDS);
-    }
-
-    LOGGER.info("build not found even after " + MAX_ATTEMPTS + "attempts");
-    return null;
-  }
-
-  private JSONObject fetchConfigDetails(PrintStream logger, String configDetailsURL, BrowserStackCredentials credentials) {
-    log(logger, "Fetching config details for reports");
-    Map<String, String> params = new HashMap<>();
-    params.put("tool", Constants.INTEGRATIONS_TOOL_KEY);
-    params.put("operation", Constants.REPORT_CONFIG_OPERATION_NAME);
-    try {
-      String configDetailsURLWithParams = requestsUtil.buildQueryParams(configDetailsURL, params);
-      Response response = requestsUtil.makeRequest(configDetailsURLWithParams, credentials);
-      if (response.isSuccessful()) {
-        assert response.body() != null;
-        return new JSONObject(response.body().string());
-      }
-      logError(logger, "Failed to fetch config details: " + response.code());
-    } catch (Exception e) {
-      logError(logger, "Exception occurred while fetching config details: " + Arrays.toString(e.getStackTrace()));
-    }
-    return null;
-  }
 
   public Map<String, String> getCustomEnvVars() {
     return customEnvVars;
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
index a27b9dc..6ffadcf 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
@@ -75,7 +75,7 @@
                     <div class="new-container">
                         <div class="report-row">
                             <j:if test="${(it.isReportInProgress())}">
-                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack ${it.reportName} Report In Progress</strong></p>
+                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack ${it.reportName} Report In Progress, please refresh after sometime</strong></p>
                             </j:if>
                             <j:if test="${(it.isReportFailed())}">
                                 <p class="no-report-para"><strong class="strong-font-custom">No BrowserStack ${it.reportName} Report Available</strong></p>
@@ -85,8 +85,6 @@
                                 <ul class="bullet-points">
                                     <li class="bullet-item">You have set valid BrowserStack credentials via BrowserStack Plugin.</li>
                                     <li class="bullet-item">You have used BROWSERSTACK_BUILD_NAME as your build name</li>
-                                    <li class="bullet-item">try passing BROWSERSTACK_PROJECT_NAME environment variable</li>
-
                                 </ul>
                             </j:if>
                             <j:if test="${it.reportRetryRequired()}">

From f62cea1885389126c469d975434b29b314194bdf Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Fri, 16 May 2025 09:20:00 +0530
Subject: [PATCH 30/40] response key change

---
 .../integrationService/BrowserStackTestReportAction.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index 6a1a65c..ab8a355 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -96,8 +96,8 @@ private void fetchReport() {
 
           String defaultHTML = "<h1>No Report Found</h1>";
           JSONObject report = reportResponse.optJSONObject("report");
-          reportHtml = report != null ? report.optString("report_html", defaultHTML) : defaultHTML;
-          reportStyle = report != null ? report.optString("report_style", "") : "";
+          reportHtml = report != null ? report.optString("reportHtml", defaultHTML) : defaultHTML;
+          reportStyle = report != null ? report.optString("reportCss", "") : "";
 
         } else if (reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.IN_PROGRESS))) {
 

From 273ef30e8c2b98e2e4bd51eb626a5741c94c0602 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Fri, 16 May 2025 16:25:43 +0530
Subject: [PATCH 31/40] dev test fixes

---
 .../ci/common/constants/Constants.java        |  5 +++-
 .../BrowserStackTestReportAction.java         | 26 +++++++++++++------
 .../BrowserStackTestReportPublisher.java      |  2 +-
 .../integrationService/RequestsUtil.java      | 13 ++++------
 .../BrowserStackTestReportAction/index.jelly  | 11 +++++---
 5 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index cd9e8d4..0445d72 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -15,13 +15,16 @@ public class Constants {
     public static final String BROWSERSTACK_REPORT_PATH_PATTERN = "**/browserstack-artifacts/*";
     public static final String JENKINS_CI_PLUGIN = "JenkinsCiPlugin";
 
-    public static final String CAD_BASE_URL = "https://api-observability.browserstack.com//api";
+    public static final String CAD_BASE_URL = "http://localhost:3002/api";
     public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "/v1/builds/buildReport";
 
     public static final String BROWSERSTACK_TEST_REPORT_DISPLAY_NAME = "BrowserStack Build Test Reports";
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
     public static  final String REPORT_FORMAT = "richHtml";
 
+    public static final String BROWSERSTACK_TEST_REPORT_URL = "testReportBrowserStack";
+    public static final String BROWSERSTACK_CAD_REPORT_DISPLAY_NAME = "BrowserStack Test Reports";
+
     // Product
     public static final String AUTOMATE = "automate";
     public static final String APP_AUTOMATE = "app-automate";
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index ab8a355..1e40fda 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -2,12 +2,12 @@
 
 import com.browserstack.automate.ci.common.constants.Constants;
 import com.browserstack.automate.ci.jenkins.BrowserStackCredentials;
+import com.google.gson.Gson;
 import hudson.model.Action;
 import hudson.model.Run;
 import org.json.JSONObject;
 import okhttp3.*;
 
-import javax.xml.bind.annotation.XmlType;
 import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -37,6 +37,8 @@ public class BrowserStackTestReportAction implements Action {
 
   private static final String RETRY_REPORT = "RETRY_REPORT";
 
+  private static final String RATE_LIMIT = "RATE_LIMIT";
+
   private static final int MAX_ATTEMPTS = 3;
   private RequestsUtil requestsUtil;
 
@@ -66,7 +68,7 @@ public String getReportStyle() {
   }
 
   private void fetchReportConditions() {
-    if (reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS) || reportHtml.equals(RETRY_REPORT)) {
+    if (reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS) || reportHtml.equals(RETRY_REPORT) || reportHtml.equals(RATE_LIMIT)) {
       fetchReport();
     }
   }
@@ -83,9 +85,11 @@ private void fetchReport() {
 
     try {
       String reportUrl = Constants.CAD_BASE_URL + Constants.BROWSERSTACK_CONFIG_DETAILS_ENDPOINT;
-      String ciReportUrlWithParams = requestsUtil.buildQueryParams(reportUrl, params);
+      Gson gson = new Gson();
+      String json = gson.toJson(params);
+      RequestBody ciReportBody = RequestBody.create(MediaType.parse("application/json"), json);
       log(logger, "Fetching browserstack report " + reportName);
-      Response response = requestsUtil.makeRequest(ciReportUrlWithParams, credentials);
+      Response response = requestsUtil.makeRequest(reportUrl, credentials, ciReportBody);
       if (response.isSuccessful()) {
         assert response.body() != null;
         JSONObject reportResponse = new JSONObject(response.body().string());
@@ -96,8 +100,8 @@ private void fetchReport() {
 
           String defaultHTML = "<h1>No Report Found</h1>";
           JSONObject report = reportResponse.optJSONObject("report");
-          reportHtml = report != null ? report.optString("reportHtml", defaultHTML) : defaultHTML;
-          reportStyle = report != null ? report.optString("reportCss", "") : "";
+          reportHtml = report != null ? report.optString("richHtml", defaultHTML) : defaultHTML;
+          reportStyle = report != null ? report.optString("richCss", "") : "";
 
         } else if (reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.IN_PROGRESS))) {
 
@@ -106,6 +110,10 @@ private void fetchReport() {
         } else {
           reportHtml = REPORT_FAILED;
         }
+      } else if (response.code() == 429) {
+        reportHtml = RATE_LIMIT;
+      } else {
+        reportHtml = REPORT_FAILED;
         logError(logger, "Received Non success response while fetching report" + response.code());
       }
     } catch (Exception e) {
@@ -130,6 +138,8 @@ public boolean reportRetryRequired() {
     return reportHtml.equals(RETRY_REPORT);
   }
 
+  public boolean isUserRateLimited() { return  reportHtml.equals(RATE_LIMIT); }
+
   public boolean isReportAvailable() {
     if (reportHtml != null && !reportHtml.equals(REPORT_IN_PROGRESS) && !reportHtml.equals(REPORT_FAILED) && !reportHtml.equals(RETRY_REPORT)) {
       return true;
@@ -157,12 +167,12 @@ public String getIconFileName() {
 
   @Override
   public String getDisplayName() {
-    return this.reportName;
+    return Constants.BROWSERSTACK_CAD_REPORT_DISPLAY_NAME;
   }
 
   @Override
   public String getUrlName() {
-    return this.urlName;
+    return Constants.BROWSERSTACK_TEST_REPORT_URL;
   }
 
 }
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 583efc7..b8630b5 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -98,7 +98,7 @@ public boolean isApplicable(Class<? extends AbstractProject> aClass) {
 
     @Override
     public String getDisplayName() {
-      return Constants.BROWSERSTACK_TEST_REPORT_DISPLAY_NAME;
+      return Constants.BROWSERSTACK_CAD_REPORT_DISPLAY_NAME;
     }
 
   }
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
index 9e99730..15affc0 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/RequestsUtil.java
@@ -1,10 +1,7 @@
 package com.browserstack.automate.ci.jenkins.integrationService;
 
 import com.browserstack.automate.ci.jenkins.BrowserStackCredentials;
-import okhttp3.Credentials;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
+import okhttp3.*;
 import org.apache.http.client.utils.URIBuilder;
 
 import java.io.IOException;
@@ -15,14 +12,14 @@ public class RequestsUtil {
   private transient OkHttpClient client;
 
 
-  public Response makeRequest(String getUrl, BrowserStackCredentials browserStackCredentials) throws Exception {
+  public Response makeRequest(String url, BrowserStackCredentials browserStackCredentials, RequestBody body) throws Exception {
     try {
       Request request = new Request.Builder()
-              .url(getUrl)
+              .url(url)
               .header("Authorization", Credentials.basic(browserStackCredentials.getUsername(), browserStackCredentials.getDecryptedAccesskey()))
+              .post(body)
               .build();
-      Response response = getClient().newCall(request).execute();
-      return response;
+      return getClient().newCall(request).execute();
     } catch (IOException e) {
       e.printStackTrace();
       throw e;
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
index 6ffadcf..f246af1 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
@@ -75,12 +75,12 @@
                     <div class="new-container">
                         <div class="report-row">
                             <j:if test="${(it.isReportInProgress())}">
-                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack ${it.reportName} Report In Progress, please refresh after sometime</strong></p>
+                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Test Report generation In Progress, please refresh after sometime</strong></p>
                             </j:if>
                             <j:if test="${(it.isReportFailed())}">
-                                <p class="no-report-para"><strong class="strong-font-custom">No BrowserStack ${it.reportName} Report Available</strong></p>
+                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Test Report Could Not Be Fetched</strong></p>
                                 <br/>
-                                <p class="no-report-para">BrowserStack test report could not be generated for this build. Please ensure that:</p>
+                                <p class="no-report-para">BrowserStack test report could not be fetched for this build since something went wrong. Please ensure that:</p>
                                 <br/>
                                 <ul class="bullet-points">
                                     <li class="bullet-item">You have set valid BrowserStack credentials via BrowserStack Plugin.</li>
@@ -88,7 +88,10 @@
                                 </ul>
                             </j:if>
                             <j:if test="${it.reportRetryRequired()}">
-                                <p class="no-report-para"><strong class="strong-font-custom">Unable to Fetch Report try refreshing...</strong></p>
+                                <p class="no-report-para"><strong class="strong-font-custom">Unable to Fetch Report something went wrong try refreshing...</strong></p>
+                            </j:if>
+                            <j:if test="${it.isUserRateLimited()}">
+                                <p class="no-report-para"><strong class="strong-font-custom"> You have been rate limited, please retry after sometime</strong></p>
                             </j:if>
                         </div>
                     </div>

From 77c599a63c66b559662eddf87d7a727addb54143 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Fri, 16 May 2025 17:00:06 +0530
Subject: [PATCH 32/40] url changes

---
 .../automate/ci/common/constants/Constants.java             | 5 ++---
 .../BrowserStackTestReportAction/index.jelly                | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index 0445d72..48e8302 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -15,15 +15,14 @@ public class Constants {
     public static final String BROWSERSTACK_REPORT_PATH_PATTERN = "**/browserstack-artifacts/*";
     public static final String JENKINS_CI_PLUGIN = "JenkinsCiPlugin";
 
-    public static final String CAD_BASE_URL = "http://localhost:3002/api";
+    public static final String CAD_BASE_URL = "https://api-observability.browserstack.com/api";
     public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "/v1/builds/buildReport";
 
-    public static final String BROWSERSTACK_TEST_REPORT_DISPLAY_NAME = "BrowserStack Build Test Reports";
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
     public static  final String REPORT_FORMAT = "richHtml";
 
     public static final String BROWSERSTACK_TEST_REPORT_URL = "testReportBrowserStack";
-    public static final String BROWSERSTACK_CAD_REPORT_DISPLAY_NAME = "BrowserStack Test Reports";
+    public static final String BROWSERSTACK_CAD_REPORT_DISPLAY_NAME = "BrowserStack Build Test Reports";
 
     // Product
     public static final String AUTOMATE = "automate";
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
index f246af1..0ea323f 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
@@ -75,12 +75,12 @@
                     <div class="new-container">
                         <div class="report-row">
                             <j:if test="${(it.isReportInProgress())}">
-                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Test Report generation In Progress, please refresh after sometime</strong></p>
+                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Build Test Report generation In Progress, please refresh after sometime</strong></p>
                             </j:if>
                             <j:if test="${(it.isReportFailed())}">
-                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Test Report Could Not Be Fetched</strong></p>
+                                <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Build Test Report Could Not Be Fetched</strong></p>
                                 <br/>
-                                <p class="no-report-para">BrowserStack test report could not be fetched for this build since something went wrong. Please ensure that:</p>
+                                <p class="no-report-para">BrowserStack build test report could not be fetched for this build since something went wrong. Please ensure that:</p>
                                 <br/>
                                 <ul class="bullet-points">
                                     <li class="bullet-item">You have set valid BrowserStack credentials via BrowserStack Plugin.</li>

From 940c3be31014b530d6eb65d1daf270a024f88aa4 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Fri, 16 May 2025 18:11:33 +0530
Subject: [PATCH 33/40] refactoring the code

---
 .../BrowserStackReportStatus.java             |   4 +-
 .../BrowserStackTestReportAction.java         | 191 ++++++++++--------
 .../summary.jelly                             |   6 +-
 3 files changed, 111 insertions(+), 90 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java
index f741d0a..ae7d5e2 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackReportStatus.java
@@ -4,7 +4,5 @@ public enum BrowserStackReportStatus {
   IN_PROGRESS,
   COMPLETED,
   TEST_AVAILABLE,
-  NOT_AVAILABLE,
-  BUILD_NOT_FOUND,
-  MULTIPLE_BUILD_FOUND
+  NOT_AVAILABLE
 }
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index 1e40fda..e5c52c5 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -18,138 +18,162 @@
 
 public class BrowserStackTestReportAction implements Action {
 
-  private Run<?, ?> run;
-  private BrowserStackCredentials credentials;
-  private String reportHtml;
-
-  private String buildName;
-  private String buildCreatedAt;
-  private final transient PrintStream logger;
-  private String reportStyle;
-  public String reportName;
-  public String urlName;
-
-  private int maxRetryReportAttempt;
-
   private static final String DEFAULT_REPORT_TIMEOUT = "120";
+  private static final String SUCCESS_REPORT = "SUCCESS_REPORT";
   private static final String REPORT_IN_PROGRESS = "REPORT_IN_PROGRESS";
   private static final String REPORT_FAILED = "REPORT_FAILED";
-
   private static final String RETRY_REPORT = "RETRY_REPORT";
-
   private static final String RATE_LIMIT = "RATE_LIMIT";
-
+  private static final String TEST_AVAILABLE = "TEST_AVAILABLE";
   private static final int MAX_ATTEMPTS = 3;
-  private RequestsUtil requestsUtil;
 
-  public BrowserStackTestReportAction(Run<?, ?> run, BrowserStackCredentials credentials, String buildName, String builldCreatedAt, final PrintStream logger) {
-    super();
-    setBuild(run);
+  private final transient PrintStream logger;
+  private final RequestsUtil requestsUtil;
+  private final BrowserStackCredentials credentials;
+  private final String buildName;
+  private final String buildCreatedAt;
+
+  private Run<?, ?> run;
+  private String reportHtml;
+  private String reportStyle;
+  private String reportStatus;
+  private int maxRetryReportAttempt;
+
+  public BrowserStackTestReportAction(Run<?, ?> run, BrowserStackCredentials credentials, String buildName, String buildCreatedAt, final PrintStream logger) {
+    this.run = run;
     this.credentials = credentials;
     this.buildName = buildName;
-    this.buildCreatedAt = builldCreatedAt;
-    this.reportHtml = null;
-    this.reportStyle = "";
-    maxRetryReportAttempt = MAX_ATTEMPTS;
+    this.buildCreatedAt = buildCreatedAt;
     this.logger = logger;
-
     this.requestsUtil = new RequestsUtil();
+    this.reportHtml = null;
+    this.reportStyle = "";
+    this.reportStatus = "";
+    this.maxRetryReportAttempt = MAX_ATTEMPTS;
   }
 
-
   public String getReportHtml() {
-    fetchReportConditions();
+    ensureReportFetched();
     return reportHtml;
   }
 
   public String getReportStyle() {
-    fetchReportConditions();
+    ensureReportFetched();
     return reportStyle;
   }
 
-  private void fetchReportConditions() {
-    if (reportHtml == null || reportHtml.equals(REPORT_IN_PROGRESS) || reportHtml.equals(RETRY_REPORT) || reportHtml.equals(RATE_LIMIT)) {
+  private void ensureReportFetched() {
+    if (!isReportCompletedOrFailed()) {
       fetchReport();
     }
   }
 
+  private boolean isReportCompletedOrFailed() {
+    return reportStatus.equals(SUCCESS_REPORT) || reportStatus.equals(REPORT_FAILED);
+  }
+
   private void fetchReport() {
+    Map<String, String> params = createReportParams();
+    String reportUrl = Constants.CAD_BASE_URL + Constants.BROWSERSTACK_CONFIG_DETAILS_ENDPOINT;
+
+    try {
+      log(logger, "Fetching BrowserStack report...");
+      Response response = requestsUtil.makeRequest(reportUrl, credentials, createRequestBody(params));
+      handleResponse(response);
+    } catch (Exception e) {
+      handleFetchException(e);
+    }
+  }
+
+  private Map<String, String> createReportParams() {
     Map<String, String> params = new HashMap<>();
-    String pollValue = "FIRST";
     params.put("buildCreatedAt", buildCreatedAt);
     params.put("buildName", buildName);
     params.put("requestingCi", Constants.INTEGRATIONS_TOOL_KEY);
     params.put("reportFormat", Arrays.asList(Constants.REPORT_FORMAT).toString());
-    params.put("requestType", pollValue);
+    params.put("requestType", "POLL");
     params.put("userTimeout", DEFAULT_REPORT_TIMEOUT);
+    return params;
+  }
 
-    try {
-      String reportUrl = Constants.CAD_BASE_URL + Constants.BROWSERSTACK_CONFIG_DETAILS_ENDPOINT;
-      Gson gson = new Gson();
-      String json = gson.toJson(params);
-      RequestBody ciReportBody = RequestBody.create(MediaType.parse("application/json"), json);
-      log(logger, "Fetching browserstack report " + reportName);
-      Response response = requestsUtil.makeRequest(reportUrl, credentials, ciReportBody);
-      if (response.isSuccessful()) {
-        assert response.body() != null;
-        JSONObject reportResponse = new JSONObject(response.body().string());
-        String reportStatus = reportResponse.optString("reportStatus");
-        if (reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.COMPLETED)) ||
-                reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.TEST_AVAILABLE)) ||
-                reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.NOT_AVAILABLE))) {
-
-          String defaultHTML = "<h1>No Report Found</h1>";
-          JSONObject report = reportResponse.optJSONObject("report");
-          reportHtml = report != null ? report.optString("richHtml", defaultHTML) : defaultHTML;
-          reportStyle = report != null ? report.optString("richCss", "") : "";
-
-        } else if (reportStatus.equalsIgnoreCase(String.valueOf(BrowserStackReportStatus.IN_PROGRESS))) {
-
-          reportHtml = REPORT_IN_PROGRESS;
-
-        } else {
-          reportHtml = REPORT_FAILED;
-        }
-      } else if (response.code() == 429) {
-        reportHtml = RATE_LIMIT;
-      } else {
-        reportHtml = REPORT_FAILED;
-        logError(logger, "Received Non success response while fetching report" + response.code());
-      }
-    } catch (Exception e) {
-      reportHtml = RETRY_REPORT;
-      this.maxRetryReportAttempt--;
-      if (this.maxRetryReportAttempt < 0) {
-        reportHtml = REPORT_FAILED;
-      }
-      logError(logger, "Exception while fetching the report" + Arrays.toString(e.getStackTrace()));
+  private RequestBody createRequestBody(Map<String, String> params) {
+    Gson gson = new Gson();
+    String json = gson.toJson(params);
+    return RequestBody.create(MediaType.parse("application/json"), json);
+  }
+
+  private void handleResponse(Response response) throws Exception {
+    if (response.isSuccessful()) {
+      processSuccessfulResponse(response);
+    } else if (response.code() == 429) {
+      reportStatus = RATE_LIMIT;
+    } else {
+      reportStatus = REPORT_FAILED;
+      logError(logger, "Non-success response while fetching report: " + response.code());
+    }
+  }
+
+  private void processSuccessfulResponse(Response response) throws Exception {
+    assert response.body() != null;
+    JSONObject reportResponse = new JSONObject(response.body().string());
+    String responseReportStatus = reportResponse.optString("reportStatus");
+    JSONObject report = reportResponse.optJSONObject("report");
+
+    switch (responseReportStatus.toUpperCase()) {
+      case "COMPLETED":
+      case "NOT_AVAILABLE":
+        setReportSuccess(report);
+        break;
+      case "IN_PROGRESS":
+        reportStatus = REPORT_IN_PROGRESS;
+        break;
+      case "TEST_AVAILABLE":
+        setReportSuccess(report);
+        reportStatus = TEST_AVAILABLE;
+        break;
+      default:
+        reportStatus = REPORT_FAILED;
+    }
+  }
+
+  private void setReportSuccess(JSONObject report) {
+    String defaultHTML = "<h1>No Report Found</h1>";
+    reportStatus = SUCCESS_REPORT;
+    reportHtml = report != null ? report.optString("richHtml", defaultHTML) : defaultHTML;
+    reportStyle = report != null ? report.optString("richCss", "") : "";
+  }
+
+  private void handleFetchException(Exception e) {
+    reportStatus = RETRY_REPORT;
+    maxRetryReportAttempt--;
+    if (maxRetryReportAttempt < 0) {
+      reportStatus = REPORT_FAILED;
     }
+    logError(logger, "Exception while fetching the report: " + Arrays.toString(e.getStackTrace()));
   }
 
   public boolean isReportInProgress() {
-    return reportHtml.equals(REPORT_IN_PROGRESS);
+    return reportStatus.equals(REPORT_IN_PROGRESS);
   }
 
   public boolean isReportFailed() {
-    return reportHtml.equals(REPORT_FAILED);
+    return reportStatus.equals(REPORT_FAILED);
   }
 
   public boolean reportRetryRequired() {
-    return reportHtml.equals(RETRY_REPORT);
+    return reportStatus.equals(RETRY_REPORT);
   }
 
-  public boolean isUserRateLimited() { return  reportHtml.equals(RATE_LIMIT); }
+  public boolean isUserRateLimited() {
+    return reportStatus.equals(RATE_LIMIT);
+  }
 
   public boolean isReportAvailable() {
-    if (reportHtml != null && !reportHtml.equals(REPORT_IN_PROGRESS) && !reportHtml.equals(REPORT_FAILED) && !reportHtml.equals(RETRY_REPORT)) {
-      return true;
-    }
-    return false;
+    return reportStatus.equals(SUCCESS_REPORT) || reportStatus.equals(TEST_AVAILABLE);
   }
 
   public boolean reportHasStatus() {
-    if (reportHtml == null) return false;
-    return reportHtml.equals(REPORT_IN_PROGRESS) || reportHtml.equals(REPORT_FAILED);
+    return !reportStatus.isEmpty() && (reportStatus.equals(REPORT_IN_PROGRESS) || reportStatus.equals(REPORT_FAILED));
   }
 
   public Run<?, ?> getBuild() {
@@ -174,5 +198,4 @@ public String getDisplayName() {
   public String getUrlName() {
     return Constants.BROWSERSTACK_TEST_REPORT_URL;
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/summary.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/summary.jelly
index cf236ac..2ff0fbc 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/summary.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/summary.jelly
@@ -86,9 +86,9 @@
                             <span class="meta-label">BUILD</span>
                             <h1 class="build-meta">${it.build}</h1>
                         </div>
-                        <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Test Report In Progress...</strong></p>
+                        <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Build Test Report In Progress...</strong></p>
                         <div class="report-row cta">
-                            <a href="${it.urlName}">View BrowserStack ${it.reportName} Report</a>
+                            <a href="${it.urlName}">View BrowserStack Build Test Report</a>
                         </div>
                     </j:if>
                     <j:if test="${(it.isReportFailed())}">
@@ -113,7 +113,7 @@
                     <h1 class="build-meta">${it.build}</h1>
                 </div>
                 <div class="report-row cta">
-                    <a href="${it.urlName}">View BrowserStack ${it.reportName} Report</a>
+                    <a href="${it.urlName}">View BrowserStack Build Test Report</a>
                 </div>
             </div>
         </j:if>

From 9ef21c51ecdb95c35f491f82ec0b368753af2608 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Mon, 19 May 2025 15:30:36 +0530
Subject: [PATCH 34/40] adding requestType param

---
 .../integrationService/BrowserStackTestReportAction.java   | 7 ++++++-
 .../BrowserStackTestReportAction/index.jelly               | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index e5c52c5..8936a96 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -86,12 +86,13 @@ private void fetchReport() {
   }
 
   private Map<String, String> createReportParams() {
+    String RquestTypeForJenkins = "POLL";
     Map<String, String> params = new HashMap<>();
     params.put("buildCreatedAt", buildCreatedAt);
     params.put("buildName", buildName);
     params.put("requestingCi", Constants.INTEGRATIONS_TOOL_KEY);
     params.put("reportFormat", Arrays.asList(Constants.REPORT_FORMAT).toString());
-    params.put("requestType", "POLL");
+    params.put("requestType", RquestTypeForJenkins);
     params.put("userTimeout", DEFAULT_REPORT_TIMEOUT);
     return params;
   }
@@ -172,6 +173,10 @@ public boolean isReportAvailable() {
     return reportStatus.equals(SUCCESS_REPORT) || reportStatus.equals(TEST_AVAILABLE);
   }
 
+  public boolean isReportTestAvailable() {
+    return reportStatus.equals(TEST_AVAILABLE);
+  }
+
   public boolean reportHasStatus() {
     return !reportStatus.isEmpty() && (reportStatus.equals(REPORT_IN_PROGRESS) || reportStatus.equals(REPORT_FAILED));
   }
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
index 0ea323f..9640056 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
@@ -98,6 +98,9 @@
                 </j:if>
 
                 <j:if test="${(it.isReportAvailable())}">
+                    <j:if test="${(it.isReportTestAvailable())}" >
+                        <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Build Test Report generation In Progress meanwhile these are the test listing...</strong></p>
+                    </j:if>
                     <div>
                         <j:out value="${it.getReportHtml()}"/>
                     </div>

From 0e535c369f677958bf7938e643269e20a015dd54 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Wed, 21 May 2025 14:29:47 +0530
Subject: [PATCH 35/40] contract changes

---
 .../browserstack/automate/ci/common/constants/Constants.java    | 2 +-
 .../integrationService/BrowserStackTestReportAction.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index 48e8302..fe7e6b8 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -15,7 +15,7 @@ public class Constants {
     public static final String BROWSERSTACK_REPORT_PATH_PATTERN = "**/browserstack-artifacts/*";
     public static final String JENKINS_CI_PLUGIN = "JenkinsCiPlugin";
 
-    public static final String CAD_BASE_URL = "https://api-observability.browserstack.com/api";
+    public static final String CAD_BASE_URL = "https://api-observability.browserstack.com/ext";
     public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "/v1/builds/buildReport";
 
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index 8936a96..e2b27ed 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -88,7 +88,7 @@ private void fetchReport() {
   private Map<String, String> createReportParams() {
     String RquestTypeForJenkins = "POLL";
     Map<String, String> params = new HashMap<>();
-    params.put("buildCreatedAt", buildCreatedAt);
+    params.put("buildStartedAt", buildCreatedAt);
     params.put("buildName", buildName);
     params.put("requestingCi", Constants.INTEGRATIONS_TOOL_KEY);
     params.put("reportFormat", Arrays.asList(Constants.REPORT_FORMAT).toString());

From 1e17a08c1933eb62933f5d8b7db28db8d93ca3b7 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Fri, 23 May 2025 16:53:47 +0530
Subject: [PATCH 36/40] dev testing enhancements

---
 .../BrowserStackTestReportAction.java                | 12 ++++++------
 .../BrowserStackTestReportPublisher.java             |  6 ++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index e2b27ed..93a9a93 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -73,7 +73,7 @@ private boolean isReportCompletedOrFailed() {
   }
 
   private void fetchReport() {
-    Map<String, String> params = createReportParams();
+    Map<String, Object> params = createReportParams();
     String reportUrl = Constants.CAD_BASE_URL + Constants.BROWSERSTACK_CONFIG_DETAILS_ENDPOINT;
 
     try {
@@ -85,19 +85,19 @@ private void fetchReport() {
     }
   }
 
-  private Map<String, String> createReportParams() {
+  private Map<String, Object> createReportParams() {
     String RquestTypeForJenkins = "POLL";
-    Map<String, String> params = new HashMap<>();
+    Map<String, Object> params = new HashMap<>();
     params.put("buildStartedAt", buildCreatedAt);
-    params.put("buildName", buildName);
+    params.put("originalBuildName", buildName);
     params.put("requestingCi", Constants.INTEGRATIONS_TOOL_KEY);
-    params.put("reportFormat", Arrays.asList(Constants.REPORT_FORMAT).toString());
+    params.put("reportFormat", Arrays.asList(Constants.REPORT_FORMAT));
     params.put("requestType", RquestTypeForJenkins);
     params.put("userTimeout", DEFAULT_REPORT_TIMEOUT);
     return params;
   }
 
-  private RequestBody createRequestBody(Map<String, String> params) {
+  private RequestBody createRequestBody(Map<String, Object> params) {
     Gson gson = new Gson();
     String json = gson.toJson(params);
     return RequestBody.create(MediaType.parse("application/json"), json);
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index b8630b5..66b5ea3 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -65,11 +65,9 @@ public void perform(Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launc
     Date buildTimestamp = new Date(build.getStartTimeInMillis());
 
     // Format the timestamp (e.g., YYYY-MM-DD HH:MM:SS)
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
-    String formattedTime = sdf.format(buildTimestamp);
+    long unixTimestamp = buildTimestamp.getTime() / 1000;
 
-    // Encode the timestamp to make it URL-safe
-    String buildCreatedAt = URLEncoder.encode(formattedTime, "UTF-8");
+    String buildCreatedAt = String.valueOf(unixTimestamp);
 
     build.addAction(new BrowserStackTestReportAction(build, credentials, browserStackBuildName,buildCreatedAt, logger));
 

From 19d18bbe6913b6f41324721772c806609bf2849a Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Sat, 24 May 2025 09:02:27 +0530
Subject: [PATCH 37/40] handling report available in case of retry failure

---
 .../integrationService/BrowserStackTestReportAction.java      | 4 +++-
 .../BrowserStackTestReportAction/index.jelly                  | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index 93a9a93..96f0dbf 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -81,7 +81,9 @@ private void fetchReport() {
       Response response = requestsUtil.makeRequest(reportUrl, credentials, createRequestBody(params));
       handleResponse(response);
     } catch (Exception e) {
-      handleFetchException(e);
+      if(!isReportTestAvailable()) {
+        handleFetchException(e);
+      }
     }
   }
 
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
index 9640056..0ea323f 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction/index.jelly
@@ -98,9 +98,6 @@
                 </j:if>
 
                 <j:if test="${(it.isReportAvailable())}">
-                    <j:if test="${(it.isReportTestAvailable())}" >
-                        <p class="no-report-para"><strong class="strong-font-custom">BrowserStack Build Test Report generation In Progress meanwhile these are the test listing...</strong></p>
-                    </j:if>
                     <div>
                         <j:out value="${it.getReportHtml()}"/>
                     </div>

From 5091706189472ae3fea807026d48b0c3b66fa0b8 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Tue, 27 May 2025 17:17:27 +0530
Subject: [PATCH 38/40] adding test available handling if next call fails

---
 .../BrowserStackTestReportAction.java                | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index 96f0dbf..eb21c68 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -108,11 +108,15 @@ private RequestBody createRequestBody(Map<String, Object> params) {
   private void handleResponse(Response response) throws Exception {
     if (response.isSuccessful()) {
       processSuccessfulResponse(response);
-    } else if (response.code() == 429) {
-      reportStatus = RATE_LIMIT;
     } else {
-      reportStatus = REPORT_FAILED;
-      logError(logger, "Non-success response while fetching report: " + response.code());
+      if(!isReportTestAvailable()) {
+        if (response.code() == 429) {
+          reportStatus = RATE_LIMIT;
+        } else {
+          reportStatus = REPORT_FAILED;
+          logError(logger, "Non-success response while fetching report: " + response.code());
+        }
+      }
     }
   }
 

From 76981eb46be81922ce10ac3534e5d1191c044c23 Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Tue, 24 Jun 2025 19:05:16 +0530
Subject: [PATCH 39/40] replacing old automate report with new Cad reports

---
 .../ci/common/constants/Constants.java        |  7 ++--
 .../BrowserStackTestReportAction.java         | 36 +++++++++++++++++--
 .../BrowserStackTestReportPublisher.java      | 12 +++----
 .../pipeline/BrowserStackReportStep.java      |  2 +-
 .../config.jelly                              |  4 ++-
 .../BrowserStackReportPublisher/config.jelly  |  4 ++-
 .../config.jelly                              |  2 +-
 7 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index fe7e6b8..e827003 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -19,10 +19,13 @@ public class Constants {
     public static  final String BROWSERSTACK_CONFIG_DETAILS_ENDPOINT = "/v1/builds/buildReport";
 
     public static final String INTEGRATIONS_TOOL_KEY = "jenkins";
-    public static  final String REPORT_FORMAT = "richHtml";
 
     public static final String BROWSERSTACK_TEST_REPORT_URL = "testReportBrowserStack";
-    public static final String BROWSERSTACK_CAD_REPORT_DISPLAY_NAME = "BrowserStack Build Test Reports";
+    public static final String BROWSERSTACK_CAD_REPORT_DISPLAY_NAME = "BrowserStack Test Report and Insights";
+    public static final String BROWSERSTACK_REPORT_FILENAME = "browserstack-report";
+    public static final String BROWSERSTACK_REPORT_FOLDER = "browserstack-artifacts";
+
+    public static final String BROWSERSTACK_REPORT_AUT_PIPELINE_FUNCTION = "browserStackReportAut";
 
     // Product
     public static final String AUTOMATE = "automate";
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
index eb21c68..6328e1f 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportAction.java
@@ -3,11 +3,16 @@
 import com.browserstack.automate.ci.common.constants.Constants;
 import com.browserstack.automate.ci.jenkins.BrowserStackCredentials;
 import com.google.gson.Gson;
+import hudson.EnvVars;
+import hudson.FilePath;
 import hudson.model.Action;
 import hudson.model.Run;
+import hudson.model.TaskListener;
+import hudson.tasks.ArtifactArchiver;
 import org.json.JSONObject;
 import okhttp3.*;
 
+import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -93,7 +98,7 @@ private Map<String, Object> createReportParams() {
     params.put("buildStartedAt", buildCreatedAt);
     params.put("originalBuildName", buildName);
     params.put("requestingCi", Constants.INTEGRATIONS_TOOL_KEY);
-    params.put("reportFormat", Arrays.asList(Constants.REPORT_FORMAT));
+    params.put("reportFormat", Arrays.asList("richHtml", "basicHtml"));
     params.put("requestType", RquestTypeForJenkins);
     params.put("userTimeout", DEFAULT_REPORT_TIMEOUT);
     return params;
@@ -148,6 +153,33 @@ private void setReportSuccess(JSONObject report) {
     reportStatus = SUCCESS_REPORT;
     reportHtml = report != null ? report.optString("richHtml", defaultHTML) : defaultHTML;
     reportStyle = report != null ? report.optString("richCss", "") : "";
+
+    try {
+      String basicHtml = report != null ? report.optString("basicHtml", defaultHTML) : defaultHTML;
+      String fullHtml = "<!DOCTYPE html> <html><head> <head>" + basicHtml + "</html>";
+
+      // Save the HTML content to a file in the workspace
+      FilePath workspace = new FilePath(run.getRootDir()).getParent();
+      ArtifactArchiver artifactArchiver = getArtifactArchiver(workspace, fullHtml);
+      artifactArchiver.perform(run, workspace, new EnvVars(), null, TaskListener.NULL);
+    } catch (Exception e) {
+      logError(logger, "Failed to save or archive report artifact: " + e.getMessage());
+    }
+  }
+
+  private static ArtifactArchiver getArtifactArchiver(FilePath workspace, String fullHtml) throws IOException, InterruptedException {
+    FilePath artifactsDir = new FilePath(workspace, Constants.BROWSERSTACK_REPORT_FOLDER);
+    artifactsDir.mkdirs();
+    String htmlFileName = Constants.BROWSERSTACK_REPORT_FILENAME + ".html";
+
+    FilePath htmlFile = new FilePath(artifactsDir, htmlFileName);
+
+    htmlFile.write(fullHtml, "UTF-8");
+    String artifactFilePath = Constants.BROWSERSTACK_REPORT_FOLDER + "/" + htmlFileName;
+    // Archive the file as an artifact
+    ArtifactArchiver artifactArchiver = new ArtifactArchiver(artifactFilePath);
+    artifactArchiver.setAllowEmptyArchive(false);
+    return artifactArchiver;
   }
 
   private void handleFetchException(Exception e) {
@@ -202,7 +234,7 @@ public String getIconFileName() {
 
   @Override
   public String getDisplayName() {
-    return Constants.BROWSERSTACK_CAD_REPORT_DISPLAY_NAME;
+    return Constants.BROWSERSTACK_REPORT_DISPLAY_NAME;
   }
 
   @Override
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
index 66b5ea3..9fa3ae9 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher.java
@@ -20,10 +20,9 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 
+import javax.annotation.CheckForNull;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
@@ -33,11 +32,11 @@
 
 public class BrowserStackTestReportPublisher extends Recorder implements SimpleBuildStep {
   private static final Logger LOGGER = Logger.getLogger(BrowserStackTestReportPublisher.class.getName());
-  private final Map<String, String> customEnvVars;
+  private Map<String, String> customEnvVars;
 
   @DataBoundConstructor
-  public BrowserStackTestReportPublisher(Map<String, String> customEnvVars) {
-    this.customEnvVars = customEnvVars != null && !customEnvVars.isEmpty() ? new ConcurrentHashMap<>(customEnvVars) : new ConcurrentHashMap<>();
+  public BrowserStackTestReportPublisher(@CheckForNull String product) {
+    this.customEnvVars =  new ConcurrentHashMap<>();
   }
 
   @Override
@@ -83,7 +82,7 @@ public BuildStepMonitor getRequiredMonitorService() {
     return BuildStepMonitor.NONE;
   }
 
-  @Symbol("browserStackBuildTestReports")
+  @Symbol(Constants.BROWSERSTACK_REPORT_PIPELINE_FUNCTION)
   @Extension
   public static final class DescriptorImpl extends BuildStepDescriptor<Publisher> {
 
@@ -93,7 +92,6 @@ public boolean isApplicable(Class<? extends AbstractProject> aClass) {
       // indicates that this builder can be used with all kinds of project types
       return true;
     }
-
     @Override
     public String getDisplayName() {
       return Constants.BROWSERSTACK_CAD_REPORT_DISPLAY_NAME;
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackReportStep.java b/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackReportStep.java
index 670e688..5c88cb6 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackReportStep.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackReportStep.java
@@ -47,7 +47,7 @@ public Set<? extends Class<?>> getRequiredContext() {
 
         @Override
         public String getFunctionName() {
-            return Constants.BROWSERSTACK_REPORT_PIPELINE_FUNCTION;
+            return Constants.BROWSERSTACK_REPORT_AUT_PIPELINE_FUNCTION ; // deprecated Constants.BROWSERSTACK_REPORT_PIPELINE_FUNCTION;
         }
 
         @Override
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/BrowserStackCypressReportPublisher/config.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/BrowserStackCypressReportPublisher/config.jelly
index ab7b894..b85648a 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/BrowserStackCypressReportPublisher/config.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/BrowserStackCypressReportPublisher/config.jelly
@@ -1,4 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
-    This step will generate BrowserStack Cypress Test Report by utilising the build name from the environment variable BROWSERSTACK_BUILD_NAME set by the BrowserStack plugin
+    This step will generate BrowserStack Cypress Test Report by utilising the build name from the environment variable BROWSERSTACK_BUILD_NAME set by the BrowserStack plugin.
+    <br/>
+    ⚠️ Note: This post-build action is deprecated and will no longer be supported in future releases. To continue generating test reports, please use the new BrowserStack Test Report and Insights post-build action.
 </j:jelly>
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/BrowserStackReportPublisher/config.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/BrowserStackReportPublisher/config.jelly
index a2a8325..6bd3e9e 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/BrowserStackReportPublisher/config.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/BrowserStackReportPublisher/config.jelly
@@ -1,4 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
-    This step will generate BrowserStack Test Report by utilising the build name from the environment variable BROWSERSTACK_BUILD_NAME set by the BrowserStack plugin
+    This step will generate BrowserStack Test Report by utilising the build name from the environment variable BROWSERSTACK_BUILD_NAME set by the BrowserStack plugin.
+    <br/>
+    ⚠️ Note: This post-build action is deprecated and will no longer be supported in future releases. To continue generating test reports, please use the new BrowserStack Test Report and Insights post-build action.
 </j:jelly>
diff --git a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher/config.jelly b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher/config.jelly
index a2a8325..ffd0090 100644
--- a/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher/config.jelly
+++ b/src/main/resources/com/browserstack/automate/ci/jenkins/integrationService/BrowserStackTestReportPublisher/config.jelly
@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
-    This step will generate BrowserStack Test Report by utilising the build name from the environment variable BROWSERSTACK_BUILD_NAME set by the BrowserStack plugin
+    This step will generate BrowserStack Test Report and Insights by using the build name from the environment variable BROWSERSTACK_BUILD_NAME set by the BrowserStack plugin
 </j:jelly>

From 162fd1e01f8c9b8d59fa98ce73ae66810473292d Mon Sep 17 00:00:00 2001
From: shandli123 <shandlikamal248@gmail.com>
Date: Tue, 24 Jun 2025 19:08:27 +0530
Subject: [PATCH 40/40] updating version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b331561..7bea2db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.17-SNAPSHOT</version>
+  <version>1.2.18-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>