Merge pull request #1049 from atlassian/release/7.4.1

Release/7.4.1
atlassian · Jun 1, 2023 · 625dd22 · 625dd22
2 parents 99e302e + 51e746f
commit 625dd22
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/app/bamboo.yml b/app/bamboo.yml
@@ -123,7 +123,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "113.0.5672.63" # Supports Chrome version 113. You can refer to http://chromedriver.chromium.org/downloads
+      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/bitbucket.yml b/app/bitbucket.yml
@@ -90,7 +90,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "113.0.5672.63" # Supports Chrome version 113. You can refer to http://chromedriver.chromium.org/downloads
+      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/confluence.yml b/app/confluence.yml
@@ -117,7 +117,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "113.0.5672.63" # Supports Chrome version 113. You can refer to http://chromedriver.chromium.org/downloads
+      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml

diff --git a/app/jira.yml b/app/jira.yml
@@ -118,7 +118,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "113.0.5672.63" # Supports Chrome version 113. You can refer to http://chromedriver.chromium.org/downloads
+      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml
diff --git a/app/jsm.yml b/app/jsm.yml
@@ -170,7 +170,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "113.0.5672.63" # Supports Chrome version 113. You can refer to http://chromedriver.chromium.org/downloads
+      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
   - data-source: sample-labels
     module: junit-xml
diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py
@@ -195,11 +195,14 @@ def get_deployment_type(self):
         return 'other'
 
     def get_node_ip(self, node_id: str) -> str:
-        return self.get(
-            url=f"{self.host}/rest/zdu/nodes/{node_id}",
-            expected_status_codes=[200],
-            error_msg=f"Cannot get {node_id} node IP",
-        ).json().get("ipAddress")
+        if node_id != "SERVER":
+            return self.get(
+                url=f"{self.host}/rest/zdu/nodes/{node_id}",
+                expected_status_codes=[200],
+                error_msg=f"Cannot get {node_id} node IP",
+            ).json().get("ipAddress")
+        else:
+            return ""
 
 
 class ConfluenceRpcClient(Client):

diff --git a/app/util/conf.py b/app/util/conf.py
@@ -2,7 +2,7 @@
 
 from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML
 
-TOOLKIT_VERSION = '7.4.0'
+TOOLKIT_VERSION = '7.4.1'
 UNSUPPORTED_VERSION = '6.3.0'