From c3d58a9c09d4be6551956fbdd5edfe817a25ec8d Mon Sep 17 00:00:00 2001 From: Alex Metelytsia Date: Thu, 1 Jun 2023 09:02:23 +0100 Subject: [PATCH 1/4] Bump chromedriver version up to 114.0.5735.90 (#1047) --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index c239e1557..ddf9173c0 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 cd6c0880f..052173b4b 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 8c93c1deb..e9d6712b0 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 9ba30ae3b..ae29de8ed 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 45ea3c745..4fb1d62f3 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 From f543f2efd0ca8fcc87116caf5a08e73934035447 Mon Sep 17 00:00:00 2001 From: Dariusz Mika Date: Thu, 1 Jun 2023 10:55:38 +0200 Subject: [PATCH 2/4] Return empty string for node ip if node id is SERVER --- app/util/api/confluence_clients.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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): From 6dacf694234a464495bca2c153b92e10c4e8b766 Mon Sep 17 00:00:00 2001 From: Dariusz Mika Date: Thu, 1 Jun 2023 11:15:21 +0200 Subject: [PATCH 3/4] Turn on analytics --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/crowd.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index ddf9173c0..2ff62cfa7 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.3 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. # Action percentage for JMeter load executor view_all_builds: 15 view_build_result: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 052173b4b..9e3495c6a 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.3 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. services: - module: shellexec prepare: diff --git a/app/confluence.yml b/app/confluence.yml index e9d6712b0..d80d0cd02 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.3 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. # Action percentage for JMeter and Locust load executors extended_metrics: False view_page: 33 diff --git a/app/crowd.yml b/app/crowd.yml index 9ab60e7cc..992736743 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.4.3 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. services: - module: shellexec prepare: diff --git a/app/jira.yml b/app/jira.yml index ae29de8ed..b21d24016 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.3 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. # Action percentage for Jmeter and Locust load executors create_issue: 4 search_jql: 11 diff --git a/app/jsm.yml b/app/jsm.yml index 4fb1d62f3..5d9ad18e2 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.3 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 agent_view_request: 24 From dcdc234aab0fd4f2a3626171b15792f3c91d57d4 Mon Sep 17 00:00:00 2001 From: Dariusz Mika Date: Thu, 1 Jun 2023 11:15:44 +0200 Subject: [PATCH 4/4] Change toolkit version to 7.4.1 --- app/util/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/conf.py b/app/util/conf.py index db0c93623..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.5.0' +TOOLKIT_VERSION = '7.4.1' UNSUPPORTED_VERSION = '6.3.0'