fix: iframe url when another build was running.

jenkinsci · Apr 25, 2024 · b02823d · b02823d
1 parent 04c951c
commit b02823d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.16.3] - 2024-04-25
+### Fixed
+- Fixed incorrect batch id when starting a new run and looking at older runs [Trello 3273](https://trello.com/c/GFvXy9jP) 
+
 ## [1.16] - 2024-03-07
 ### Added
 - Added support for Eyes SCM integration [Trello 3273](https://trello.com/c/GFvXy9jP)

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>applitools-eyes</artifactId>
-    <version>1.16.2</version>
+    <version>1.16.3</version>
     <packaging>hpi</packaging>
     <name>Applitools Eyes Plugin</name>
     <url>https://github.com/jenkinsci/applitools-eyes-plugin</url>
@@ -33,7 +33,7 @@
         <gitHubRepo>jenkinsci/applitools-eyes-plugin</gitHubRepo>
         <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
         <!-- Recommended version: https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <jenkins.version>2.414.3</jenkins.version>
+        <jenkins.version>2.440.2</jenkins.version>
         <!-- <= 1.71 vulnerable: https://www.jenkins.io/security/advisory/2019-03-06/#SECURITY-1342 -->
         <plugins.job-dsl.version>1.72</plugins.job-dsl.version>
         <version>${project.version}</version>

diff --git a/src/main/java/com/applitools/jenkins/ApplitoolsStatusDisplayAction.java b/src/main/java/com/applitools/jenkins/ApplitoolsStatusDisplayAction.java
@@ -92,16 +92,19 @@ public static String generateBatchId(Map<String, String> env, String projectName
                     applitoolsValuesFromArtifacts.containsKey(ApplitoolsEnvironmentUtil.APPLITOOLS_BATCH_ID)) {
                 return applitoolsValuesFromArtifacts.get(ApplitoolsEnvironmentUtil.APPLITOOLS_BATCH_ID);
             } else if (env != null) {
-                String batchId = env.get("APPLITOOLS_BATCH_ID");
-                if (batchId != null) {
-                    ApplitoolsBuildWrapper.isCustomBatchId = true;
-                    if (isCustom != null) {
-                        isCustom.setValue(true);
-                        if (applitoolsValuesFromArtifacts != null) {
-                            applitoolsValuesFromArtifacts.put(ApplitoolsEnvironmentUtil.APPLITOOLS_BATCH_ID, batchId);
+                String buildNumberFromEnv = env.get("BUILD_NUMBER");
+                if (("" + buildNumber).equals(buildNumberFromEnv)) {
+                    String batchId = env.get("APPLITOOLS_BATCH_ID");
+                    if (batchId != null) {
+                        ApplitoolsBuildWrapper.isCustomBatchId = true;
+                        if (isCustom != null) {
+                            isCustom.setValue(true);
+                            if (applitoolsValuesFromArtifacts != null) {
+                                applitoolsValuesFromArtifacts.put(ApplitoolsEnvironmentUtil.APPLITOOLS_BATCH_ID, batchId);
+                            }
                         }
+                        return batchId;
                     }
-                    return batchId;
                 }
             }
         }