diff --git a/app/bamboo.yml b/app/bamboo.yml index d7f1d0a5f..2ff62cfa7 100644 --- 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 index 80dcb5fd7..9e3495c6a 100644 --- 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 index 92077bd35..d80d0cd02 100644 --- 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 index 4ebe36de8..b21d24016 100644 --- 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 index 7f0524f2c..5d9ad18e2 100644 --- 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 index 23695597d..82b50dd88 100644 --- 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 index 31dbfae2c..a021d4995 100644 --- 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'