From 45fce1650d8b6fc04c51f2603f8fd2405132f014 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Wed, 15 Jun 2022 10:55:38 +0300 Subject: [PATCH 01/20] update from master --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/crowd.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- app/util/conf.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 8769e161c..a0305c547 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 LANGUAGE: en_US.utf8 - 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. + 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. # 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 92e98c90c..c0b97dcd4 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 LANGUAGE: en_US.utf8 - 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. + 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. services: - module: shellexec prepare: diff --git a/app/confluence.yml b/app/confluence.yml index e4df32a1b..a75a2fd3f 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 LANGUAGE: en_US.utf8 - 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. + 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. # Action percentage for JMeter and Locust load executors view_page: 46 view_dashboard: 8 diff --git a/app/crowd.yml b/app/crowd.yml index 87997b4af..83dd4c94a 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.4.2 LANGUAGE: en_US.utf8 - 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. + 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. services: - module: shellexec prepare: diff --git a/app/jira.yml b/app/jira.yml index a090ba09c..b3a596167 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 LANGUAGE: en_US.utf8 - 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. + 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. # 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 9806c8165..152e4614c 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 LANGUAGE: en_US.utf8 - 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. + 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. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 agent_view_request: 24 diff --git a/app/util/conf.py b/app/util/conf.py index c52d1d4e1..e8419c2ec 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 = '6.2.2' +TOOLKIT_VERSION = '7.0.0' UNSUPPORTED_VERSION = '5.0.0' From 6b9d580c01973db4d1f0e709569b61ae6ed36d14 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 23 Jun 2022 11:16:40 +0300 Subject: [PATCH 02/20] bump chromedriver version to 103 --- 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 a0305c547..ace18daa1 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "102.0.5005.61" # Supports Chrome version 102. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.53" # Supports Chrome version 103. You can refer to http://chromedriver.chromium.org/downloads reporting: - data-source: sample-labels module: junit-xml \ No newline at end of file diff --git a/app/bitbucket.yml b/app/bitbucket.yml index c0b97dcd4..0b0a6c4a9 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -90,7 +90,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "102.0.5005.61" # Supports Chrome version 102. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.53" # Supports Chrome version 103. 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 a75a2fd3f..5b092988e 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "102.0.5005.61" # Supports Chrome version 102. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.53" # Supports Chrome version 103. 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 b3a596167..1e83eacd1 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "102.0.5005.61" # Supports Chrome version 102. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.53" # Supports Chrome version 103. 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 152e4614c..2336bea55 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -170,7 +170,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "102.0.5005.61" # Supports Chrome version 102. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.53" # Supports Chrome version 103. You can refer to http://chromedriver.chromium.org/downloads reporting: - data-source: sample-labels module: junit-xml \ No newline at end of file From 53a517e65cd888372af0e877bf01c45284f1378d Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Wed, 29 Jun 2022 16:17:41 +0300 Subject: [PATCH 03/20] jira/8.13 eol (#848) --- README.md | 4 ++-- app/util/jira/populate_db.sh | 4 ++-- app/util/jira/upload_attachments.sh | 4 ++-- docs/dc-apps-performance-toolkit-user-guide-jira.md | 4 ++-- docs/dc-apps-performance-toolkit-user-guide-jsm.md | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 530ffe271..3740d7849 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat ## Supported versions * Supported Jira versions: - * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.13.20`, `8.20.8` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.20.10` * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.13.20`, `4.20.8` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.10` * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.7`, `7.4.17` diff --git a/app/util/jira/populate_db.sh b/app/util/jira/populate_db.sh index 5f08d2745..dbf35b18b 100644 --- a/app/util/jira/populate_db.sh +++ b/app/util/jira/populate_db.sh @@ -47,8 +47,8 @@ JIRA_DB_PASS="Password1!" # Jira/JSM supported versions -SUPPORTED_JIRA_VERSIONS=(8.13.20 8.20.8) -SUPPORTED_JSM_VERSIONS=(4.13.20 4.20.8) +SUPPORTED_JIRA_VERSIONS=(8.20.10) +SUPPORTED_JSM_VERSIONS=(4.20.10) SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") diff --git a/app/util/jira/upload_attachments.sh b/app/util/jira/upload_attachments.sh index 801d93059..721e873f4 100644 --- a/app/util/jira/upload_attachments.sh +++ b/app/util/jira/upload_attachments.sh @@ -30,8 +30,8 @@ JIRA_VERSION_FILE="/media/atl/jira/shared/jira-software.version" # Jira/JSM supported versions -SUPPORTED_JIRA_VERSIONS=(8.13.20 8.20.8) -SUPPORTED_JSM_VERSIONS=(4.13.20 4.20.8) +SUPPORTED_JIRA_VERSIONS=(8.20.10) +SUPPORTED_JSM_VERSIONS=(4.20.10) SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 9a2206670..1e2a645bf 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -66,7 +66,7 @@ All important parameters are listed and described in this section. For all other | Parameter | Recommended value | | --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Jira Product | Software | -| Version | The Data Center App Performance Toolkit officially supports `8.13.20`, `8.20.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Version | The Data Center App Performance Toolkit officially supports `8.20.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** @@ -387,7 +387,7 @@ All important parameters are listed and described in this section. For all other | Parameter | Recommended Value | | --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Jira Product | Software | -| Version | The Data Center App Performance Toolkit officially supports `8.13.20`, `8.20.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Version | The Data Center App Performance Toolkit officially supports `8.20.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 3a9f57e05..e5c7e89c6 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -71,7 +71,7 @@ All important parameters are listed and described in this section. For all other | Parameter | Recommended value | | --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Jira Product | ServiceManagement | -| Version | The Data Center App Performance Toolkit officially supports `4.13.20`, `4.20.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Version | The Data Center App Performance Toolkit officially supports `4.20.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** @@ -551,7 +551,7 @@ All important parameters are listed and described in this section. For all other | Parameter | Recommended Value | | --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Jira Product | ServiceManagement | -| Version | The Data Center App Performance Toolkit officially supports `4.13.20`, `4.20.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Version | The Data Center App Performance Toolkit officially supports `4.20.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** From 0083a1fc23e188109e9904e48021fab475ba55ed Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Wed, 29 Jun 2022 16:21:12 +0300 Subject: [PATCH 04/20] Available processors check - fix (#847) * fix of available processors check * fix * fix of get_nodes function * fix after review * fix of get_available_processors action --- app/util/api/confluence_clients.py | 15 ++++++++++----- app/util/api/jira_clients.py | 17 +++++++++++------ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py index 85acfc890..987966aa4 100644 --- a/app/util/api/confluence_clients.py +++ b/app/util/api/confluence_clients.py @@ -138,11 +138,16 @@ def get_confluence_nodes(self): return nodes def get_available_processors(self): - node_id = self.get_confluence_nodes()[0] - api_url = f'{self.host}/rest/atlassian-cluster-monitoring/cluster/suppliers/data/com.atlassian.cluster' \ - f'.monitoring.cluster-monitoring-plugin/runtime-information/{node_id}' - response = self.get(api_url, "Could not get Available Processors information") - return response.json()['data']['rows']['availableProcessors'][1] + try: + node_id = self.get_confluence_nodes()[0] + api_url = f'{self.host}/rest/atlassian-cluster-monitoring/cluster/suppliers/data/com.atlassian.cluster' \ + f'.monitoring.cluster-monitoring-plugin/runtime-information/{node_id}' + response = self.get(api_url, "Could not get Available Processors information") + processors = response.json()['data']['rows']['availableProcessors'][1] + except Exception as e: + print(f"Warning: Could not get Available Processors information. Error: {e}") + return 'N/A' + return processors def get_total_pages_count(self): api_url = f"{self.host}/rest/api/search?cql=type=page" diff --git a/app/util/api/jira_clients.py b/app/util/api/jira_clients.py index c5f2eb4e6..747223de4 100644 --- a/app/util/api/jira_clients.py +++ b/app/util/api/jira_clients.py @@ -177,7 +177,7 @@ def get_nodes(self): response = self.get(api_url, 'Could not get Jira nodes count', expected_status_codes=[200, 405]) if response.status_code == 405 and 'This Jira instance is not clustered' in response.text: return 'Server' - nodes = [node['nodeId'] if node['state'] == "ACTIVE" and node['alive'] else 0 for node in response.json()] + nodes = [node['nodeId'] for node in response.json() if node['state'] == "ACTIVE" and node['alive']] return nodes def get_system_info_page(self): @@ -205,11 +205,16 @@ def get_system_info_page(self): return system_info_html def get_available_processors(self): - node_id = self.get_nodes()[0] - api_url = f'{self.host}/rest/atlassian-cluster-monitoring/cluster/suppliers/data/com.atlassian.cluster' \ - f'.monitoring.cluster-monitoring-plugin/runtime-information/{node_id}' - response = self.get(api_url, "Could not get Available Processors information") - return response.json()['data']['rows']['availableProcessors'][1] + try: + node_id = self.get_nodes()[0] + api_url = f'{self.host}/rest/atlassian-cluster-monitoring/cluster/suppliers/data/com.atlassian.cluster' \ + f'.monitoring.cluster-monitoring-plugin/runtime-information/{node_id}' + response = self.get(api_url, "Could not get Available Processors information") + processors = response.json()['data']['rows']['availableProcessors'][1] + except Exception as e: + print(f"Warning: Could not get Available Processors information. Error: {e}") + return 'N/A' + return processors def get_locale(self): api_url = f'{self.host}/rest/api/2/myself' From 1f8098cbbdae4c45c1f33d5da778acd358be3a94 Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Mon, 18 Jul 2022 17:03:32 +0300 Subject: [PATCH 05/20] Add check: deployment type (#844) * Added check and analytics of the deployment type * small fix analytics.py * Changes after review * small fix after review * deleted not needed imports --- app/util/analytics/analytics.py | 5 ++++- app/util/analytics/analytics_utils.py | 1 + app/util/analytics/application_info.py | 4 ++++ app/util/api/bamboo_clients.py | 6 ++++++ app/util/api/bitbucket_clients.py | 7 +++++++ app/util/api/confluence_clients.py | 19 ++++++++++++++++++ app/util/api/jira_clients.py | 27 +++++++++++--------------- 7 files changed, 52 insertions(+), 17 deletions(-) diff --git a/app/util/analytics/analytics.py b/app/util/analytics/analytics.py index 6827ae959..0d0488aa1 100644 --- a/app/util/analytics/analytics.py +++ b/app/util/analytics/analytics.py @@ -53,6 +53,7 @@ def __init__(self, application: BaseApplication): self.application_version = application.version self.nodes_count = application.nodes_count self.dataset_information = application.dataset_information + self.deployment = application.deployment if self.app_type != CROWD: self.processors = application.processors # JSM(INSIGHT) app type has additional concurrency fields: concurrency_agents, concurrency_customers @@ -68,6 +69,7 @@ def __init__(self, application: BaseApplication): self.crowd_sync_test = get_crowd_sync_test_results(bzt_log) self.ramp_up = application.config.ramp_up self.total_actions_per_hour = application.config.total_actions_per_hour + self.deployment = 'other' if self.app_type == BAMBOO: self.parallel_plans_count = application.config.parallel_plans_count self.locust_log = LocustFileReader() @@ -214,7 +216,8 @@ def send_analytics(collector: AnalyticsCollector): "selenium_test_rates": collector.selenium_test_rates, "jmeter_test_rates": collector.jmeter_test_rates, "locust_test_rates": collector.locust_test_rates, - "concurrency": collector.concurrency + "concurrency": collector.concurrency, + "deployment": collector.deployment } r = requests.post(url=f'{BASE_URL}', json=payload, headers=headers) print(r.json()) diff --git a/app/util/analytics/analytics_utils.py b/app/util/analytics/analytics_utils.py index 49bc49eea..ee3df57d6 100644 --- a/app/util/analytics/analytics_utils.py +++ b/app/util/analytics/analytics_utils.py @@ -83,6 +83,7 @@ def generate_report_summary(collector): summary_report.append(f'Application nodes count|{collector.nodes_count}') if not collector.app_type == CROWD: summary_report.append(f'Available Processors|{collector.processors}') + summary_report.append(f'Deployment|{collector.deployment}') summary_report.append(f'Concurrency|{collector.concurrency}') summary_report.append(f'Expected test run duration from yml file|{collector.duration} sec') summary_report.append(f'Actual test run duration|{collector.actual_duration} sec') diff --git a/app/util/analytics/application_info.py b/app/util/analytics/application_info.py index f4b2a436f..f13ac54d9 100644 --- a/app/util/analytics/application_info.py +++ b/app/util/analytics/application_info.py @@ -55,6 +55,10 @@ def locust_default_actions(self): def processors(self): return self.client.get_available_processors() + @property + def deployment(self): + return self.client.get_deployment_type() + class Jira(BaseApplication): type = JIRA diff --git a/app/util/api/bamboo_clients.py b/app/util/api/bamboo_clients.py index feb513743..6311df673 100644 --- a/app/util/api/bamboo_clients.py +++ b/app/util/api/bamboo_clients.py @@ -172,3 +172,9 @@ def get_nodes_count(self): r = self.get(f'{self.host}/rest/api/latest/server/nodes', error_msg="Could not get Bamboo nodes count") return len(r.json()["nodeStatuses"]) + def get_deployment_type(self): + bamboo_system_info_html = self._session.get(f'{self.host}/admin/systemInfo.action').content.decode("utf-8") + html_pattern = 'com.atlassian.dcapt.deployment=terraform' + if bamboo_system_info_html.count(html_pattern): + return 'terraform' + return 'other' diff --git a/app/util/api/bitbucket_clients.py b/app/util/api/bitbucket_clients.py index 695ff040a..94e1a640b 100644 --- a/app/util/api/bitbucket_clients.py +++ b/app/util/api/bitbucket_clients.py @@ -196,3 +196,10 @@ def get_user_global_permissions(self, user=''): api_url = f'{self.host}/rest/api/1.0/admin/permissions/users?filter={user}' response = self.get(api_url, "Could not get user global permissions") return response.json() + + def get_deployment_type(self): + html_pattern = 'com.atlassian.dcapt.deployment=terraform' + bitbucket_system_page = self.get_bitbucket_system_page().content.decode("utf-8") + if bitbucket_system_page.count(html_pattern): + return 'terraform' + return 'other' diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py index 987966aa4..48b3aa753 100644 --- a/app/util/api/confluence_clients.py +++ b/app/util/api/confluence_clients.py @@ -175,6 +175,25 @@ def get_groups_membership(self, username): groups = [group['name'] for group in response.json()['results']] return groups + def get_system_info_page(self): + login_url = f'{self.host}/dologin.action' + auth_url = f'{self.host}/doauthenticate.action' + auth_body = { + 'destination': '/admin/systeminfo.action', + 'authenticate': 'Confirm', + 'password': self.password + } + self.post(url=login_url, error_msg='Could not get login in') + system_info_html = self._session.post(url=auth_url, data=auth_body) + return system_info_html.content.decode("utf-8") + + def get_deployment_type(self): + html_pattern = 'com.atlassian.dcapt.deployment=terraform' + confluence_system_page = self.get_system_info_page() + if confluence_system_page.count(html_pattern): + return 'terraform' + return 'other' + class ConfluenceRpcClient(Client): diff --git a/app/util/api/jira_clients.py b/app/util/api/jira_clients.py index 747223de4..9de28fca4 100644 --- a/app/util/api/jira_clients.py +++ b/app/util/api/jira_clients.py @@ -1,6 +1,6 @@ from selenium.common.exceptions import WebDriverException -from util.api.abstract_clients import RestClient, LOGIN_POST_HEADERS, JSM_EXPERIMENTAL_HEADERS +from util.api.abstract_clients import RestClient, JSM_EXPERIMENTAL_HEADERS from selenium_ui.conftest import retry BATCH_SIZE_BOARDS = 1000 @@ -181,28 +181,16 @@ def get_nodes(self): return nodes def get_system_info_page(self): - session = self._session login_url = f'{self.host}/login.jsp' auth_url = f'{self.host}/secure/admin/WebSudoAuthenticate.jspa' - login_body = { - 'atl_token': '', - 'os_destination': '/secure/admin/ViewSystemInfo.jspa', - 'os_password': self.password, - 'os_username': self.user, - 'user_role': 'ADMIN' - } auth_body = { 'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa', 'webSudoIsPost': False, 'webSudoPassword': self.password } - headers = LOGIN_POST_HEADERS - headers['Origin'] = self.host - - session.post(url=login_url, data=login_body, headers=headers) - auth_request = session.post(url=auth_url, data=auth_body, headers=headers) - system_info_html = auth_request.content.decode("utf-8") - return system_info_html + self.post(login_url, error_msg='Could not login in') + system_info_html = self._session.post(auth_url, data=auth_body) + return system_info_html.content.decode("utf-8") def get_available_processors(self): try: @@ -248,3 +236,10 @@ def get_service_desk_info(self): api_url = f'{self.host}/rest/plugins/applications/1.0/installed/jira-servicedesk' service_desk_info = self.get(api_url, "Could not retrieve JSM info", headers=JSM_EXPERIMENTAL_HEADERS) return service_desk_info.json() + + def get_deployment_type(self): + html_pattern = 'com.atlassian.dcapt.deployment=terraform' + jira_system_page = self.get_system_info_page() + if jira_system_page.count(html_pattern): + return 'terraform' + return 'other' From 7d77d3d804ddc8ccd5f88398fc810959a7cf3885 Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Mon, 18 Jul 2022 17:04:10 +0300 Subject: [PATCH 06/20] Fix jsm_prepare_data.py script for view_queue_actions (#849) * fix of jsm_prepare_data.py for view_queue_actions * fix after testing * fix after review * fix comment * small naming fix * fix of handling Errors and their messages * fix after review --- app/util/data_preparation/jsm_prepare_data.py | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/app/util/data_preparation/jsm_prepare_data.py b/app/util/data_preparation/jsm_prepare_data.py index 01bf2b502..0716a97ad 100644 --- a/app/util/data_preparation/jsm_prepare_data.py +++ b/app/util/data_preparation/jsm_prepare_data.py @@ -397,13 +397,31 @@ def __get_insight_issues(jira_api): @print_timing("Getting all service desks") -def __get_all_service_desks_and_validate(jsm_client): - service_desks = jsm_client.get_all_service_desks() - if not service_desks: +def __get_all_service_desks_and_validate(jira_api, jsm_client): + all_service_desks = jsm_client.get_all_service_desks() + if not all_service_desks: raise Exception('ERROR: There were no Jira Service Desks found') + try: + issues_with_insight = jira_api.issues_search(jql='Insight is not EMPTY', max_results=10000) + except Exception as e: + print(f'There were no Insight issues found. {e}') + + issues_with_insight = [] + project_keys_with_insight = [f"{service_desk_issues['key'].split('-')[0]}" + for service_desk_issues + in issues_with_insight] + if JSM_SETTINGS.insight: + # service desks with insight issues + service_desks = [service_desk for service_desk in all_service_desks if service_desk["projectKey"] + in project_keys_with_insight] + else: + # without insight issues + service_desks = [service_desk for service_desk in all_service_desks if service_desk["projectKey"] + not in project_keys_with_insight] if len(service_desks) < 2: + if JSM_SETTINGS.insight: + raise Exception('ERROR: At least 2 service desks with Insight issues are needed') raise Exception('ERROR: At least 2 service desks are needed') - return service_desks @@ -429,7 +447,7 @@ def __get_issues_by_project_keys(jira_client, jsm_client, project_keys): def __create_data_set(jira_client, jsm_client): - service_desks = __get_all_service_desks_and_validate(jsm_client) + service_desks = __get_all_service_desks_and_validate(jira_client, jsm_client) dataset = dict() dataset[AGENTS] = __get_agents(jira_client) dataset[CUSTOMERS] = __get_customers(jira_client, jsm_client) From 74bbf00aa540e19b30fcd8b9fb26dcc051584c44 Mon Sep 17 00:00:00 2001 From: Alex Metelytsia Date: Fri, 22 Jul 2022 14:37:36 +0300 Subject: [PATCH 07/20] docs improvement (#851) --- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 073fb52c2..d5f88b609 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2022-05-10" +date: "2022-07-22" --- # Data Center App Performance Toolkit User Guide For Bamboo @@ -36,9 +36,7 @@ specifically for performance testing during the DC app review process. 1. Read [requirements](https://atlassian-labs.github.io/data-center-terraform/userguide/PREREQUISITES/#requirements) section of the official documentation. -2. Set up [Terraform](https://www.terraform.io/), [Helm](https://helm.sh/), [AWS CLI](https://aws.amazon.com/cli/) - and [`kubectl`](https://kubernetes.io/docs/tasks/tools/#kubectl) as per - [Environment setup guide](https://atlassian-labs.github.io/data-center-terraform/userguide/PREREQUISITES/#environment-setup). +2. Set up [environment](https://atlassian-labs.github.io/data-center-terraform/userguide/PREREQUISITES/#environment-setup). 3. Set up [AWS security credentials](https://atlassian-labs.github.io/data-center-terraform/userguide/INSTALLATION/#1-set-up-aws-security-credentials). 4. Clone the project repo: ```bash From 04d13b08e6317a4b63278cba917b610ed3253d73 Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Fri, 22 Jul 2022 14:38:29 +0300 Subject: [PATCH 08/20] Deleted selenium view_random_queue_action (#850) * deleted selenium_view_random_queue action * jsm_prepare_data script with fix added * fix * changing back jsm_prepare_data.py script after check * Deleted not used import and locators --- app/selenium_ui/jsm/modules_agents.py | 6 ------ app/selenium_ui/jsm/pages/agent_pages.py | 12 ------------ app/selenium_ui/jsm/pages/agent_selectors.py | 15 +++------------ app/util/default_test_actions.json | 2 -- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/app/selenium_ui/jsm/modules_agents.py b/app/selenium_ui/jsm/modules_agents.py index 1275d6ba4..1835c295e 100644 --- a/app/selenium_ui/jsm/modules_agents.py +++ b/app/selenium_ui/jsm/modules_agents.py @@ -168,12 +168,6 @@ def sub_measure(): sub_measure() - @print_timing(f'selenium_agent_view_queues_{project_size}_project:random_choice_queue') - def sub_measure(): - browse_queue_page.get_random_queue() - - sub_measure() - measure() diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index 11a02af47..7b799a462 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -1,5 +1,3 @@ -import random - from selenium_ui.base_page import BasePage from selenium.webdriver.common.keys import Keys from selenium_ui.jsm.pages.agent_selectors import LoginPageLocators, PopupLocators, DashboardLocators, LogoutLocators, \ @@ -189,16 +187,6 @@ def wait_for_page_loaded(self): self.wait_until_any_ec_presented( selectors=[ViewQueueLocators.queues_status, ViewQueueLocators.queue_is_empty], timeout=self.timeout) - def get_random_queue(self): - if not self.get_elements(ViewQueueLocators.queue_is_empty): - queues = self.get_elements(ViewQueueLocators.queues) - random_queue = random.choice([queue for queue in queues - if queue.text.partition('\n')[0] not in - ['All open', 'Recently resolved', 'Resolved past 7 days'] - and queue.text.partition('\n')[2] != '0']) - random_queue.click() - self.wait_until_present(ViewQueueLocators.queues_status, timeout=self.timeout) - class InsightLogin(BasePage): diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index e2b622252..b8426e860 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -87,7 +87,6 @@ class LoginPageLocators: class DashboardLocators: dashboard_url = UrlManager().dashboard_url() - dashboard_params = UrlManager().dashboard_params dashboard_window = (By.CLASS_NAME, "page-type-dashboard") @@ -117,19 +116,11 @@ class ViewCustomerRequestLocators: class ViewReportsLocators: - # locators to click - workload = (By.XPATH, "//span[contains(text(),'Workload')]") - time_to_resolution = (By.XPATH, "//span[contains(text(),'Time to resolution')]") - created_vs_resolved = (By.XPATH, "//span[contains(text(),'Created vs Resolved')]") - - # wait until visible locators - reports_nav = (By.ID, "pinnednav-opts-sd-reports-nav") custom_report_content = (By.CSS_SELECTOR, "#sd-report-content .js-report-graph.sd-graph-container") team_workload_agents_table = (By.CSS_SELECTOR, ".js-page-panel-content.sd-page-panel-content .aui.sd-agents-table") class ViewQueueLocators: - queues = (By.CSS_SELECTOR, "#pinnednav-opts-sd-queues-nav li") queues_status = (By.XPATH, "//span[contains(text(),'Status')]") queue_is_empty = (By.CSS_SELECTOR, '.sd-queue-empty') @@ -145,7 +136,7 @@ class InsightNewSchemaLocators: @staticmethod def get_new_object_schema_name_locator(name): - return (By.XPATH, f"//a[contains(text(),'{name}')]") + return By.XPATH, f"//a[contains(text(),'{name}')]" class InsightDeleteSchemaLocators: @@ -155,11 +146,11 @@ class InsightDeleteSchemaLocators: @staticmethod def new_object_schema_id_locator(schema_id): - return (By.CSS_SELECTOR, f"a[aria-owns='rlabs-actions-{schema_id}") + return By.CSS_SELECTOR, f"a[aria-owns='rlabs-actions-{schema_id}" @staticmethod def new_object_schema_delete_button_locator(name): - return (By.ID, f"object-schema-delete-{name}") + return By.ID, f"object-schema-delete-{name}" class InsightNewObjectLocators: diff --git a/app/util/default_test_actions.json b/app/util/default_test_actions.json index 52d05b263..8382e8cf1 100644 --- a/app/util/default_test_actions.json +++ b/app/util/default_test_actions.json @@ -180,12 +180,10 @@ "selenium_agent_add_comment", "selenium_customer_share_request_with_customer:search_for_customer_to_share_with", "selenium_agent_view_queues_large_project_:all_open_queue", - "selenium_agent_view_queues_large_project:random_choice_queue", "selenium_agent_view_queues_large_project", "selenium_customer_share_request:share_request_with_customer", "selenium_customer_share_request_with_customer", "selenium_agent_view_queues_small_project_:all_open_queue", - "selenium_agent_view_queues_small_project:random_choice_queue", "selenium_agent_view_queues_small_project", "selenium_customer_add_comment", "selenium_agent_insight_create_new_object", From a84d131f87b400e868fb934509eb53dd103526ed Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Fri, 22 Jul 2022 15:01:59 +0300 Subject: [PATCH 09/20] fixed start/stop commands Jira (#852) --- app/util/jira/populate_db.sh | 45 ++++-------------------------------- 1 file changed, 5 insertions(+), 40 deletions(-) diff --git a/app/util/jira/populate_db.sh b/app/util/jira/populate_db.sh index dbf35b18b..f66f3bcdb 100644 --- a/app/util/jira/populate_db.sh +++ b/app/util/jira/populate_db.sh @@ -33,11 +33,8 @@ DB_CONFIG="/var/atlassian/application-data/jira/dbconfig.xml" # Depending on Jira installation directory JIRA_CURRENT_DIR="/opt/atlassian/jira-software/current" -START_JIRA="${JIRA_CURRENT_DIR}/bin/start-jira.sh" -CATALINA_PID_FILE="${JIRA_CURRENT_DIR}/work/catalina.pid" JIRA_SETENV_FILE="${JIRA_CURRENT_DIR}/bin/setenv.sh" JIRA_VERSION_FILE="/media/atl/jira/shared/jira-software.version" -SHUT_DOWN_TOMCAT="${JIRA_CURRENT_DIR}/bin/shutdown.sh" # DB admin user name, password and DB name JIRA_DB_NAME="jira" @@ -224,39 +221,10 @@ if [[ -s ${JIRA_LICENSE_FILE} ]]; then fi echo "Step5: Stop Jira" -if [[ ${jsm} == 1 ]]; then - sudo systemctl stop jira -else - CATALINA_PID=$(pgrep -f "catalina") - echo "CATALINA_PID=${CATALINA_PID}" - if [[ -z ${CATALINA_PID} ]]; then - echo "Jira is not running" - sudo su -c "rm -rf ${CATALINA_PID_FILE}" - else - echo "Stopping Jira" - if [[ ! -f "${CATALINA_PID_FILE}" ]]; then - echo "File created: ${CATALINA_PID_FILE}" - sudo su -c "echo ${CATALINA_PID} > ${CATALINA_PID_FILE}" - fi - sudo su -c "${SHUT_DOWN_TOMCAT}" - COUNTER=0 - TIMEOUT=5 - ATTEMPTS=30 - while [[ "${COUNTER}" -lt "${ATTEMPTS}" ]]; do - if [[ -z $(pgrep -f "catalina") ]]; then - echo Jira is stopped - break - fi - echo "Waiting for Jira stop, attempt ${COUNTER}/${ATTEMPTS} at waiting ${TIMEOUT} seconds." - sleep ${TIMEOUT} - let COUNTER++ - done - if [ ${COUNTER} -eq ${ATTEMPTS} ]; then - echo "Jira stop was not finished in $ATTEMPTS attempts with $TIMEOUT sec timeout." - echo "Try to rerun script." - exit 1 - fi - fi +sudo systemctl stop jira +if [[ $? -ne 0 ]]; then + echo "Jira did not stop. Please try to rerun script." + exit 1 fi echo "Step6: Download database dump" @@ -344,11 +312,8 @@ else fi echo "Step10: Start Jira" -if [[ ${jsm} == 1 ]]; then sudo systemctl start jira -else - sudo su jira -c "${START_JIRA}" -fi + rm -rf ${DB_DUMP_NAME} echo "Step11: Remove ${JIRA_BASE_URL_FILE} file" From b4a0db33b0f009776311c2f18f04e7d662b8bc4e Mon Sep 17 00:00:00 2001 From: Alex Metelytsia Date: Mon, 25 Jul 2022 12:02:11 +0300 Subject: [PATCH 10/20] Fix bitbucket attachments permissions (#854) --- app/util/bitbucket/upload_attachments.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bitbucket/upload_attachments.sh b/app/util/bitbucket/upload_attachments.sh index 75441ed5a..5dda590f4 100644 --- a/app/util/bitbucket/upload_attachments.sh +++ b/app/util/bitbucket/upload_attachments.sh @@ -109,7 +109,7 @@ if [[ ${FREE_SPACE_GB} -lt ${REQUIRED_SPACE_GB} ]]; then exit 1 fi; -sudo su -c "time wget -qO- ${ATTACHMENTS_TAR_URL} -P ${NFS_DIR} | tar -xz --checkpoint=.10000 -C ${NFS_DIR}/${ATTACHMENT_DIR_DATA} --strip-components 1" +sudo su bitbucket -c "time wget -qO- ${ATTACHMENTS_TAR_URL} -P ${NFS_DIR} | tar -xz --checkpoint=.10000 -C ${NFS_DIR}/${ATTACHMENT_DIR_DATA} --strip-components 1" if [[ $? -ne 0 ]]; then echo "Untar failed!" exit 1 From 15c0e36bef354b7bc1f7c9d0e14f631b151307b7 Mon Sep 17 00:00:00 2001 From: Alex Metelytsia Date: Mon, 25 Jul 2022 12:04:42 +0300 Subject: [PATCH 11/20] Docs updates 630 (#853) * docs improvement * Docs updates for 6.3.0 release --- README.md | 2 +- app/util/confluence/populate_db.sh | 2 +- app/util/confluence/upload_attachments.sh | 2 +- .../dc-apps-performance-toolkit-user-guide-bamboo.md | 2 +- ...-apps-performance-toolkit-user-guide-bitbucket.md | 2 +- ...apps-performance-toolkit-user-guide-confluence.md | 12 ++++++------ docs/dc-apps-performance-toolkit-user-guide-crowd.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-jira.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-jsm.md | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 3740d7849..7cad059d2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.10` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.7`, `7.4.17` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.7` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.6.14`, `7.17.6` diff --git a/app/util/confluence/populate_db.sh b/app/util/confluence/populate_db.sh index 6b349590a..af341ad07 100644 --- a/app/util/confluence/populate_db.sh +++ b/app/util/confluence/populate_db.sh @@ -20,7 +20,7 @@ CONFLUENCE_DB_PASS="Password1!" SELECT_CONFLUENCE_SETTING_SQL="select BANDANAVALUE from BANDANA where BANDANACONTEXT = '_GLOBAL' and BANDANAKEY = 'atlassian.confluence.settings';" # Confluence version variables -SUPPORTED_CONFLUENCE_VERSIONS=(7.4.17 7.13.7) +SUPPORTED_CONFLUENCE_VERSIONS=(7.13.7) if [[ ! $(systemctl status confluence) ]]; then echo "The Confluence service was not found on this host." \ diff --git a/app/util/confluence/upload_attachments.sh b/app/util/confluence/upload_attachments.sh index dc791a556..2c64b2ad4 100644 --- a/app/util/confluence/upload_attachments.sh +++ b/app/util/confluence/upload_attachments.sh @@ -4,7 +4,7 @@ ################### Variables section ################### # Confluence version variables CONFLUENCE_VERSION_FILE="/media/atl/confluence/shared-home/confluence.version" -SUPPORTED_CONFLUENCE_VERSIONS=(7.4.17 7.13.7) +SUPPORTED_CONFLUENCE_VERSIONS=(7.13.7) CONFLUENCE_VERSION=$(sudo su confluence -c "cat ${CONFLUENCE_VERSION_FILE}") if [[ -z "$CONFLUENCE_VERSION" ]]; then echo The $CONFLUENCE_VERSION_FILE file does not exists or emtpy. Please check if CONFLUENCE_VERSION_FILE variable \ diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index d5f88b609..1177b4390 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2022-07-22" +date: "2022-07-25" --- # Data Center App Performance Toolkit User Guide For Bamboo diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 8f57a3202..3fcb23b34 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2022-05-06" +date: "2022-07-25" --- # Data Center App Performance Toolkit User Guide For Bitbucket diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index b902e6279..a0b3564cb 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2022-06-09" +date: "2022-07-25" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -63,10 +63,10 @@ All important parameters are listed and described in this section. For all other **Confluence setup** -| Parameter | Recommended value | -| --------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Collaborative editing mode | synchrony-local | -| Confluence Version | The Data Center App Performance Toolkit officially supports `7.13.7` and `7.4.17` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended value | +| --------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Collaborative editing mode | synchrony-local | +| Confluence Version | The Data Center App Performance Toolkit officially supports `7.13.7` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** @@ -384,7 +384,7 @@ All important parameters are listed and described in this section. For all other | Parameter | Recommended value | | --------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Collaborative editing mode | synchrony-local | -| Confluence Version | The Data Center App Performance Toolkit officially supports `7.13.7` and `7.4.17` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Confluence Version | The Data Center App Performance Toolkit officially supports `7.13.7` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index ab57fad18..021785c29 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2022-02-01" +date: "2022-07-25" --- # Data Center App Performance Toolkit User Guide For Crowd diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 1e2a645bf..ca85a3a96 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2022-05-16" +date: "2022-07-25" --- # Data Center App Performance Toolkit User Guide For Jira diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index e5c7e89c6..62db17497 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2022-05-06" +date: "2022-07-25" --- # Data Center App Performance Toolkit User Guide For Jira Service Management From 402835cfd6d971f48471ad5624438a84dc0b36c7 Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Wed, 27 Jul 2022 11:35:58 +0300 Subject: [PATCH 12/20] add jsm 5.0.0 support (#858) --- README.md | 2 +- app/util/jira/populate_db.sh | 2 +- app/util/jira/upload_attachments.sh | 2 +- ...dc-apps-performance-toolkit-user-guide-jsm.md | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7cad059d2..89b1af386 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.20.10` * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.10` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.10`, `5.0.0` * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.7` diff --git a/app/util/jira/populate_db.sh b/app/util/jira/populate_db.sh index f66f3bcdb..8937b3a26 100644 --- a/app/util/jira/populate_db.sh +++ b/app/util/jira/populate_db.sh @@ -45,7 +45,7 @@ JIRA_DB_PASS="Password1!" SUPPORTED_JIRA_VERSIONS=(8.20.10) -SUPPORTED_JSM_VERSIONS=(4.20.10) +SUPPORTED_JSM_VERSIONS=(4.20.10 5.0.0) SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") diff --git a/app/util/jira/upload_attachments.sh b/app/util/jira/upload_attachments.sh index 721e873f4..3d45f84b7 100644 --- a/app/util/jira/upload_attachments.sh +++ b/app/util/jira/upload_attachments.sh @@ -31,7 +31,7 @@ JIRA_VERSION_FILE="/media/atl/jira/shared/jira-software.version" SUPPORTED_JIRA_VERSIONS=(8.20.10) -SUPPORTED_JSM_VERSIONS=(4.20.10) +SUPPORTED_JSM_VERSIONS=(4.20.10 5.0.0) SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 62db17497..68dd7aa7d 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -68,10 +68,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended value | -| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | ServiceManagement | -| Version | The Data Center App Performance Toolkit officially supports `4.20.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended value | +| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | ServiceManagement | +| Version | The Data Center App Performance Toolkit officially supports `4.20.10`, `5.0.0` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** @@ -548,10 +548,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended Value | -| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | ServiceManagement | -| Version | The Data Center App Performance Toolkit officially supports `4.20.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended Value | +| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | ServiceManagement | +| Version | The Data Center App Performance Toolkit officially supports `4.20.10`, `5.0.0` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** From 87dac2b0c51f47d7397c1c376f56c094ac0c4604 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Wed, 27 Jul 2022 11:37:31 +0300 Subject: [PATCH 13/20] Jira9 jmeter locust (#856) * jira9 jmeter/locust * jira/update locust http actions --- app/jmeter/jira.jmx | 10 +++++++--- app/locustio/common_utils.py | 8 +++++++- app/locustio/jira/http_actions.py | 10 +++++----- app/locustio/jira/requests_params.py | 5 +++-- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/jmeter/jira.jmx b/app/jmeter/jira.jmx index 3fb460094..148a4c859 100644 --- a/app/jmeter/jira.jmx +++ b/app/jmeter/jira.jmx @@ -1077,6 +1077,10 @@ JMeterUtils.setProperty("c_AtlToken" + user_counter, atl_token) Accept */* + + X-Atlassian-Token + no-check + @@ -6905,7 +6909,7 @@ if ( sleep_time > 0 ) { false - {"id":"com.pyxis.greenhopper.jira:project-sidebar-work-${x_project_plan}"} + {"id":"com.pyxis.greenhopper.jira:project-sidebar-work-kanban"} = @@ -7713,7 +7717,7 @@ if ( sleep_time > 0 ) { false - {"id":"com.pyxis.greenhopper.jira:project-sidebar-work-${x_project_plan}"} + {"id":"com.pyxis.greenhopper.jira:project-sidebar-work-scrum"} = @@ -8724,7 +8728,7 @@ if ( sleep_time > 0 ) { false - {"id":"com.pyxis.greenhopper.jira:project-sidebar-work-${x_project_plan}"} + {"id":"com.pyxis.greenhopper.jira:project-sidebar-work-scrum"} = diff --git a/app/locustio/common_utils.py b/app/locustio/common_utils.py index d75d33545..27227d718 100644 --- a/app/locustio/common_utils.py +++ b/app/locustio/common_utils.py @@ -36,7 +36,13 @@ 'X-AUSERNAME': 'admin', 'X-Requested-With': 'XMLHttpRequest', 'Accept-Encoding': 'gzip, deflate', - 'Accept': '*/*' + 'Accept': '*/*', + 'X-Atlassian-Token': 'no-check', + 'Content-Length': '0', + 'Connection': 'keep-alive', + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', + 'User-Agent': 'xx', + 'Authorization': 'Basic' } NO_TOKEN_HEADERS = { "Accept-Language": "en-US,en;q=0.5", diff --git a/app/locustio/jira/http_actions.py b/app/locustio/jira/http_actions.py index c775a7a04..080ccf112 100644 --- a/app/locustio/jira/http_actions.py +++ b/app/locustio/jira/http_actions.py @@ -167,7 +167,9 @@ def create_issue_open_quick_create(): raise_if_login_failed(locust) # 200 /secure/QuickCreateIssue!default.jspa?decorator=none - r = locust.post('/secure/QuickCreateIssue!default.jspa?decorator=none', ADMIN_HEADERS, catch_response=True) + r = locust.post(f'/secure/QuickCreateIssue!default.jspa?', + json={'atl_token': locust.session_data_storage["token"]}, + headers=ADMIN_HEADERS, catch_response=True) content = r.content.decode('utf-8') atl_token = fetch_by_re(params.atl_token_pattern, content) @@ -193,7 +195,7 @@ def create_issue_open_quick_create(): # 205 /rest/quickedit/1.0/userpreferences/create locust.post('/rest/quickedit/1.0/userpreferences/create', json=params.user_preferences_payload, - headers=ADMIN_HEADERS, + headers=RESOURCE_HEADERS, catch_response=True) # 210 /rest/analytics/1.0/publish/bulk @@ -513,6 +515,7 @@ def edit_issue_save_edit(): json=params.resources_body.get("770"), headers=RESOURCE_HEADERS, catch_response=True) + edit_issue_save_edit() @@ -749,7 +752,6 @@ def view_backlog(locust): @jira_measure('locust_browse_boards') def browse_boards(locust): - raise_if_login_failed(locust) params = BrowseBoards() @@ -860,7 +862,6 @@ def kanban_board(locust, board_id): def scrum_board(locust, board_id): - params = ViewBoard(action_name='view_scrum_board') # 1100 /secure/RapidBoard.jspa @@ -951,7 +952,6 @@ def scrum_board(locust, board_id): def backlog_board(locust, board_id): - params = ViewBoard(action_name='view_backlog') # 1200 /secure/RapidBoard.jspa diff --git a/app/locustio/jira/requests_params.py b/app/locustio/jira/requests_params.py index 0e7215992..dee8dc1a1 100644 --- a/app/locustio/jira/requests_params.py +++ b/app/locustio/jira/requests_params.py @@ -20,7 +20,7 @@ def jira_datasets(): class JiraResource(BaseResource): - + def __init__(self, resource_file='locustio/jira/resources.json'): super().__init__(resource_file) @@ -28,10 +28,12 @@ def __init__(self, resource_file='locustio/jira/resources.json'): class Login(JiraResource): action_name = 'login_and_view_dashboard' atl_token_pattern = r'name="atlassian-token" content="(.+?)">' + login_body = { 'os_username': '', 'os_password': '', 'os_destination': '', + 'os_cookie': True, 'user_role': '', 'atl_token': '', 'login': 'Log in' @@ -162,5 +164,4 @@ def __init__(self, action_name): class BrowseBoards(JiraResource): - action_name = 'browse_boards' From fcec2b1552d5321c9f4dd27ae3ef62826ae07ad4 Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Wed, 27 Jul 2022 11:37:47 +0300 Subject: [PATCH 14/20] Jsm 5.1.0 selenium action fix (#855) * fix of add_comment selenium action for jsm 5.1.0 * removed a paragraph --- app/selenium_ui/jsm/pages/agent_pages.py | 1 + app/selenium_ui/jsm/pages/agent_selectors.py | 1 + 2 files changed, 2 insertions(+) diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index 7b799a462..fd93f61d1 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -112,6 +112,7 @@ def check_comment_text_is_displayed(self, text, rte_status=None): def add_request_comment(self, rte_status): comment_text = f"Add comment from selenium - {self.generate_random_string(30)}" + self.wait_until_visible(ViewCustomerRequestLocators.comment_tab) textarea = self.get_element(ViewCustomerRequestLocators.comment_collapsed_textarea) self.driver.execute_script("arguments[0].scrollIntoView(true);", textarea) textarea.click() diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index b8426e860..9b999396f 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -113,6 +113,7 @@ class ViewCustomerRequestLocators: comment_text_field = (By.XPATH, "//textarea[@id='comment']") comment_tinymce_field = (By.ID, "tinymce") comment_internally_btn = (By.XPATH, "//button[contains(text(),'Comment internally')]") + comment_tab = (By.XPATH, '//*[@id="comment-tabpanel"]/a') class ViewReportsLocators: From b09d0d1853ffe2ce5c86093424ad493c3896f880 Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Wed, 27 Jul 2022 11:41:05 +0300 Subject: [PATCH 15/20] Add Jira 9.0.0 support (#857) * added jira 9.0.0 * fix - added comma Co-authored-by: Alex Metelytsia --- README.md | 2 +- app/util/jira/populate_db.sh | 4 +--- app/util/jira/upload_attachments.sh | 4 +--- ...c-apps-performance-toolkit-user-guide-jira.md | 16 ++++++++-------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 89b1af386..be0261ea2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat ## Supported versions * Supported Jira versions: - * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.20.10` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.20.10`, `9.0.0` * Supported Jira Service Management versions: * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.10`, `5.0.0` diff --git a/app/util/jira/populate_db.sh b/app/util/jira/populate_db.sh index 8937b3a26..d5b8cc826 100644 --- a/app/util/jira/populate_db.sh +++ b/app/util/jira/populate_db.sh @@ -43,11 +43,9 @@ JIRA_DB_PASS="Password1!" # Jira/JSM supported versions - -SUPPORTED_JIRA_VERSIONS=(8.20.10) +SUPPORTED_JIRA_VERSIONS=(8.20.10 9.0.0) SUPPORTED_JSM_VERSIONS=(4.20.10 5.0.0) - SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") # JSM section if [[ ${jsm} == 1 ]]; then diff --git a/app/util/jira/upload_attachments.sh b/app/util/jira/upload_attachments.sh index 3d45f84b7..1cb601f36 100644 --- a/app/util/jira/upload_attachments.sh +++ b/app/util/jira/upload_attachments.sh @@ -29,11 +29,9 @@ JIRA_VERSION_FILE="/media/atl/jira/shared/jira-software.version" # Jira/JSM supported versions - -SUPPORTED_JIRA_VERSIONS=(8.20.10) +SUPPORTED_JIRA_VERSIONS=(8.20.10 9.0.0) SUPPORTED_JSM_VERSIONS=(4.20.10 5.0.0) - SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") if [[ ${jsm} == 1 ]]; then JIRA_VERSION_FILE="/media/atl/jira/shared/jira-servicedesk.version" diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index ca85a3a96..107f40a0a 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -63,10 +63,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended value | -| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | Software | -| Version | The Data Center App Performance Toolkit officially supports `8.20.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended value | +| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | Software | +| Version | The Data Center App Performance Toolkit officially supports `8.20.10`, `9.0.0` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** @@ -384,10 +384,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended Value | -| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | Software | -| Version | The Data Center App Performance Toolkit officially supports `8.20.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended Value | +| --------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | Software | +| Version | The Data Center App Performance Toolkit officially supports `8.20.10`, `9.0.0` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** From 7bcc379bad97fab986730a2596678b7313b8652d Mon Sep 17 00:00:00 2001 From: Alex Metelytsia Date: Thu, 28 Jul 2022 16:50:20 +0300 Subject: [PATCH 16/20] Remove redundant test from json (#860) --- app/util/default_test_actions.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/util/default_test_actions.json b/app/util/default_test_actions.json index 8382e8cf1..4de17d58f 100644 --- a/app/util/default_test_actions.json +++ b/app/util/default_test_actions.json @@ -298,12 +298,10 @@ "selenium_agent_add_comment", "selenium_customer_share_request_with_customer:search_for_customer_to_share_with", "selenium_agent_view_queues_large_project_:all_open_queue", - "selenium_agent_view_queues_large_project:random_choice_queue", "selenium_agent_view_queues_large_project", "selenium_customer_share_request:share_request_with_customer", "selenium_customer_share_request_with_customer", "selenium_agent_view_queues_small_project_:all_open_queue", - "selenium_agent_view_queues_small_project:random_choice_queue", "selenium_agent_view_queues_small_project", "selenium_customer_add_comment", "selenium_agent_insight_create_new_object", From ca48862e2f4634f26cd7ff0c38d8b74715d55488 Mon Sep 17 00:00:00 2001 From: Alex Metelytsia Date: Thu, 28 Jul 2022 16:53:17 +0300 Subject: [PATCH 17/20] Bump chromedriver (#861) --- 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 ace18daa1..a2709c513 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "103.0.5060.53" # Supports Chrome version 103. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.134" # Supports Chrome version 103. You can refer to http://chromedriver.chromium.org/downloads reporting: - data-source: sample-labels module: junit-xml \ No newline at end of file diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 0b0a6c4a9..48f61ca3f 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -90,7 +90,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "103.0.5060.53" # Supports Chrome version 103. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.134" # Supports Chrome version 103. 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 5b092988e..47942a94f 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "103.0.5060.53" # Supports Chrome version 103. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.134" # Supports Chrome version 103. 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 1e83eacd1..0ab163bb1 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "103.0.5060.53" # Supports Chrome version 103. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.134" # Supports Chrome version 103. 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 2336bea55..34afe8a9c 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -170,7 +170,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "103.0.5060.53" # Supports Chrome version 103. You can refer to http://chromedriver.chromium.org/downloads + version: "103.0.5060.134" # Supports Chrome version 103. You can refer to http://chromedriver.chromium.org/downloads reporting: - data-source: sample-labels module: junit-xml \ No newline at end of file From f5ea250cf769c1a89ac63c27b86611e379157a48 Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:01:56 +0300 Subject: [PATCH 18/20] check of deployment type fix for crowd (#862) --- app/util/analytics/analytics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/analytics/analytics.py b/app/util/analytics/analytics.py index 0d0488aa1..640dfe495 100644 --- a/app/util/analytics/analytics.py +++ b/app/util/analytics/analytics.py @@ -53,9 +53,9 @@ def __init__(self, application: BaseApplication): self.application_version = application.version self.nodes_count = application.nodes_count self.dataset_information = application.dataset_information - self.deployment = application.deployment if self.app_type != CROWD: self.processors = application.processors + self.deployment = application.deployment # JSM(INSIGHT) app type has additional concurrency fields: concurrency_agents, concurrency_customers if self.app_type == INSIGHT: self.concurrency_agents = self.conf.agents_concurrency From 12a524080be2d0280245061704f2761c271a46c7 Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Fri, 29 Jul 2022 14:07:40 +0300 Subject: [PATCH 19/20] fix add_comment selenium action (#863) * fix of add_comment selenium action * fix of the selector naming --- app/selenium_ui/jsm/pages/agent_pages.py | 2 +- app/selenium_ui/jsm/pages/agent_selectors.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index fd93f61d1..69cabbca9 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -112,7 +112,7 @@ def check_comment_text_is_displayed(self, text, rte_status=None): def add_request_comment(self, rte_status): comment_text = f"Add comment from selenium - {self.generate_random_string(30)}" - self.wait_until_visible(ViewCustomerRequestLocators.comment_tab) + self.wait_until_visible(ViewCustomerRequestLocators.customers_sidebar_selector) textarea = self.get_element(ViewCustomerRequestLocators.comment_collapsed_textarea) self.driver.execute_script("arguments[0].scrollIntoView(true);", textarea) textarea.click() diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index 9b999396f..5bd0971fe 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -113,7 +113,7 @@ class ViewCustomerRequestLocators: comment_text_field = (By.XPATH, "//textarea[@id='comment']") comment_tinymce_field = (By.ID, "tinymce") comment_internally_btn = (By.XPATH, "//button[contains(text(),'Comment internally')]") - comment_tab = (By.XPATH, '//*[@id="comment-tabpanel"]/a') + customers_sidebar_selector = (By.CSS_SELECTOR, 'span.aui-icon.aui-icon-large.sd-sidebar-icon.icon-sidebar-customers') class ViewReportsLocators: From f989fcebc6421b4ac599a78612a7a01740d4dc88 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 28 Jul 2022 15:48:39 +0300 Subject: [PATCH 20/20] Release 6.3.0 --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/crowd.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- app/util/conf.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index a2709c513..653f7c8b2 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 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 48f61ca3f..c0e0db728 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 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 47942a94f..6524c4b0f 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 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 view_page: 46 view_dashboard: 8 diff --git a/app/crowd.yml b/app/crowd.yml index 83dd4c94a..87997b4af 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.4.2 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 0ab163bb1..49e5694db 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 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 34afe8a9c..b9ee3087c 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.4.2 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 diff --git a/app/util/conf.py b/app/util/conf.py index e8419c2ec..25baeb065 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.0.0' +TOOLKIT_VERSION = '6.3.0' UNSUPPORTED_VERSION = '5.0.0'