From e1857b08a4113ec85fd7420672198d186db209a4 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 31 Oct 2024 14:02:01 +0100 Subject: [PATCH 001/765] Bump tookit verion 8.6.0 --- app/util/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/conf.py b/app/util/conf.py index 8e367c966..cea0f9fa7 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -2,8 +2,8 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML -TOOLKIT_VERSION = '8.5.0' -UNSUPPORTED_VERSION = '8.1.0' +TOOLKIT_VERSION = '8.6.0' +UNSUPPORTED_VERSION = '8.2.2' def read_yml_file(file): From ed9343065c9635fd7ada13fcb5e192b86904cbc0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Nov 2024 06:01:25 +0100 Subject: [PATCH 002/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index ea099f7c1..ac68d3ab6 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b5ce67a4aecf192bdc04eb8ef4c6100cc8ae93f9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Nov 2024 06:01:26 +0100 Subject: [PATCH 003/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 677beb1ed..cdd35034e 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4e31d5d4cdecd6d07827695863807d17f11b4002 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Nov 2024 06:01:27 +0100 Subject: [PATCH 004/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index fdf33dd52..4a8c76a4a 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 649d432fd94e5181e0d9e23f505ea81a74ea1fdb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Nov 2024 06:01:27 +0100 Subject: [PATCH 005/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index a4f8c39cb..68263433b 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4b703d481b396dbb6a2d8f582578723686802b9a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Nov 2024 06:01:28 +0100 Subject: [PATCH 006/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 9877cd4b8..e80de6757 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b1d85a44aa9a14993b68bbce5ff973c4eb013d68 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Wed, 6 Nov 2024 12:10:34 +0200 Subject: [PATCH 007/765] temp change to 9.3 --- app/util/k8s/dcapt-snapshots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f03970d60..de31e4a0c 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -602,7 +602,7 @@ ] }, { - "version": "9.0.0", + "version": "9.3.0", "data": [ { "type": "ebs", From 772bc1c4128c01af7b2543de977a6f76be82d64e Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Thu, 7 Nov 2024 12:08:53 +0200 Subject: [PATCH 008/765] change bb to test 9.3.0 --- app/util/k8s/dcapt-snapshots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index de31e4a0c..682382a25 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -609,7 +609,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0ac664e91507f0e9d", + "us-east-2": "snap-0a197f5ad51ff7edb", "us-east-1": "snap-0961da714ef84fa67" } ] From 7d233df7c95a5d70150053a6c2271cc943817f76 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Thu, 7 Nov 2024 12:24:17 +0200 Subject: [PATCH 009/765] change bb to test 9.3.0 --- app/util/k8s/dcapt-snapshots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 682382a25..e49b652a3 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -619,7 +619,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-0-0", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-3-0", "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-0-0" } ] From fd6d29260856d0c1be2570af204401bd7dd1b4b1 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Mon, 11 Nov 2024 11:43:58 +0200 Subject: [PATCH 010/765] added 2sv for bb selenium --- app/selenium_ui/bitbucket/pages/pages.py | 30 ++++++++++++++++++-- app/selenium_ui/bitbucket/pages/selectors.py | 6 ++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index 61dc89bb0..8be576d8d 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -7,20 +7,44 @@ class LoginPage(BasePage): + page_loaded_selector = [LoginPageLocators.submit_button, LoginPageLocators.login_button_2sv] page_url = UrlManager().login_url() + def __init__(self, driver): + super().__init__(driver) + self.is_2sv_login = False + + def wait_for_page_loaded(self): + self.wait_until_visible(LoginPageLocators.footer_panel) + if not self.get_elements(LoginPageLocators.submit_button): + self.is_2sv_login = True + print("INFO: 2sv login form") + def fill_username(self, username): self.get_element(LoginPageLocators.username_textfield).send_keys(username) + def fill_2sv_username(self, username): + self.get_element(LoginPageLocators.login_username_field_2sv).send_keys(username) + + def fill_2sv_password(self, username): + self.get_element(LoginPageLocators.login_password_field_2sv).send_keys(username) + def fill_password(self, password): self.get_element(LoginPageLocators.password_textfield).send_keys(password) def submit_login(self): - self.wait_until_visible(LoginPageLocators.submit_button).click() + if self.is_2sv_login: + self.wait_until_visible(LoginPageLocators.login_button_2sv).click() + else: + self.wait_until_visible(LoginPageLocators.submit_button).click() def set_credentials(self, username, password): - self.fill_username(username) - self.fill_password(password) + if self.is_2sv_login: + self.fill_2sv_username(username) + self.fill_2sv_password(password) + else: + self.fill_username(username) + self.fill_password(password) def get_node_id(self): text = self.get_element(LoginPageLocators.node_id).text diff --git a/app/selenium_ui/bitbucket/pages/selectors.py b/app/selenium_ui/bitbucket/pages/selectors.py index 7a4f883ab..b2473feb6 100644 --- a/app/selenium_ui/bitbucket/pages/selectors.py +++ b/app/selenium_ui/bitbucket/pages/selectors.py @@ -87,11 +87,17 @@ class PopupLocators: class LoginPageLocators: submit_button = (By.ID, "submit") + footer_panel = (By.ID, "footer") username_textfield = (By.ID, "j_username") password_textfield = (By.ID, "j_password") application_version = (By.ID, 'product-version') node_id = (By.CLASS_NAME, 'footer-body') + # 2sv login form + login_button_2sv = (By.ID, "login-button") + login_username_field_2sv = (By.ID, "username-field") + login_password_field_2sv = (By.ID, "password-field") + class LogoutPageLocators: logout_url = UrlManager().logout_url() From 5d3cd441446f78b805489d048dd494e95f9b80c1 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Tue, 12 Nov 2024 12:01:56 +0200 Subject: [PATCH 011/765] fix selenium 2sv bb --- app/selenium_ui/bitbucket/pages/pages.py | 29 ++++++++++++++++++-- app/selenium_ui/bitbucket/pages/selectors.py | 6 ++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index 61dc89bb0..e6adb51c6 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -9,18 +9,41 @@ class LoginPage(BasePage): page_url = UrlManager().login_url() + def __init__(self, driver): + super().__init__(driver) + self.is_2sv_login = False + + def wait_for_page_loaded(self): + self.wait_until_visible(LoginPageLocators.footer_panel) + if not self.get_elements(LoginPageLocators.submit_button): + self.is_2sv_login = True + print("INFO: 2sv login form") + def fill_username(self, username): self.get_element(LoginPageLocators.username_textfield).send_keys(username) + def fill_2sv_username(self, username): + self.get_element(LoginPageLocators.login_username_field_2sv).send_keys(username) + + def fill_2sv_password(self, username): + self.get_element(LoginPageLocators.login_password_field_2sv).send_keys(username) + def fill_password(self, password): self.get_element(LoginPageLocators.password_textfield).send_keys(password) def submit_login(self): - self.wait_until_visible(LoginPageLocators.submit_button).click() + if self.is_2sv_login: + self.wait_until_visible(LoginPageLocators.login_button_2sv).click() + else: + self.wait_until_visible(LoginPageLocators.submit_button).click() def set_credentials(self, username, password): - self.fill_username(username) - self.fill_password(password) + if self.is_2sv_login: + self.fill_2sv_username(username) + self.fill_2sv_password(password) + else: + self.fill_username(username) + self.fill_password(password) def get_node_id(self): text = self.get_element(LoginPageLocators.node_id).text diff --git a/app/selenium_ui/bitbucket/pages/selectors.py b/app/selenium_ui/bitbucket/pages/selectors.py index 7a4f883ab..b2473feb6 100644 --- a/app/selenium_ui/bitbucket/pages/selectors.py +++ b/app/selenium_ui/bitbucket/pages/selectors.py @@ -87,11 +87,17 @@ class PopupLocators: class LoginPageLocators: submit_button = (By.ID, "submit") + footer_panel = (By.ID, "footer") username_textfield = (By.ID, "j_username") password_textfield = (By.ID, "j_password") application_version = (By.ID, 'product-version') node_id = (By.CLASS_NAME, 'footer-body') + # 2sv login form + login_button_2sv = (By.ID, "login-button") + login_username_field_2sv = (By.ID, "username-field") + login_password_field_2sv = (By.ID, "password-field") + class LogoutPageLocators: logout_url = UrlManager().logout_url() From c9862dbe2c2ead6d63264dd13e7ec4971f560fa5 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Tue, 12 Nov 2024 12:02:32 +0200 Subject: [PATCH 012/765] fix wait --- app/selenium_ui/bitbucket/pages/pages.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index 8be576d8d..e6adb51c6 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -7,7 +7,6 @@ class LoginPage(BasePage): - page_loaded_selector = [LoginPageLocators.submit_button, LoginPageLocators.login_button_2sv] page_url = UrlManager().login_url() def __init__(self, driver): From d4f131d4a77e0904f04eefa73a2fcf796a334028 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Nov 2024 06:00:44 +0100 Subject: [PATCH 013/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index ac68d3ab6..873d43d42 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From dcbd8e915aa796bf32ce57b40fa3fa9ce31077ec Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Nov 2024 06:00:45 +0100 Subject: [PATCH 014/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index cdd35034e..3edd4c066 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 47681bb6c7d5cc75c4c9f7ced61caf9ea6a4f78e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Nov 2024 06:00:46 +0100 Subject: [PATCH 015/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 4a8c76a4a..b8eb23f73 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 13581b04859c8d9e6031bcd2cf1d6bde93f875c9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Nov 2024 06:00:47 +0100 Subject: [PATCH 016/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 68263433b..a229625d0 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 699165f2ebd58a1a9811443674687f4507f4b220 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Nov 2024 06:00:48 +0100 Subject: [PATCH 017/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index e80de6757..b393bdf89 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "130.0.6723.93" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 67e439fcd02b010a849ab2004d415fe73b8487d0 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 14 Nov 2024 11:37:54 +0200 Subject: [PATCH 018/765] fix bb 2sv --- app/jmeter/bitbucket.jmx | 208 ++++++++++++++++++++++++++++++++------- 1 file changed, 174 insertions(+), 34 deletions(-) diff --git a/app/jmeter/bitbucket.jmx b/app/jmeter/bitbucket.jmx index abab3ad3a..fdad80d6b 100644 --- a/app/jmeter/bitbucket.jmx +++ b/app/jmeter/bitbucket.jmx @@ -92,7 +92,7 @@ - + ${application.hostname} ${application.port} ${application.protocol} @@ -254,7 +254,7 @@ log.info("GIT_LOG_DIR: " + gitLogDir); - + ${__BeanShell(import org.apache.commons.lang3.SystemUtils; !SystemUtils.IS_OS_WINDOWS;)} false true @@ -303,44 +303,184 @@ else{ - + - - ${application.postfix}/login - true - POST + + Detected the start of a redirect chain + ${application.postfix}//login + GET true false - - - false - ${admin_login} - = - true - j_username - - - false - ${admin_password} - = - true - j_password - - + - + + + + Accept-Language + en-US,en;q=0.5 + + + Upgrade-Insecure-Requests + 1 + + + Content-Type + application/x-www-form-urlencoded + + + Accept-Encoding + gzip, deflate + + + Accept + text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 + + + + + 200 Assertion.response_code false - 1 + 2 + + false + loginform + loginform + $1$ + NOT_FOUND + 1 + all + + false + + + + groovy + + + true + String loginform = vars.get("loginform"); + +if ("NOT_FOUND".equals(loginform)) { + vars.put("legacy_login_form", "false"); + log.info("2SVlogin flow detected"); +} else { + vars.put("legacy_login_form", "true"); + log.info("legacy login flow detected"); +} + + + + + groovy + + + true + log.info("Legacy login flow: ${legacy_login_form}") + + + + + + ${__groovy(vars.get("legacy_login_form") == 'false')} + false + true + + + + 2sv login flow + ${application.postfix}/rest/tsv/1.0/authenticate + POST + true + true + + + + false + {"username": "${admin_login}", + "password": "${admin_password}", + "rememberMe": "True", + "targetUrl": "" +} + = + + + + + + + + + Content-Type + application/json + + + + + + + 200 + + + Assertion.response_code + false + 2 + + + + + + ${__groovy(vars.get("legacy_login_form") == 'true')} + false + true + + + + ${application.postfix}/login + true + POST + true + false + + + + false + ${admin_login} + = + true + j_username + + + false + ${admin_password} + = + true + j_password + + + + + + + + 200 + + + Assertion.response_code + false + 1 + + + ${application.postfix}/rest/ssh/1.0/keys @@ -374,7 +514,7 @@ vars.put("SERVER_SSH_KEYS", result.join("::")); - + groovy @@ -443,7 +583,7 @@ vars.put("USER_SSH_KEY", new File('${__P(PRIVATE_SSH_KEY_LOCATION - + ${application.postfix}/j_atl_security_logout true POST @@ -454,7 +594,7 @@ vars.put("USER_SSH_KEY", new File('${__P(PRIVATE_SSH_KEY_LOCATION - + groovy @@ -473,7 +613,7 @@ else{ - + 1 0 true @@ -496,7 +636,7 @@ else{ shareMode.all - + ${__P(DATASETS_DIR)}/bitbucket/repos.csv REPO_SLUG,PROJECT_KEY @@ -508,7 +648,7 @@ else{ shareMode.all - + groovy @@ -554,7 +694,7 @@ vars.put("REPO_FOLDER", gitTmpWorkspace + "/clone-push-" + v - + true 0 git @@ -632,7 +772,7 @@ if (responseCode != "0") { - + java @@ -662,7 +802,7 @@ import java.util.UUID; } - + true -1 From 9bbc7139905208a123cef9223c419ed73c48de93 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 14 Nov 2024 12:03:48 +0200 Subject: [PATCH 019/765] fix bb 2sv --- app/selenium_ui/bitbucket/modules.py | 4 ++-- app/selenium_ui/bitbucket/pages/pages.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/selenium_ui/bitbucket/modules.py b/app/selenium_ui/bitbucket/modules.py index 5827bcd64..f8149ef2c 100644 --- a/app/selenium_ui/bitbucket/modules.py +++ b/app/selenium_ui/bitbucket/modules.py @@ -34,12 +34,11 @@ def login(webdriver, datasets): BITBUCKET_SETTINGS.admin_login, BITBUCKET_SETTINGS.admin_password) webdriver.app_version = version.parse(client.get_bitbucket_version()) - login_page = LoginPage(webdriver) webdriver.debug_info = generate_debug_session_info(webdriver, datasets) + login_page = LoginPage(webdriver) @print_timing("selenium_login") def measure(): - @print_timing("selenium_login:open_login_page") def sub_measure(): login_page.go_to() @@ -48,6 +47,7 @@ def sub_measure(): login_page.go_to() sub_measure() + login_page.wait_for_page_loaded() login_page.set_credentials(datasets['current_session']['username'], datasets['current_session']['password']) @print_timing("selenium_login:login_get_started") diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index e6adb51c6..b8b96889c 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -8,6 +8,7 @@ class LoginPage(BasePage): page_url = UrlManager().login_url() + page_loaded_selector = LoginPageLocators.footer_panel def __init__(self, driver): super().__init__(driver) From a2da9e1c0e98e30202ce627e1b404c59d4ac2006 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 15 Nov 2024 12:02:13 +0200 Subject: [PATCH 020/765] back to dev snapshots --- app/util/k8s/dcapt-snapshots.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index e49b652a3..f03970d60 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -602,14 +602,14 @@ ] }, { - "version": "9.3.0", + "version": "9.0.0", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-0a197f5ad51ff7edb", + "us-east-2": "snap-0ac664e91507f0e9d", "us-east-1": "snap-0961da714ef84fa67" } ] @@ -619,7 +619,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-3-0", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-0-0", "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-0-0" } ] From 36a2244aace7a02a874eec70b89658a636091df1 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Nov 2024 06:00:48 +0100 Subject: [PATCH 021/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 873d43d42..87852aafa 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b9156153a2573327be0402a07e19a58be6512051 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Nov 2024 06:00:49 +0100 Subject: [PATCH 022/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 3edd4c066..f4ba5dfb4 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 03f6138ff55d71237864abe5abf63fb07f2bc5f3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Nov 2024 06:00:50 +0100 Subject: [PATCH 023/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index b8eb23f73..cf3059854 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ed0a3930c556e4ce5a85834c199cebc2dadc4008 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Nov 2024 06:00:50 +0100 Subject: [PATCH 024/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index a229625d0..ad0be2430 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7c743490eee4f15d361ba7fa5c3a962d5808ce84 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Nov 2024 06:00:51 +0100 Subject: [PATCH 025/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index b393bdf89..6fff8232f 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.69" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6ff701371f4e72cb983cf5dc30a2df8f9c6be0f9 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Fri, 22 Nov 2024 12:13:36 +0100 Subject: [PATCH 026/765] DCA-2278 Confluence create page popup fix --- app/selenium_ui/base_page.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index 93c94bbea..f5267bf64 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -6,6 +6,7 @@ from packaging import version from selenium.common.exceptions import WebDriverException from selenium.webdriver.common.action_chains import ActionChains +from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as ec from selenium.webdriver.support.ui import Select from selenium.webdriver.support.wait import WebDriverWait @@ -133,10 +134,11 @@ def __wait_until(self, expected_condition, locator, time_out=timeout): def dismiss_popup(self, *args): for elem in args: - try: - self.driver.execute_script(f"document.querySelector(\'{elem}\').click()") - except(WebDriverException, Exception): - pass + if self.driver.find_elements(by=By.CSS_SELECTOR, value=elem): + try: + self.driver.execute_script(f"document.querySelector(\'{elem}\').click()") + except(WebDriverException, Exception): + pass def return_to_parent_frame(self): return self.driver.switch_to.parent_frame() From 734c5243eff52b2baa9863e74e9fdbec61c80566 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Fri, 22 Nov 2024 13:18:03 +0100 Subject: [PATCH 027/765] Bump TF version 2.9.4 --- app/util/k8s/README.MD | 24 +++++++++---------- ...s-performance-toolkit-user-guide-bamboo.md | 10 ++++---- ...erformance-toolkit-user-guide-bitbucket.md | 18 +++++++------- ...rformance-toolkit-user-guide-confluence.md | 18 +++++++------- ...ps-performance-toolkit-user-guide-crowd.md | 16 ++++++------- ...pps-performance-toolkit-user-guide-jira.md | 18 +++++++------- ...apps-performance-toolkit-user-guide-jsm.md | 18 +++++++------- 7 files changed, 61 insertions(+), 61 deletions(-) diff --git a/app/util/k8s/README.MD b/app/util/k8s/README.MD index 48506c694..46947a6b2 100644 --- a/app/util/k8s/README.MD +++ b/app/util/k8s/README.MD @@ -32,7 +32,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` ### Terminate development environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -44,7 +44,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.3 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.4 ./uninstall.sh -c conf.tfvars ``` # Enterprise-scale environment @@ -61,7 +61,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` ### Terminate enterprise-scale environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -73,7 +73,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.3 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.4 ./uninstall.sh -c conf.tfvars ``` # Collect detailed k8s logs @@ -93,7 +93,7 @@ export REGION=us-east-2 docker run --pull=always --env-file aws_envs \ -v "/$PWD/k8s_logs:/data-center-terraform/k8s_logs" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.3 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs +-it atlassianlabs/terraform:2.9.4 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs ``` # Force terminate cluster @@ -126,7 +126,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.3 bash + -it atlassianlabs/terraform:2.9.4 bash ``` 5. Connect to the product pod. Example below for jira pod with number 0. For other product or pod number change `PRODUCT_POD` accordingly. @@ -150,7 +150,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ - -it atlassianlabs/terraform:2.9.3 bash + -it atlassianlabs/terraform:2.9.4 bash ``` 5. Copy code base and connect to the execution environment pod: ``` bash @@ -178,7 +178,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e REGION=$REGION \ -e PRODUCT=$PRODUCT \ -v "/$PWD/script-runner.yml:/data-center-terraform/script-runner.yml" \ - -it atlassianlabs/terraform:2.9.3 bash + -it atlassianlabs/terraform:2.9.4 bash ``` 5. Run following commands one by one inside docker container: ``` bash @@ -206,7 +206,7 @@ To enable detailed CPU/Memory monitoring and Grafana dashboards for visualisatio docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.3 bash + -it atlassianlabs/terraform:2.9.4 bash ``` ``` bash aws eks update-kubeconfig --name atlas-$ENVIRONMENT_NAME-cluster --region $REGION @@ -242,7 +242,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml ``` # Retry to copy run results from the execution environment pod to local @@ -259,7 +259,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/copy_run_results.sh:/data-center-terraform/copy_run_results.sh" \ - -it atlassianlabs/terraform:2.9.3 bash copy_run_results.sh + -it atlassianlabs/terraform:2.9.4 bash copy_run_results.sh ``` # Debug AWS required policies @@ -268,7 +268,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n 3. Start and ssh to `atlassianlabs/terraform` docker container: ``` bash docker run --pull=always --env-file aws_envs \ - -it atlassianlabs/terraform:2.9.3 bash + -it atlassianlabs/terraform:2.9.4 bash ``` 4. Make sure you have IAM policies with names `policy1`, `policy2`, created from [policy1.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy1.json) and [policy2.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy2.json). 5. Run following commands one by one inside docker container to get effective policies permissions: diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 68f51df1b..d1a8a5bd8 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: "2024-10-22" +date: "2024-11-22" --- # Data Center App Performance Toolkit User Guide For Bamboo @@ -102,7 +102,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. @@ -303,7 +303,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -334,7 +334,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -368,7 +368,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 666fe4a66..98031c489 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: "2024-10-22" +date: "2024-11-22" --- # Data Center App Performance Toolkit User Guide For Bitbucket @@ -115,7 +115,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -319,7 +319,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -394,7 +394,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -425,7 +425,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -475,7 +475,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -500,7 +500,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -513,7 +513,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -542,7 +542,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index 4fc520dd3..805fd26ce 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: "2024-10-22" +date: "2024-11-22" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -474,7 +474,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -504,7 +504,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index eb7bac975..20a06cb9b 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: "2024-10-22" +date: "2024-11-22" --- # Data Center App Performance Toolkit User Guide For Crowd @@ -97,7 +97,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -208,7 +208,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -237,7 +237,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -296,7 +296,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -320,7 +320,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -347,7 +347,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -390,7 +390,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 88386d8c5..c61727166 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: "2024-10-22" +date: "2024-11-22" --- # Data Center App Performance Toolkit User Guide For Jira @@ -122,7 +122,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -423,7 +423,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -498,7 +498,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -550,7 +550,7 @@ The re-index time for Jira is about ~50-70 minutes. -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -636,7 +636,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -649,7 +649,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -678,7 +678,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 130d834f3..82da913c5 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: "2024-10-22" +date: "2024-11-22" --- # Data Center App Performance Toolkit User Guide For Jira Service Management @@ -124,7 +124,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -459,7 +459,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -539,7 +539,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -594,7 +594,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -679,7 +679,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.3 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -692,7 +692,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -721,7 +721,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.3 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From c6c1954629ff46391ef92ec50cbf8c69af92f3da Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Tue, 26 Nov 2024 14:23:52 +0100 Subject: [PATCH 028/765] DCA-2395 jira websudo for extension_ui.py --- app/extension/jira/extension_ui.py | 6 +++++- app/selenium_ui/jira/modules.py | 2 ++ app/selenium_ui/jira/pages/pages.py | 27 ++++++++++++++++++++++++- app/selenium_ui/jira/pages/selectors.py | 12 +++++++++++ 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/app/extension/jira/extension_ui.py b/app/extension/jira/extension_ui.py index 01aff462d..26e4b69aa 100644 --- a/app/extension/jira/extension_ui.py +++ b/app/extension/jira/extension_ui.py @@ -4,7 +4,7 @@ from selenium_ui.base_page import BasePage from selenium_ui.conftest import print_timing -from selenium_ui.jira.pages.pages import Login +from selenium_ui.jira.pages.pages import Login, AdminPage from util.conf import JIRA_SETTINGS @@ -23,12 +23,16 @@ def app_specific_action(webdriver, datasets): # login_page = Login(webdriver) # login_page.delete_all_cookies() # login_page.go_to() + # login_page.wait_for_login_page_loaded() # login_page.set_credentials(username=username, password=password) # if login_page.is_first_login(): # login_page.first_login_setup() # if login_page.is_first_login_second_page(): # login_page.first_login_second_page_setup() # login_page.wait_for_page_loaded() + # # uncomment below line to do web_sudo and authorise access to admin pages + # # AdminPage(webdriver).go_to(password=password) + # # app_specific_user_login(username='admin', password='admin') # measure() diff --git a/app/selenium_ui/jira/modules.py b/app/selenium_ui/jira/modules.py index 35811ce43..091553a85 100644 --- a/app/selenium_ui/jira/modules.py +++ b/app/selenium_ui/jira/modules.py @@ -70,6 +70,8 @@ def measure(): @print_timing("selenium_login:open_login_page") def sub_measure(): login_page.go_to() + login_page.wait_for_login_page_loaded() + sub_measure() @print_timing("selenium_login:login_and_view_dashboard") diff --git a/app/selenium_ui/jira/pages/pages.py b/app/selenium_ui/jira/pages/pages.py index 6db876d47..e38bcf51e 100644 --- a/app/selenium_ui/jira/pages/pages.py +++ b/app/selenium_ui/jira/pages/pages.py @@ -6,7 +6,7 @@ from selenium_ui.base_page import BasePage from selenium_ui.jira.pages.selectors import UrlManager, LoginPageLocators, DashboardLocators, PopupLocators, \ - IssueLocators, ProjectLocators, SearchLocators, BoardsListLocators, BoardLocators, LogoutLocators + IssueLocators, ProjectLocators, SearchLocators, BoardsListLocators, BoardLocators, LogoutLocators, AdminLocators class PopupManager(BasePage): @@ -23,6 +23,12 @@ class Login(BasePage): def is_first_login(self): return True if self.get_elements(LoginPageLocators.continue_button) else False + def wait_for_login_page_loaded(self): + # TODO DCA-2394: Find proper logic to wait until login page is fully loaded + # Jira 10.0.1 has issue when clicking too fast on login button resulting in user is not logged in. + from time import sleep + sleep(1) + def is_first_login_second_page(self): return True if self.get_elements(LoginPageLocators.avatar_page_next_button) else False @@ -255,3 +261,22 @@ def go_to_backlog(self): def wait_for_scrum_board_backlog(self): self.wait_until_present(BoardLocators.scrum_board_backlog_content) + + +class AdminPage(BasePage): + page_url = AdminLocators.admin_system_page_url + page_loaded_selector = AdminLocators.login_form + + def is_websudo(self): + return True if self.get_elements(AdminLocators.web_sudo_password) else False + + def do_websudo(self, password): + self.wait_until_clickable(AdminLocators.web_sudo_password).send_keys(password) + self.wait_until_clickable(AdminLocators.web_sudo_submit_btn).click() + self.wait_until_visible(AdminLocators.admin_search_link) + + def go_to(self, password=None): + super().go_to() + self.wait_for_page_loaded() + if self.is_websudo(): + self.do_websudo(password) diff --git a/app/selenium_ui/jira/pages/selectors.py b/app/selenium_ui/jira/pages/selectors.py index 43fb8bde8..43f75557c 100644 --- a/app/selenium_ui/jira/pages/selectors.py +++ b/app/selenium_ui/jira/pages/selectors.py @@ -26,6 +26,7 @@ def __init__(self, issue_key=None, issue_id=None, project_key=None, jql=None, pr self.boards_list_params = '/secure/ManageRapidViews.jspa' self.scrum_board_backlog_params = f"/secure/RapidBoard.jspa?rapidView={board_id}&view=planning" self.scrum_board_params = f"/secure/RapidBoard.jspa?rapidView={board_id}" + self.admin_system_params = f"/secure/admin/ViewApplicationProperties.jspa" def login_url(self): return f"{self.host}{self.login_params}" @@ -63,6 +64,9 @@ def scrum_board_url(self): def logout_url(self): return f"{self.host}{self.logout_params}" + def admin_system_url(self): + return f"{self.host}{self.admin_system_params}" + class LoginPageLocators: login_url = UrlManager().login_url() @@ -147,3 +151,11 @@ class BoardLocators: # Scrum boards scrum_board_backlog_content = (By.CSS_SELECTOR, "#ghx-backlog[data-rendered]:not(.browser-metrics-stale)") board_columns = (By.CSS_SELECTOR, ".ghx-column") + + +class AdminLocators: + admin_system_page_url = UrlManager().admin_system_url() + web_sudo_password = (By.ID, 'login-form-authenticatePassword') + web_sudo_submit_btn = (By.ID, 'login-form-submit') + login_form = (By.ID, 'login-form') + admin_search_link = (By.ID, 'admin-search-link') From 7fc889c2801d0b5d2bd17d8ac5ce72ac3becfb04 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 28 Nov 2024 11:01:46 +0200 Subject: [PATCH 029/765] fix for 2sv bb --- app/jmeter/bitbucket.jmx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/jmeter/bitbucket.jmx b/app/jmeter/bitbucket.jmx index fdad80d6b..8ff6bbcdf 100644 --- a/app/jmeter/bitbucket.jmx +++ b/app/jmeter/bitbucket.jmx @@ -92,7 +92,7 @@ - + ${application.hostname} ${application.port} ${application.protocol} @@ -254,7 +254,7 @@ log.info("GIT_LOG_DIR: " + gitLogDir); - + ${__BeanShell(import org.apache.commons.lang3.SystemUtils; !SystemUtils.IS_OS_WINDOWS;)} false true @@ -307,7 +307,7 @@ else{ Detected the start of a redirect chain - ${application.postfix}//login + ${application.postfix}/login GET true false @@ -316,7 +316,7 @@ else{ - + Accept-Language @@ -353,8 +353,8 @@ else{ false - loginform - loginform + j_username + j_username $1$ NOT_FOUND 1 @@ -426,7 +426,7 @@ if ("NOT_FOUND".equals(loginform)) { - + 200 @@ -438,7 +438,7 @@ if ("NOT_FOUND".equals(loginform)) { - + ${__groovy(vars.get("legacy_login_form") == 'true')} false true @@ -482,7 +482,7 @@ if ("NOT_FOUND".equals(loginform)) { - + ${application.postfix}/rest/ssh/1.0/keys true GET @@ -524,7 +524,7 @@ vars.put("USER_SSH_KEY", new File('${__P(PRIVATE_SSH_KEY_LOCATION - + ${__groovy( def userSshKey = vars.get("USER_SSH_KEY"); def key_list = vars.get("SERVER_SSH_KEYS"); @@ -541,7 +541,7 @@ vars.put("USER_SSH_KEY", new File('${__P(PRIVATE_SSH_KEY_LOCATION true - + ${application.postfix}/rest/ssh/latest/keys?user=${admin_login} true POST @@ -583,7 +583,7 @@ vars.put("USER_SSH_KEY", new File('${__P(PRIVATE_SSH_KEY_LOCATION - + ${application.postfix}/j_atl_security_logout true POST @@ -594,7 +594,7 @@ vars.put("USER_SSH_KEY", new File('${__P(PRIVATE_SSH_KEY_LOCATION - + groovy @@ -613,7 +613,7 @@ else{ - + 1 0 true @@ -636,7 +636,7 @@ else{ shareMode.all - + ${__P(DATASETS_DIR)}/bitbucket/repos.csv REPO_SLUG,PROJECT_KEY @@ -648,7 +648,7 @@ else{ shareMode.all - + groovy @@ -694,7 +694,7 @@ vars.put("REPO_FOLDER", gitTmpWorkspace + "/clone-push-" + v - + true 0 git @@ -802,7 +802,7 @@ import java.util.UUID; } - + true -1 From 28818a7f1205c06caed1a82f522e6ef00adf13bd Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Tue, 3 Dec 2024 14:34:03 +0100 Subject: [PATCH 030/765] Update start JMeter readme --- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 2 +- 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index d1a8a5bd8..169d905ca 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -203,7 +203,7 @@ So, our test has to open plan summary page and measure time to load of this new 1. Set desired execution percentage for `standalone_extension`. Default value is `0`, which means that `standalone_extension` action will not be executed. For example, for app-specific action development you could set percentage of `standalone_extension` to 100 and for all other actions to 0 - this way only `login_and_view_all_builds` and `standalone_extension` actions would be executed. -1. Navigate to `dc-app-performance-toolkit/app` folder and run from virtualenv(as described in `dc-app-performance-toolkit/README.md`): +1.Navigate to `dc-app-performance-toolkit/app` folder and follow [start JMeter UI README](https://github.com/atlassian/dc-app-performance-toolkit/tree/master/app/util/jmeter#start-jmeter-ui): ```python util/jmeter/start_jmeter_ui.py --app bamboo``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index 805fd26ce..445cfd1cd 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -248,7 +248,7 @@ Set `standalone_extension` weight in accordance with the expected frequency of y 1. Check that `confluence.yml` file has correct settings of `application_hostname`, `application_protocol`, `application_port`, `application_postfix`, etc. 1. Set desired execution percentage for `standalone_extension`. Default value is `0`, which means that `standalone_extension` action will not be executed. For example, for app-specific action development you could set percentage of `standalone_extension` to 100 and for all other actions to 0 - this way only `login_and_view_dashboard` and `standalone_extension` actions would be executed. -1. Navigate to `dc-app-performance-toolkit/app` folder and run from virtualenv(as described in `dc-app-performance-toolkit/README.md`): +1. Navigate to `dc-app-performance-toolkit/app` folder and follow [start JMeter UI README](https://github.com/atlassian/dc-app-performance-toolkit/tree/master/app/util/jmeter#start-jmeter-ui): ```python util/jmeter/start_jmeter_ui.py --app confluence``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 20a06cb9b..f395ed4ae 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -134,7 +134,7 @@ Data Center App Performance Toolkit has its own set of default [JMeter](https:// 1. Set up local environment for toolkit using the [README](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). 1. Check that `crowd.yml` file has correct settings of `application_hostname`, `application_protocol`, `application_port`, `application_postfix`, etc. -1. Navigate to `dc-app-performance-toolkit/app` folder and run from virtualenv(as described in `dc-app-performance-toolkit/README.md`): +1. Navigate to `dc-app-performance-toolkit/app` folder and follow [start JMeter UI README](https://github.com/atlassian/dc-app-performance-toolkit/tree/master/app/util/jmeter#start-jmeter-ui): ```python util/jmeter/start_jmeter_ui.py --app crowd``` 1. Open `Crowd` thread group and add new transaction controller. diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index c61727166..6eb913efe 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -255,7 +255,7 @@ You develop an app that introduces new GET and POST endpoints in Jira Data Cente 1. Check that `jira.yml` file has correct settings of `application_hostname`, `application_protocol`, `application_port`, `application_postfix`, etc. 1. Set desired execution percentage for `standalone_extension`. Default value is `0`, which means that `standalone_extension` action will not be executed. For example, for app-specific action development you could set percentage of `standalone_extension` to 100 and for all other actions to 0 - this way only `login_and_view_dashboard` and `standalone_extension` actions would be executed. -1. Navigate to `dc-app-performance-toolkit/app` folder and run from virtualenv(as described in `dc-app-performance-toolkit/README.md`): +1. Navigate to `dc-app-performance-toolkit/app` folder and follow [start JMeter UI README](https://github.com/atlassian/dc-app-performance-toolkit/tree/master/app/util/jmeter#start-jmeter-ui): ```python util/jmeter/start_jmeter_ui.py --app jira``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 82da913c5..b9f913f6d 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -272,7 +272,7 @@ Set `agent_standalone_extension`/`customer_standalone_extension` weight in accor 1. Check that `jsm.yml` file has correct settings of `application_hostname`, `application_protocol`, `application_port`, `application_postfix`, etc. 1. Set desired execution percentage for `agent_standalone_extension` and/or `customer_standalone_extension`. Default values are `0`, which means that `agent_standalone_extension` and `customer_standalone_extension` actions will not be executed. For example, for app-specific action development you could set percentage of `agent_standalone_extension` and/or `customer_standalone_extension` to 100 and for all other actions to 0 - this way only `jmeter_agent_login_and_view_dashboard` and `agent_standalone_extension` or `jmeter_customer_login_and_view_dashboard` and `customer_standalone_extension` actions would be executed. -1. Navigate to `dc-app-performance-toolkit/app` folder and run from virtualenv(as described in `dc-app-performance-toolkit/README.md`): +1. Navigate to `dc-app-performance-toolkit/app` folder and follow [start JMeter UI README](https://github.com/atlassian/dc-app-performance-toolkit/tree/master/app/util/jmeter#start-jmeter-ui): ``` bash python util/jmeter/start_jmeter_ui.py --app jsm --type agents From 96fc11cfb338ae04ff40369f917ab5b77d7b7e2f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Dec 2024 06:00:51 +0100 Subject: [PATCH 031/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 87852aafa..050ed1948 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0ab6ba3ebaef1b2273c2dc6f09fbf9e7283035c2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Dec 2024 06:00:52 +0100 Subject: [PATCH 032/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index f4ba5dfb4..95de2cd7e 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e4efd40def8aba6eca8bba6ede7459f0f8718d15 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Dec 2024 06:00:52 +0100 Subject: [PATCH 033/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index cf3059854..195db973d 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7a5691ac5fb19136dd1381fc7d9ac73567d86da1 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Dec 2024 06:00:53 +0100 Subject: [PATCH 034/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index ad0be2430..e3c618ee9 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 07c1b63b80f51d50e22b2ca3fac1e80166200d0d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Dec 2024 06:00:54 +0100 Subject: [PATCH 035/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 6fff8232f..3f9dd0458 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.85" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ded3c7cd71d357d8fef26938c60d470a04f77eb5 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 5 Dec 2024 16:36:53 +0100 Subject: [PATCH 036/765] DCA-2390 Add python 3.13 support --- Dockerfile | 2 +- README.md | 2 +- app/util/jmeter/start_jmeter_ui.py | 2 +- app/util/pre_run/environment_checker.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9ee9b0816..efa817175 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # bzt run: docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt jira.yml # interactive run: docker run -it --entrypoint="/bin/bash" -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt -FROM python:3.12-slim-bookworm +FROM python:3.13-slim-bookworm ENV APT_INSTALL="apt-get -y install --no-install-recommends" diff --git a/README.md b/README.md index 3a3667d44..a32c0210e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ In case of technical questions, issues or problems with DC Apps Performance Tool ## Installation and set up #### Dependencies -* Python 3.9 - 3.12 and pip +* Python 3.9 - 3.13 and pip * JDK 17 or JDK 21 * Google Chrome web browser * Git client (only for Bitbucket DC) diff --git a/app/util/jmeter/start_jmeter_ui.py b/app/util/jmeter/start_jmeter_ui.py index b3c640657..ca6de3681 100644 --- a/app/util/jmeter/start_jmeter_ui.py +++ b/app/util/jmeter/start_jmeter_ui.py @@ -6,7 +6,7 @@ import yaml -SUPPORTED_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12"] +SUPPORTED_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13"] python_full_version = '.'.join(map(str, version_info[0:3])) python_short_version = '.'.join(map(str, version_info[0:2])) diff --git a/app/util/pre_run/environment_checker.py b/app/util/pre_run/environment_checker.py index 70d5a49da..5e862b38e 100644 --- a/app/util/pre_run/environment_checker.py +++ b/app/util/pre_run/environment_checker.py @@ -1,6 +1,6 @@ from sys import version_info -SUPPORTED_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12"] +SUPPORTED_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13"] python_full_version = '.'.join(map(str, version_info[0:3])) python_short_version = '.'.join(map(str, version_info[0:2])) From 01d32004c852136df0b549477fd861334b10c838 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 10 Dec 2024 12:53:08 +0200 Subject: [PATCH 037/765] added locust --- app/extension/jira/extension_ui.py | 1 + app/jmeter/jira.jmx | 491 +++++++++++++++++------- app/locustio/jira/http_actions.py | 33 +- app/selenium_ui/jira/modules.py | 1 + app/selenium_ui/jira/pages/pages.py | 26 +- app/selenium_ui/jira/pages/selectors.py | 3 + 6 files changed, 406 insertions(+), 149 deletions(-) diff --git a/app/extension/jira/extension_ui.py b/app/extension/jira/extension_ui.py index 26e4b69aa..3ad126b68 100644 --- a/app/extension/jira/extension_ui.py +++ b/app/extension/jira/extension_ui.py @@ -25,6 +25,7 @@ def app_specific_action(webdriver, datasets): # login_page.go_to() # login_page.wait_for_login_page_loaded() # login_page.set_credentials(username=username, password=password) + # login_page.wait_for_dashboard_or_first_login_loaded() # if login_page.is_first_login(): # login_page.first_login_setup() # if login_page.is_first_login_second_page(): diff --git a/app/jmeter/jira.jmx b/app/jmeter/jira.jmx index 8a783bfb6..f16f52509 100644 --- a/app/jmeter/jira.jmx +++ b/app/jmeter/jira.jmx @@ -245,54 +245,11 @@ props.put("project_pages", String.valueOf(pages)); UTF-8 ${application.postfix}/login.jsp true - POST + GET true false - - - false - os_username - ${username} - = - true - - - false - os_password - ${password} - = - true - - - false - os_destination - - = - true - - - false - user_role - - = - true - - - false - atl_token - - = - true - - - true - login - Log In - = - true - - + @@ -329,6 +286,199 @@ props.put("project_pages", String.valueOf(pages)); + + + 200 + + + Assertion.response_code + false + 2 + + + + false + legacy_form + login-form-remember-me + $1$ + NOT_FOUND + 1 + all + + false + + + + groovy + + + true + String loginform = vars.get("legacy_form"); + +if ("NOT_FOUND".equals(loginform)) { + vars.put("legacy_login_form", "false"); + log.info("2sv flow detected"); +} else { + vars.put("legacy_login_form", "true"); + log.info("Legacy login flow detected"); +} + + + + + groovy + + + true + log.info("Legacy login flow: ${legacy_login_form}") + + + + + + ${__groovy(vars.get("legacy_login_form") == 'true')} + false + true + + + + Detected the start of a redirect chain + UTF-8 + ${application.postfix}/login.jsp + true + POST + true + false + + + + false + os_username + ${username} + = + true + + + false + os_password + ${password} + = + true + + + false + os_destination + + = + true + + + false + user_role + + = + true + + + false + atl_token + + = + true + + + true + login + Log In + = + true + + + + + + + + + Accept-Language + en-US,en;q=0.5 + + + Pragma + no-cache + + + Accept + text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 + + + Upgrade-Insecure-Requests + 1 + + + Content-Type + application/x-www-form-urlencoded + + + Cache-Control + no-cache + + + Accept-Encoding + gzip, deflate + + + + + + + + ${__groovy(vars.get("legacy_login_form") == 'false')} + false + true + + + + 2sv login flow + ${application.postfix}/rest/tsv/1.0/authenticate + POST + true + true + + + + false + {"username": "${username}", + "password": "${password}", + "rememberMe": "True", + "targetUrl": "" +} + = + + + + + + + + + Content-Type + application/json + + + + + + + 200 + + + Assertion.response_code + false + 2 + + + ${application.postfix}/ @@ -2005,7 +2155,7 @@ if ( sleep_time > 0 ) { false - + ${application.postfix}/browse/${issue_key} true GET @@ -2045,7 +2195,7 @@ if ( sleep_time > 0 ) { - + false x_issue_id id="key-val" rel="(\d+)" @@ -7115,104 +7265,159 @@ if ( sleep_time > 0 ) { - - Detected the start of a redirect chain - UTF-8 - ${application.postfix}/login.jsp - true - POST - true - false - - - - false - os_username - ${app_specific_username} - = - true - - - false - os_password - ${app_specific_password} - = - true - - - false - os_destination - - = - true - - - false - user_role - - = - true - - - false - atl_token - - = - true - - - true - login - Log In - = - true - - - - + + ${__groovy(vars.get("legacy_login_form") == 'true')} + false + true + - - - - Accept-Language - en-US,en;q=0.5 - - - Pragma - no-cache - - - Accept - text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 - - - Upgrade-Insecure-Requests - 1 - - - Content-Type - application/x-www-form-urlencoded - - - Cache-Control - no-cache - - - Accept-Encoding - gzip, deflate - - - - - - groovy - - - true - vars.put("run_as_specific_user", "true") + + Detected the start of a redirect chain + UTF-8 + ${application.postfix}/login.jsp + true + POST + true + false + + + + false + os_username + ${app_specific_username} + = + true + + + false + os_password + ${app_specific_password} + = + true + + + false + os_destination + + = + true + + + false + user_role + + = + true + + + false + atl_token + + = + true + + + true + login + Log In + = + true + + + + + + + + + Accept-Language + en-US,en;q=0.5 + + + Pragma + no-cache + + + Accept + text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 + + + Upgrade-Insecure-Requests + 1 + + + Content-Type + application/x-www-form-urlencoded + + + Cache-Control + no-cache + + + Accept-Encoding + gzip, deflate + + + + + + groovy + + + true + vars.put("run_as_specific_user", "true") prev.setIgnore() - - + + + + + + ${__groovy(vars.get("legacy_login_form") == 'false')} + false + true + + + + 2sv login flow + ${application.postfix}/rest/tsv/1.0/authenticate + POST + true + true + + + + false + {"username": "${app_specific_username}", + "password": "${app_specific_password}", + "rememberMe": "True", + "targetUrl": "" +} + = + + + + + + + + + Content-Type + application/json + + + + + + + 200 + + + Assertion.response_code + false + 2 + + + ${application.postfix}/rest/api/2/myself diff --git a/app/locustio/jira/http_actions.py b/app/locustio/jira/http_actions.py index ec5a3eb9e..3e6b02661 100644 --- a/app/locustio/jira/http_actions.py +++ b/app/locustio/jira/http_actions.py @@ -25,11 +25,38 @@ def login_and_view_dashboard(locust): body = params.login_body body['os_username'] = user[0] body['os_password'] = user[1] + legacy_form = False + + # Check if 2sv login form + r = locust.get('/login.jsp', catch_response=True) + if 'login-form-remember-me' in r.content: + legacy_form = True + # 100 /login.jsp - locust.post('/login.jsp', body, - TEXT_HEADERS, - catch_response=True) + if legacy_form: + locust.post('/login.jsp', body, + TEXT_HEADERS, + catch_response=True) + logger.locust_info(f"Legacy login flow for user {user[0]}") + else: + logger.locust_info(f"2SV login flow for user {user[0]}") + + login_body = {'username': user[0], + 'password': user[1], + 'rememberMe': 'True', + 'targetUrl': '' + } + + headers = { + "Content-Type": "application/json" + } + + # 15 /rest/tsv/1.0/authenticate + locust.post('/rest/tsv/1.0/authenticate', + json=login_body, + headers=headers, + catch_response=True) r = locust.get('/', catch_response=True) if not r.content: diff --git a/app/selenium_ui/jira/modules.py b/app/selenium_ui/jira/modules.py index 091553a85..04e462d23 100644 --- a/app/selenium_ui/jira/modules.py +++ b/app/selenium_ui/jira/modules.py @@ -79,6 +79,7 @@ def sub_measure(): login_page.set_credentials( username=datasets['current_session']['username'], password=datasets['current_session']['password']) + login_page.wait_for_dashboard_or_first_login_loaded() if login_page.is_first_login(): login_page.first_login_setup() if login_page.is_first_login_second_page(): diff --git a/app/selenium_ui/jira/pages/pages.py b/app/selenium_ui/jira/pages/pages.py index e38bcf51e..197a11c0b 100644 --- a/app/selenium_ui/jira/pages/pages.py +++ b/app/selenium_ui/jira/pages/pages.py @@ -20,6 +20,10 @@ class Login(BasePage): page_loaded_selector = LoginPageLocators.system_dashboard base_url = UrlManager().host + def __init__(self, driver): + super().__init__(driver) + self.is_2sv_login = False + def is_first_login(self): return True if self.get_elements(LoginPageLocators.continue_button) else False @@ -28,6 +32,10 @@ def wait_for_login_page_loaded(self): # Jira 10.0.1 has issue when clicking too fast on login button resulting in user is not logged in. from time import sleep sleep(1) + if not self.get_elements(LoginPageLocators.login_submit_button): + self.is_2sv_login = True + print("INFO: 2sv login form") + def is_first_login_second_page(self): return True if self.get_elements(LoginPageLocators.avatar_page_next_button) else False @@ -44,9 +52,21 @@ def first_login_second_page_setup(self): self.wait_until_visible(DashboardLocators.dashboard_window) def set_credentials(self, username, password): - self.get_element(LoginPageLocators.login_field).send_keys(username) - self.get_element(LoginPageLocators.password_field).send_keys(password) - self.get_element(LoginPageLocators.login_submit_button).click() + login_field = LoginPageLocators.login_field + password_field = LoginPageLocators.password_field + submit_button = LoginPageLocators.login_submit_button + if self.is_2sv_login: + login_field = LoginPageLocators.login_field_2sv + password_field = LoginPageLocators.password_field_2sv + submit_button = LoginPageLocators.login_submit_button_2sv + + self.wait_until_visible(login_field).send_keys(username) + self.wait_until_visible(password_field).send_keys(password) + self.wait_until_visible(submit_button).click() + + def wait_for_dashboard_or_first_login_loaded(self): + self.wait_until_any_ec_presented((LoginPageLocators.system_dashboard, + LoginPageLocators.continue_button)) def __get_footer_text(self): return self.get_element(LoginPageLocators.footer).text diff --git a/app/selenium_ui/jira/pages/selectors.py b/app/selenium_ui/jira/pages/selectors.py index 43f75557c..d59b4ee26 100644 --- a/app/selenium_ui/jira/pages/selectors.py +++ b/app/selenium_ui/jira/pages/selectors.py @@ -79,6 +79,9 @@ class LoginPageLocators: login_field = (By.ID, 'login-form-username') password_field = (By.ID, 'login-form-password') login_submit_button = (By.ID, 'login-form-submit') + login_field_2sv = (By.ID, 'username-field') + password_field_2sv = (By.ID, 'password-field') + login_submit_button_2sv = (By.ID, 'login-button') system_dashboard = (By.ID, "dashboard") footer = (By.ID, 'footer-build-information') From c1c6aebb11573f62c7a174b533a369ebcda75d87 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:00:58 +0100 Subject: [PATCH 038/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 050ed1948..bc11fd5ff 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 090f8f344cd4b536122a1ad5cd64e97e63fb7e2e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:00:59 +0100 Subject: [PATCH 039/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 95de2cd7e..4b48773c3 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From d1e03f9181470611ef7dd0b5491db7c5ba58ce5a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:00:59 +0100 Subject: [PATCH 040/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 195db973d..c85b71fe8 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ec0380b394fe74cc73a2a6857021b3e858c39f61 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:01:00 +0100 Subject: [PATCH 041/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index e3c618ee9..c5f0fa9fa 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bd82ae1ffa09f64577735b52e3300dbcf6abcc6e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:01:00 +0100 Subject: [PATCH 042/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 3f9dd0458..60977da07 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.87" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 31a597f3e230187ec73972fadf6da407f0ddc8f4 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 12 Dec 2024 11:11:10 +0200 Subject: [PATCH 043/765] fix locust --- app/locustio/jira/http_actions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/locustio/jira/http_actions.py b/app/locustio/jira/http_actions.py index 3e6b02661..61a7808ee 100644 --- a/app/locustio/jira/http_actions.py +++ b/app/locustio/jira/http_actions.py @@ -29,7 +29,8 @@ def login_and_view_dashboard(locust): # Check if 2sv login form r = locust.get('/login.jsp', catch_response=True) - if 'login-form-remember-me' in r.content: + content = r.content.decode('utf-8') + if 'login-form-remember-me' in content: legacy_form = True From 50f456e74ab675005958d0031508846327be52dc Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Dec 2024 12:21:45 +0100 Subject: [PATCH 044/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 37 ++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f03970d60..f84d03bf7 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -165,6 +165,41 @@ ] } ] + }, + { + "version": "10.3.0", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-03260aba5a188e81e", + "us-east-1": "snap-087b3154bb64b625f" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-0" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-022a6d10e6fb4a24b", + "us-east-1": "snap-0a28c4d98b4f14090" + } + ] + } + ] } ] }, @@ -281,7 +316,7 @@ ] }, { - "version": "10.0.1", + "version": "10.0.1", "data": [ { "type": "local-home", From 1330a337f3f71b79c1865ac61c0d52a2de555594 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 19 Dec 2024 11:06:33 +0200 Subject: [PATCH 045/765] added argument to docker file --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index efa817175..28210ab84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ FROM python:3.13-slim-bookworm ENV APT_INSTALL="apt-get -y install --no-install-recommends" ARG CHROME_VERSION="latest" +ARG INCLUDE_BZT_TOOLS="false" ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb" @@ -29,9 +30,11 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt -RUN wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \ - tar -xzf /tmp/bzt.tar.gz -C /root && \ - rm /tmp/bzt.tar.gz +RUN if [ "$INCLUDE_BZT" = "true" ]; then \ + wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \ + tar -xzf /tmp/bzt.tar.gz -C /root && \ + rm /tmp/bzt.tar.gz; \ + fi WORKDIR /dc-app-performance-toolkit/app From 1d21633598e6e5b91c2e029a923225123b885e4e Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 20 Dec 2024 12:34:24 +0200 Subject: [PATCH 046/765] added 10.3 small jira --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 63 +++++++------------------------ 2 files changed, 15 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index a32c0210e..7c834040a 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): `9.12.12`, `9.4.25` and `10.0.1` Platform release + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.12`, `9.4.25` and `10.3.0` Platform release * Supported Jira Service Management versions: * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12`, `5.4.25` and `10.0.1` Platform release diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f84d03bf7..f9ebcf139 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -112,35 +112,35 @@ ] }, { - "version": "10.0.1", + "version": "10.3.0", "data": [ { - "type": "local-home", + "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-034eee5f34bf936b3", - "us-east-1": "snap-001d16b1ffa28ac4a" + "us-east-2": "snap-03260aba5a188e81e", + "us-east-1": "snap-087b3154bb64b625f" } ] }, { - "type": "ebs", + "type": "rds", "size": "large", "snapshots": [ { - "us-east-2": "snap-09b742ca1bb9fff88", - "us-east-1": "snap-0506e2d0d2b39e92a" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-0" } ] }, { - "type": "rds", + "type": "local-home", "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-0-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-0-1" + "us-east-2": "snap-022a6d10e6fb4a24b", + "us-east-1": "snap-0a28c4d98b4f14090" } ] }, @@ -149,8 +149,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-0ea31388ab389d097", - "us-east-1": "snap-09c71b1d40d21e408" + "us-east-2": "snap-01028de0f83e60d8f", + "us-east-1": "snap-0bd8efeebd7eabc9e" } ] }, @@ -159,43 +159,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-0-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-0-1" - } - ] - } - ] - }, - { - "version": "10.3.0", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-03260aba5a188e81e", - "us-east-1": "snap-087b3154bb64b625f" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-0" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-022a6d10e6fb4a24b", - "us-east-1": "snap-0a28c4d98b4f14090" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-3-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-0" } ] } From 3a2bdf22c1d96023d947da74976cbf93d48de26e Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Fri, 20 Dec 2024 16:14:59 +0200 Subject: [PATCH 047/765] confluence/add-9-2-support/cut-7-19-and-9-0-support --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 80 +++++-------------------------- app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 15 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index a32c0210e..1e57babf8 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): `5.12.12`, `5.4.25` and `10.0.1` Platform release * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14`, `7.19.26` and `9.0.2` Platform release + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14` and `9.2.0` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.7`, `8.9.18` and `9.0.0` Platform release diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 1db52ed20..69fd20557 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -161,7 +161,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "8.5.14" +confluence_version_tag = "9.2.0" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f84d03bf7..85f179732 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -431,15 +431,15 @@ "build_number": "9012" }, { - "version": "7.19.26", + "version": "9.2.0", "data": [ { "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "snap-0110ef301c0517b63", - "us-east-1": "snap-02790fdfa10bbb675" + "us-east-2": "snap-03bd9289ff7b87051", + "us-east-1": "snap-0d1ceb385cdf36d84" } ] }, @@ -448,8 +448,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-26", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-7-19-26" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-0" } ] }, @@ -458,8 +458,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0b5b1710dba17a851", - "us-east-1": "snap-09c20285b19c42232" + "us-east-2": "snap-0877428a1f19c5de2", + "us-east-1": "snap-04deb20a69b0dc23b" } ] }, @@ -468,8 +468,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-26", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-19-26" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-0" } ] }, @@ -478,69 +478,13 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-054156e5c540b25fa", - "us-east-1": "snap-07b216c16361eca04" + "us-east-2": "snap-0cee0a51628de136e", + "us-east-1": "snap-0c7d00e251e7ce592" } ] } ], - "build_number": "8804" - }, - { - "version": "9.0.2", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0708fe4076049b8ef", - "us-east-1": "snap-01f51febcf56e2ae5" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-0-2", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-0-2" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-082ccc7959ebdc851", - "us-east-1": "snap-0f2bf3233418c8a30" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-0-2", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-0-2" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-06c5d1e6a8009fefb", - "us-east-1": "snap-063e03017a826e78e" - } - ] - } - ], - "build_number": "9104" + "build_number": "9109" } ] }, diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 593501b53..9d4864641 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -172,7 +172,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "8.5.14" +confluence_version_tag = "9.2.0" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "large" From 3bbd3d84c6e3c45a08df77232d3b9b97f516c466 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 23 Dec 2024 15:20:40 +0200 Subject: [PATCH 048/765] jsm/support-10-3-1/eol-10-0-and-5-4 --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 77 +++++-------------------------- app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 14 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index 1e57babf8..7fc0966cc 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): `9.12.12`, `9.4.25` and `10.0.1` Platform release * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12`, `5.4.25` and `10.0.1` Platform release + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12` and `10.3.1` * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14` and `9.2.0` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 69fd20557..8e51b901f 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -92,7 +92,7 @@ jira_image_repository = "atlassian/jira-software" jira_version_tag = "9.12.12" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "5.12.12" +# jira_version_tag = "10.3.1" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large jira_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 85f179732..907b6ac27 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -261,15 +261,15 @@ ] }, { - "version": "5.4.25", + "version": "10.3.1", "data": [ { "type": "local-home", "size": "large", "snapshots": [ { - "us-east-2": "snap-047ef4054461dd0fa", - "us-east-1": "snap-0cd08ef369f1df34e" + "us-east-2": "snap-0dccf556703c13e7d", + "us-east-1": "snap-06b87e40b22f84c9f" } ] }, @@ -278,8 +278,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0d0975b249e46ad98", - "us-east-1": "snap-088b77461fd57c9a2" + "us-east-2": "snap-0ca0574941e952446", + "us-east-1": "snap-0f24c67fa1a002b07" } ] }, @@ -288,8 +288,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-25", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-4-25" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-1" } ] }, @@ -298,8 +298,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-02402e9518294e486", - "us-east-1": "snap-048268c30f4165bae" + "us-east-2": "snap-033df6a68e1378d2d", + "us-east-1": "snap-00a99bacfb8d6932a" } ] }, @@ -308,63 +308,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-25", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-4-25" - } - ] - } - ] - }, - { - "version": "10.0.1", - "data": [ - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-019d79330995b9db7", - "us-east-1": "snap-08478133b48785725" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0f67c466251f5ead9", - "us-east-1": "snap-0d8a6668edce4d004" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-0-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-0-1" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0d582a31cfa7f908c", - "us-east-1": "snap-05b5d63ad1f2c0802" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-0-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-0-1" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-1" } ] } diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 9d4864641..dd696253f 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -114,7 +114,7 @@ jira_version_tag = "9.12.12" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "5.12.12" +# jira_version_tag = "10.3.1" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large. jira_dataset_size = "large" From 7c1f45e84524149537f36a5ec13710e4f9072271 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 24 Dec 2024 15:41:12 +0200 Subject: [PATCH 049/765] bamboo/add-10-2-0-support --- README.md | 2 +- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8516400f7..52a725ad2 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.0.0` * Supported Bamboo versions: - * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.6.6` and `10.0.1` Platform release + * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.0` ## Support In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 558a4b3a9..e31018d5b 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 9.6.6 + 10.2.0 diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index dd696253f..726844de3 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -399,8 +399,8 @@ crowd_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] # By default, latest supported by DCAPT version is set. # https://hub.docker.com/r/atlassian/bamboo/tags # https://hub.docker.com/r/atlassian/bamboo-agent-base/tags -bamboo_version_tag = "9.6.6" -bamboo_agent_version_tag = "9.6.6" +bamboo_version_tag = "10.2.0" +bamboo_agent_version_tag = "10.2.0" # Helm chart version of Bamboo and Bamboo agent instances # bamboo_helm_chart_version = "" From b5fc1ba7a0cd4c818062ee28d04ba1f8f59e2d66 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 24 Dec 2024 15:58:45 +0200 Subject: [PATCH 050/765] upd psql version for bamboo --- app/util/k8s/dcapt.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 726844de3..1152c4ddd 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -461,7 +461,7 @@ bamboo_nfs_limits_memory = "2Gi" # Documentation can be found via: # https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.DBInstanceClass.html # https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS -bamboo_db_major_engine_version = "14" +bamboo_db_major_engine_version = "15" bamboo_db_instance_class = "db.t3.medium" bamboo_db_allocated_storage = 100 bamboo_db_iops = 1000 From acafa7e8a57ca01c83e4b9c096ae7db1fed92f17 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 28 Dec 2024 06:01:58 +0100 Subject: [PATCH 051/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index bc11fd5ff..ea0e58685 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f63eeb4007582076059dde449df33a660418f7e4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 28 Dec 2024 06:01:59 +0100 Subject: [PATCH 052/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 4b48773c3..1ebc03e1e 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b1dfd5d1937f4b77092b49a5ceb45f645db984ea Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 28 Dec 2024 06:02:00 +0100 Subject: [PATCH 053/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index c85b71fe8..9fce9b588 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6aad95dcc9519c998ef7a60e31db3c2dfd24c395 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 28 Dec 2024 06:02:01 +0100 Subject: [PATCH 054/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index c5f0fa9fa..ee4275218 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7a616e4cdd9b366b697c6cd16ad9dcd4a1ea88f5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 28 Dec 2024 06:02:01 +0100 Subject: [PATCH 055/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 60977da07..fb76fb876 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.108" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 46d242792616e3aaf13a5fb6a67da244e0b40a20 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Jan 2025 06:00:47 +0100 Subject: [PATCH 056/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index ea0e58685..80bb07431 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ad9b3bb9171eed536b4473c81b731b6b8a7c5fc6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Jan 2025 06:00:47 +0100 Subject: [PATCH 057/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 1ebc03e1e..bc3ee54f2 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c8b7f212987177d97f7dfe98c9adae325de8f2bc Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Jan 2025 06:00:48 +0100 Subject: [PATCH 058/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 9fce9b588..86237a160 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From cd122aa684210076b258940c2cf73f7c12c6cf97 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Jan 2025 06:00:49 +0100 Subject: [PATCH 059/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index ee4275218..e2949adc3 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6de7691ce0f82294f02a65c1109c13805b16b5b5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Jan 2025 06:00:49 +0100 Subject: [PATCH 060/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index fb76fb876..52c3acfd6 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.204" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8e8fd2c0f5dff1cc57cebb4052a35b58bc266ed9 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 8 Jan 2025 12:56:51 +0200 Subject: [PATCH 061/765] update crowd version to 6.2.0 --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 52a725ad2..133ee9f34 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.7`, `8.9.18` and `9.0.0` Platform release * Supported Crowd versions: - * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.0.0` + * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.2.0` * Supported Bamboo versions: * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.0` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 6335668f7..c3e97360e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -540,15 +540,15 @@ "crowd": { "versions": [ { - "version": "6.0.0", + "version": "6.2.0", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-0447ca5809d646efe", - "us-east-1": "snap-0877485f60faa521c" + "us-east-2": "snap-06c0080a7532b6b14", + "us-east-1": "snap-01231c998f6613955" } ] }, @@ -557,8 +557,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-6-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-6-0-0" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-6-2-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-6-2-0" } ] } From f209ddcd30c31d6efc5854fbf45cc4edd78c2c36 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 14 Jan 2025 12:36:24 +0200 Subject: [PATCH 062/765] bump jira version 8-6 release --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 44 +++++++++++++++---------------- app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 52a725ad2..95333003d 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): `9.12.12`, `9.4.25` and `10.3.0` Platform release + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.17`, `9.4.30` and `10.3.0` Platform release * Supported Jira Service Management versions: * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12` and `10.3.1` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 8e51b901f..2ee5bc535 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -89,7 +89,7 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version. -jira_version_tag = "9.12.12" +jira_version_tag = "9.12.17" # JSM version # ! REQUIRED for JSM ! # jira_version_tag = "10.3.1" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 6335668f7..5187eaa10 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -2,15 +2,15 @@ "jira": { "versions": [ { - "version": "9.12.12", + "version": "9.12.17", "data": [ { "type": "local-home", "size": "large", "snapshots": [ { - "us-east-2": "snap-0edc32e9a8fb4f56d", - "us-east-1": "snap-0dc75041c98efa31e" + "us-east-2": "snap-0150ffccd83d4ad8b", + "us-east-1": "snap-03cd05deb4823e36d" } ] }, @@ -19,8 +19,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0fa88c439fd1e26bf", - "us-east-1": "snap-02b543a2f7c6cd857" + "us-east-2": "snap-052247488a495ba96", + "us-east-1": "snap-03454b600cf02a772" } ] }, @@ -29,8 +29,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-12-12", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-12-12" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-12-17", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-12-17" } ] }, @@ -39,8 +39,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-03fa93593b6986515", - "us-east-1": "snap-022515b35736dc918" + "us-east-2": "snap-0dc9f5f8739e96aa4", + "us-east-1": "snap-07f295b5c6da0224f" } ] }, @@ -49,23 +49,23 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-12-12", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-12" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-12-17", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-17" } ] } ] }, { - "version": "9.4.25", + "version": "9.4.30", "data": [ { "type": "local-home", "size": "large", "snapshots": [ { - "us-east-2": "snap-0e90b3edf64661cd9", - "us-east-1": "snap-0a6f40e62b2d2717b" + "us-east-2": "snap-04a15f7e63a054fd6", + "us-east-1": "snap-0c18a2a5ef717a7c8" } ] }, @@ -74,8 +74,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0bdff246c26d37056", - "us-east-1": "snap-031107775912a1561" + "us-east-2": "snap-00145917c8e9b5e32", + "us-east-1": "snap-02fca3f2946e47d7d" } ] }, @@ -84,8 +84,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-25", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-4-25" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-30", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-4-30" } ] }, @@ -94,8 +94,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-08518a678828ac8bd", - "us-east-1": "snap-0eb15a0f1652f6daa" + "us-east-2": "snap-0edc4191e6cd06fb1", + "us-east-1": "snap-08fb8242beec78b53" } ] }, @@ -104,8 +104,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-25", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-4-25" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-30", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-4-30" } ] } diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 1152c4ddd..ccdc0b716 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -110,7 +110,7 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version -jira_version_tag = "9.12.12" +jira_version_tag = "9.12.17" # JSM version # ! REQUIRED for JSM ! From 262c12b6b99358aa28388cdf8c1be631ffdd574f Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 14 Jan 2025 13:04:33 +0200 Subject: [PATCH 063/765] fix comments --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt.tfvars | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 95333003d..08fa6c3e7 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): `9.12.17`, `9.4.30` and `10.3.0` Platform release + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.17`, `9.4.30` and `10.3.0` * Supported Jira Service Management versions: * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12` and `10.3.1` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 2ee5bc535..67664ccd3 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -89,7 +89,7 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version. -jira_version_tag = "9.12.17" +jira_version_tag = "10.3.0" # JSM version # ! REQUIRED for JSM ! # jira_version_tag = "10.3.1" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index ccdc0b716..1483cdfb2 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -110,7 +110,7 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version -jira_version_tag = "9.12.17" +jira_version_tag = "10.3.0" # JSM version # ! REQUIRED for JSM ! From 4a7854884f29db0b029fe1aed829940260ef5246 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 14 Jan 2025 14:43:34 +0200 Subject: [PATCH 064/765] bitbucket/add-9-4-support-8-9-eol --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 63 +++++-------------------------- app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 12 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 9e7b5dde0..09b2e663a 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14` and `9.2.0` * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.7`, `8.9.18` and `9.0.0` Platform release + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.7` and `9.4.1` * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.2.0` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 67664ccd3..3c92e75e9 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -238,7 +238,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "8.9.18" +bitbucket_version_tag = "9.4.1" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 33cc1802f..cc325c33d 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -400,51 +400,6 @@ }, "bitbucket": { "versions": [ - { - "version": "8.9.18", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-09345723dd6284ba5", - "us-east-1": "snap-077120ab369e77e11" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-9-18", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-9-18" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0efc4e58392e3c97c", - "us-east-1": "snap-0621ce307cfc464a5" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-18", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-9-18" - } - ] - } - ] - }, { "version": "8.19.7", "data": [ @@ -491,15 +446,15 @@ ] }, { - "version": "9.0.0", + "version": "9.4.1", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-0ac664e91507f0e9d", - "us-east-1": "snap-0961da714ef84fa67" + "us-east-2": "snap-0119ddc3496991c22", + "us-east-1": "snap-091b87a31f67baa03" } ] }, @@ -508,8 +463,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-0-0" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-4-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-4-1" } ] }, @@ -518,8 +473,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-04268cd0703e449ae", - "us-east-1": "snap-0e7c7b549b51011ed" + "us-east-2": "snap-08f182f7d6b2f506b", + "us-east-1": "snap-0c55d1e12cca090a1" } ] }, @@ -528,8 +483,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-9-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-0-0" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-9-4-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-4-1" } ] } diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 1483cdfb2..14b9683cc 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -247,7 +247,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "8.9.18" +bitbucket_version_tag = "9.4.1" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "large" From adf3f278dd07045243ec34150d02a8bc22077f94 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Jan 2025 06:02:06 +0100 Subject: [PATCH 065/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 80bb07431..43d7732b8 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 87e371aa695ee26a73859633b45d62b929a7ba3a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Jan 2025 06:02:07 +0100 Subject: [PATCH 066/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index bc3ee54f2..525ae8e9c 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a42d6d6e091721236b517dad732630a9f923fe04 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Jan 2025 06:02:07 +0100 Subject: [PATCH 067/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 86237a160..4ab60f6df 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 22d28c7051d6a08c9bf89e3dd4635ce34f8217c8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Jan 2025 06:02:08 +0100 Subject: [PATCH 068/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index e2949adc3..555aabed7 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 11d5ece85c92abbf67c1fc68f8c990fee91a806b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Jan 2025 06:02:09 +0100 Subject: [PATCH 069/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 52c3acfd6..97fecb316 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "131.0.6778.264" # Supports Chrome version 131. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 608cda7caacb29e68e309b5e8c2eaf04543d0539 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 15 Jan 2025 15:22:15 +0200 Subject: [PATCH 070/765] eol jira 9.4 --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 55 ------------------------------- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/README.md b/README.md index 9e7b5dde0..4c3d2cdaa 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): `9.12.17`, `9.4.30` and `10.3.0` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.17` and `10.3.0` * Supported Jira Service Management versions: * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12` and `10.3.1` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 33cc1802f..124d68b28 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -56,61 +56,6 @@ } ] }, - { - "version": "9.4.30", - "data": [ - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-04a15f7e63a054fd6", - "us-east-1": "snap-0c18a2a5ef717a7c8" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-00145917c8e9b5e32", - "us-east-1": "snap-02fca3f2946e47d7d" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-30", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-4-30" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0edc4191e6cd06fb1", - "us-east-1": "snap-08fb8242beec78b53" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-30", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-4-30" - } - ] - } - ] - }, { "version": "10.3.0", "data": [ From c6b43e9092ae6a5cd39f0d0af632769c373575b7 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 15 Jan 2025 16:00:48 +0100 Subject: [PATCH 071/765] DCA-2412 dependenices bump --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- requirements.txt | 14 +++++++------- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 80bb07431..8ef1a1219 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -51,7 +51,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.25.0 + - selenium==4.27.1 execution: - scenario: jmeter executor: jmeter diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 86237a160..9270c774d 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -37,7 +37,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.25.0 + - selenium==4.27.1 execution: - scenario: ${load_executor} concurrency: ${concurrency} diff --git a/app/confluence.yml b/app/confluence.yml index bc3ee54f2..8979556fb 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -52,7 +52,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.25.0 + - selenium==4.27.1 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jira.yml b/app/jira.yml index e2949adc3..bf01af8ed 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -52,7 +52,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.25.0 + - selenium==4.27.1 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jsm.yml b/app/jsm.yml index 52c3acfd6..78b2f691a 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -68,7 +68,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.25.0 + - selenium==4.27.1 execution: - scenario: ${load_executor}_agents executor: ${load_executor} diff --git a/requirements.txt b/requirements.txt index 6b91e32c0..83e50a2ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -matplotlib==3.9.2 +matplotlib==3.10.0 pandas==2.2.3 -pytest==8.3.3 -locust==2.32.0 -selenium==4.25.0 +pytest==8.3.4 +locust==2.32.6 +selenium==4.27.1 filelock==3.16.1 -packaging==24.1 -prettytable==3.11.0 +packaging==24.2 +prettytable==3.12.0 bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils -boto3==1.35.47 +boto3==1.35.99 retry==0.9.2 From 6cccc66e403d9c88bbb12ddaf0c835f7541abb51 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 09:26:38 +0000 Subject: [PATCH 072/765] Update dependency boto3 to v1.36.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 83e50a2ca..95821a19e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ filelock==3.16.1 packaging==24.2 prettytable==3.12.0 bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils -boto3==1.35.99 +boto3==1.36.0 retry==0.9.2 From 338d466cbe35f06ff2c65f820d0f2365bc35f95e Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Thu, 16 Jan 2025 15:21:13 +0200 Subject: [PATCH 073/765] bamboo/upd-pom-dependencies --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 14 +++++++------- app/util/k8s/dcapt.tfvars | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index e31018d5b..380d6b29a 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -62,17 +62,17 @@ com.google.guava guava - 33.3.1-jre + 33.4.0-jre com.fasterxml.jackson.core jackson-core - 2.18.1 + 2.18.2 com.fasterxml.jackson.core jackson-databind - 2.18.1 + 2.18.2 com.jayway.jsonpath @@ -92,22 +92,22 @@ commons-codec commons-codec - 1.17.1 + 1.17.2 org.apache.logging.log4j log4j-api - 2.24.1 + 2.24.3 org.apache.logging.log4j log4j-core - 2.24.1 + 2.24.3 org.apache.logging.log4j log4j-slf4j-impl - 2.24.1 + 2.24.3 diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 14b9683cc..fe494eb2c 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -461,7 +461,7 @@ bamboo_nfs_limits_memory = "2Gi" # Documentation can be found via: # https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.DBInstanceClass.html # https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS -bamboo_db_major_engine_version = "15" +bamboo_db_major_engine_version = "14" bamboo_db_instance_class = "db.t3.medium" bamboo_db_allocated_storage = 100 bamboo_db_iops = 1000 From 2f9868103a848327e27da3b94f95e2222a8deaf8 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 16 Jan 2025 16:22:46 +0100 Subject: [PATCH 074/765] Bump TF version to 2.9.6 --- app/util/k8s/README.MD | 24 +++++++++---------- ...s-performance-toolkit-user-guide-bamboo.md | 8 +++---- ...erformance-toolkit-user-guide-bitbucket.md | 16 ++++++------- ...rformance-toolkit-user-guide-confluence.md | 16 ++++++------- ...ps-performance-toolkit-user-guide-crowd.md | 14 +++++------ ...pps-performance-toolkit-user-guide-jira.md | 16 ++++++------- ...apps-performance-toolkit-user-guide-jsm.md | 16 ++++++------- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/app/util/k8s/README.MD b/app/util/k8s/README.MD index 46947a6b2..69cf60162 100644 --- a/app/util/k8s/README.MD +++ b/app/util/k8s/README.MD @@ -32,7 +32,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` ### Terminate development environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -44,7 +44,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.4 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.6 ./uninstall.sh -c conf.tfvars ``` # Enterprise-scale environment @@ -61,7 +61,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` ### Terminate enterprise-scale environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -73,7 +73,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.4 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.6 ./uninstall.sh -c conf.tfvars ``` # Collect detailed k8s logs @@ -93,7 +93,7 @@ export REGION=us-east-2 docker run --pull=always --env-file aws_envs \ -v "/$PWD/k8s_logs:/data-center-terraform/k8s_logs" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.4 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs +-it atlassianlabs/terraform:2.9.6 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs ``` # Force terminate cluster @@ -126,7 +126,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.4 bash + -it atlassianlabs/terraform:2.9.6 bash ``` 5. Connect to the product pod. Example below for jira pod with number 0. For other product or pod number change `PRODUCT_POD` accordingly. @@ -150,7 +150,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ - -it atlassianlabs/terraform:2.9.4 bash + -it atlassianlabs/terraform:2.9.6 bash ``` 5. Copy code base and connect to the execution environment pod: ``` bash @@ -178,7 +178,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e REGION=$REGION \ -e PRODUCT=$PRODUCT \ -v "/$PWD/script-runner.yml:/data-center-terraform/script-runner.yml" \ - -it atlassianlabs/terraform:2.9.4 bash + -it atlassianlabs/terraform:2.9.6 bash ``` 5. Run following commands one by one inside docker container: ``` bash @@ -206,7 +206,7 @@ To enable detailed CPU/Memory monitoring and Grafana dashboards for visualisatio docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.4 bash + -it atlassianlabs/terraform:2.9.6 bash ``` ``` bash aws eks update-kubeconfig --name atlas-$ENVIRONMENT_NAME-cluster --region $REGION @@ -242,7 +242,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml ``` # Retry to copy run results from the execution environment pod to local @@ -259,7 +259,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/copy_run_results.sh:/data-center-terraform/copy_run_results.sh" \ - -it atlassianlabs/terraform:2.9.4 bash copy_run_results.sh + -it atlassianlabs/terraform:2.9.6 bash copy_run_results.sh ``` # Debug AWS required policies @@ -268,7 +268,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n 3. Start and ssh to `atlassianlabs/terraform` docker container: ``` bash docker run --pull=always --env-file aws_envs \ - -it atlassianlabs/terraform:2.9.4 bash + -it atlassianlabs/terraform:2.9.6 bash ``` 4. Make sure you have IAM policies with names `policy1`, `policy2`, created from [policy1.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy1.json) and [policy2.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy2.json). 5. Run following commands one by one inside docker container to get effective policies permissions: diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 169d905ca..12394ac7b 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -102,7 +102,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. @@ -303,7 +303,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -334,7 +334,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -368,7 +368,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 98031c489..5d516a8ff 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -115,7 +115,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -319,7 +319,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -394,7 +394,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -425,7 +425,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -475,7 +475,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -500,7 +500,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -513,7 +513,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -542,7 +542,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index 445cfd1cd..68fbc7fd2 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -474,7 +474,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -504,7 +504,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index f395ed4ae..b804a44a0 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -97,7 +97,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -208,7 +208,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -237,7 +237,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -296,7 +296,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -320,7 +320,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -347,7 +347,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -390,7 +390,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 6eb913efe..9367d7a07 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -122,7 +122,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -423,7 +423,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -498,7 +498,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -550,7 +550,7 @@ The re-index time for Jira is about ~50-70 minutes. -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -636,7 +636,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -649,7 +649,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -678,7 +678,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index b9f913f6d..4194a44b6 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -124,7 +124,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -459,7 +459,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -539,7 +539,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -594,7 +594,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -679,7 +679,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -692,7 +692,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -721,7 +721,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From f06c603d66285c364f9460af46b00ccd668d61a0 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 17 Jan 2025 11:59:27 +0200 Subject: [PATCH 075/765] bump bb to 8-19-14 --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 09b2e663a..4a9e6f836 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14` and `9.2.0` * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.7` and `9.4.1` + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.14` and `9.4.1` * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.2.0` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index cc325c33d..8f20361ac 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -401,15 +401,15 @@ "bitbucket": { "versions": [ { - "version": "8.19.7", + "version": "8.19.14", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-0763969979fa4a043", - "us-east-1": "snap-0cae984360987eb88" + "us-east-2": "snap-0798bf7120fded49c", + "us-east-1": "snap-0f5201b2552f9d977" } ] }, @@ -418,8 +418,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-19-7", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-19-7" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-19-14", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-19-14" } ] }, @@ -428,8 +428,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-0a29829d9651d8f0f", - "us-east-1": "snap-0514287d8adcd80ea" + "us-east-2": "snap-07833b387b8dd6736", + "us-east-1": "snap-0682852926407d536" } ] }, @@ -438,8 +438,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-7", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-7" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-14", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-14" } ] } From c1f2fb98e8206a44a06d83b5f46dd218d0f89b8d Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Fri, 17 Jan 2025 15:08:01 +0200 Subject: [PATCH 076/765] jsm/confluence/bump-versions --- README.md | 4 +-- app/util/k8s/dcapt-snapshots.json | 44 +++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 7e439d519..b50aa3c1f 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ 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): `9.12.17` and `10.3.0` * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12` and `10.3.1` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.17` and `10.3.1` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14` and `9.2.0` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.18` and `9.2.0` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.14` and `9.4.1` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index dbbe2cfba..044dfc3f9 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -116,15 +116,15 @@ "jsm": { "versions": [ { - "version": "5.12.12", + "version": "5.12.17", "data": [ { "type": "local-home", "size": "large", "snapshots": [ { - "us-east-2": "snap-08bca73a2953fcfa4", - "us-east-1": "snap-03f59681b58506b9b" + "us-east-2": "snap-0b7eef76ade618a32", + "us-east-1": "snap-0d0a260c6564be370" } ] }, @@ -133,8 +133,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0420b7230a8fc6427", - "us-east-1": "snap-05046d32748fffb03" + "us-east-2": "snap-019290fc0d58fe919", + "us-east-1": "snap-0e4965f909a1564c8" } ] }, @@ -143,8 +143,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-12-12", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-12-12" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-12-17", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-12-17" } ] }, @@ -153,8 +153,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-0ede570b707cb70b4", - "us-east-1": "snap-0c862b084379be99e" + "us-east-2": "snap-04360846db0df3352", + "us-east-1": "snap-0489ec755e5c9c61c" } ] }, @@ -163,8 +163,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-12-12", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-12" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-12-17", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-17" } ] } @@ -230,15 +230,15 @@ "confluence": { "versions": [ { - "version": "8.5.14", + "version": "8.5.18", "data": [ { "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "snap-0ab8b4f943983c080", - "us-east-1": "snap-0b8a90c1e52f81419" + "us-east-2": "snap-0109f4729e0ae632a", + "us-east-1": "snap-0c4ea051fbe1d7855" } ] }, @@ -247,8 +247,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-14", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-14" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-18", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-18" } ] }, @@ -257,8 +257,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-07d8d8583822fb512", - "us-east-1": "snap-0324e1b2130be6fef" + "us-east-2": "snap-0f4fb2beb7ad38c9b", + "us-east-1": "snap-058e65850ec984202" } ] }, @@ -267,8 +267,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-14", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-14" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-18", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-18" } ] }, @@ -277,8 +277,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0f100550395f59e86", - "us-east-1": "snap-00624aeb7d3068a07" + "us-east-2": "snap-04bccf3e19b8c2a77", + "us-east-1": "snap-06b41ef7cd1a1b01e" } ] } From 8eb2c8469cf101754130d1c8087534e5139b5422 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 20 Jan 2025 16:22:05 +0200 Subject: [PATCH 077/765] add jsm support fixes --- app/jmeter/jsm_agents.jmx | 240 ++++++++++++++---- app/jmeter/jsm_customers.jmx | 166 ++++++++++-- .../jsm/agents/agents_http_actions.py | 30 ++- .../jsm/customers/customers_http_actions.py | 65 ++++- app/selenium_ui/jsm/modules_agents.py | 1 + app/selenium_ui/jsm/modules_customers.py | 2 +- app/selenium_ui/jsm/pages/agent_pages.py | 27 +- app/selenium_ui/jsm/pages/agent_selectors.py | 3 + app/selenium_ui/jsm/pages/customer_pages.py | 31 ++- .../jsm/pages/customer_selectors.py | 4 + 10 files changed, 480 insertions(+), 89 deletions(-) diff --git a/app/jmeter/jsm_agents.jmx b/app/jmeter/jsm_agents.jmx index 37c7ba051..6116fd4dc 100644 --- a/app/jmeter/jsm_agents.jmx +++ b/app/jmeter/jsm_agents.jmx @@ -253,54 +253,11 @@ UTF-8 ${application.postfix}/login.jsp true - POST + GET true false - - - false - os_username - ${username} - = - true - - - false - os_password - ${password} - = - true - - - false - os_destination - - = - true - - - false - user_role - - = - true - - - false - atl_token - - = - true - - - true - login - Log In - = - true - - + @@ -337,6 +294,199 @@ + + + 200 + + + Assertion.response_code + false + 2 + + + + false + legacy_form + login-form-remember-me + $1$ + NOT_FOUND + 1 + all + + false + + + + groovy + + + true + String loginform = vars.get("legacy_form"); + +if ("NOT_FOUND".equals(loginform)) { + vars.put("legacy_login_form", "false"); + log.info("2sv flow detected"); +} else { + vars.put("legacy_login_form", "true"); + log.info("Legacy login flow detected"); +} + + + + + groovy + + + true + log.info("Legacy login flow: ${legacy_login_form}") + + + + + + ${__groovy(vars.get("legacy_login_form") == 'true')} + false + true + + + + Detected the start of a redirect chain + UTF-8 + ${application.postfix}/login.jsp + true + POST + true + false + + + + false + os_username + ${username} + = + true + + + false + os_password + ${password} + = + true + + + false + os_destination + + = + true + + + false + user_role + + = + true + + + false + atl_token + + = + true + + + true + login + Log In + = + true + + + + + + + + + Accept-Language + en-US,en;q=0.5 + + + Pragma + no-cache + + + Accept + text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 + + + Upgrade-Insecure-Requests + 1 + + + Content-Type + application/x-www-form-urlencoded + + + Cache-Control + no-cache + + + Accept-Encoding + gzip, deflate + + + + + + + + ${__groovy(vars.get("legacy_login_form") == 'false')} + false + true + + + + 2sv login flow + ${application.postfix}/rest/tsv/1.0/authenticate + POST + true + true + + + + false + {"username": "${username}", + "password": "${password}", + "rememberMe": "True", + "targetUrl": "" +} + = + + + + + + + + + Content-Type + application/json + + + + + + + 200 + + + Assertion.response_code + false + 2 + + + ${application.postfix}/ diff --git a/app/jmeter/jsm_customers.jmx b/app/jmeter/jsm_customers.jmx index 753a1493d..d3806b87c 100644 --- a/app/jmeter/jsm_customers.jmx +++ b/app/jmeter/jsm_customers.jmx @@ -249,33 +249,18 @@ import org.apache.commons.io.FileUtils; false - - ${application.postfix}/servicedesk/customer/user/login + + ${application.postfix}/login.jsp true - POST + GET true false - - - true - os_password - ${password} - = - true - - - true - os_username - ${username} - = - true - - + - + Accept @@ -296,6 +281,147 @@ import org.apache.commons.io.FileUtils; + + false + legacy_form + login-form-remember-me + $1$ + NOT_FOUND + 1 + all + + false + + + + groovy + + + true + String loginform = vars.get("legacy_form"); + +if ("NOT_FOUND".equals(loginform)) { + vars.put("legacy_login_form", "false"); + log.info("2sv flow detected"); +} else { + vars.put("legacy_login_form", "true"); + log.info("Legacy login flow detected"); +} + + + + + groovy + + + true + log.info("Legacy login flow: ${legacy_login_form}") + + + + + + ${__groovy(vars.get("legacy_login_form") == 'true')} + false + true + + + + ${application.postfix}/servicedesk/customer/user/login + true + POST + true + false + + + + true + os_password + ${password} + = + true + + + true + os_username + ${username} + = + true + + + + + + + + + Accept + */* + + + X-Requested-With + XMLHttpRequest + + + Content-Type + application/x-www-form-urlencoded + + + X-Atlassian-Token + no-check + + + + + + + + ${__groovy(vars.get("legacy_login_form") == 'false')} + false + true + + + + 2sv login flow + ${application.postfix}/rest/tsv/1.0/authenticate + POST + true + true + + + + false + {"username": "${username}", + "password": "${password}", + "rememberMe": "True", + "targetUrl": "" +} + = + + + + + + + + + Content-Type + application/json + + + + + + + 200 + + + Assertion.response_code + false + 2 + + + ${application.postfix}/servicedesk/customer/portals diff --git a/app/locustio/jsm/agents/agents_http_actions.py b/app/locustio/jsm/agents/agents_http_actions.py index 562010012..2b4de9e5b 100644 --- a/app/locustio/jsm/agents/agents_http_actions.py +++ b/app/locustio/jsm/agents/agents_http_actions.py @@ -51,7 +51,35 @@ def agent_login_and_view_dashboard(locust, jsm_agent_dataset): body['os_username'] = user[0] body['os_password'] = user[1] - locust.post('/login.jsp', body, TEXT_HEADERS, catch_response=True) + legacy_form = False + + # is 2sv login form + r = locust.get('/login.jsp', catch_response=True) + if b'login-form-remember-me' in r.content: + legacy_form = True + + if legacy_form: + locust.post('/login.jsp', body, TEXT_HEADERS, catch_response=True) + logger.locust_info(f"Legacy login flow for user {user[0]}") + else: + logger.locust_info(f"2SV login flow for user {user[0]}") + + login_body = {'username': user[0], + 'password': user[1], + 'rememberMe': 'True', + 'targetUrl': '' + } + + headers = { + "Content-Type": "application/json" + } + + # 15 /rest/tsv/1.0/authenticate + locust.post('/rest/tsv/1.0/authenticate', + json=login_body, + headers=headers, + catch_response=True) + r = locust.get('/', catch_response=True) if not r.content: raise Exception('Please check server hostname in jsm.yml file') diff --git a/app/locustio/jsm/customers/customers_http_actions.py b/app/locustio/jsm/customers/customers_http_actions.py index a378cd05d..d4b00f7b6 100644 --- a/app/locustio/jsm/customers/customers_http_actions.py +++ b/app/locustio/jsm/customers/customers_http_actions.py @@ -47,22 +47,61 @@ def customer_login_and_view_portals(locust): locust.session_data_storage['username'] = user[0] locust.session_data_storage['password'] = user[1] - r = locust.post( - '/servicedesk/customer/user/login', - body, - headers=JSM_CUSTOMERS_HEADERS, - catch_response=True) + legacy_form = False - locust.get('/servicedesk/customer/portals', catch_response=True) + # is 2sv login form + r = locust.get('/login.jsp', catch_response=True) + if b'login-form-remember-me' in r.content: + legacy_form = True - locust.post( - '/rest/servicedesk/1/customer/models', - json=params.resources_body.get("115"), - headers=RESOURCE_HEADERS, - catch_response=True) + if legacy_form: + r = locust.post( + '/servicedesk/customer/user/login', + body, + headers=JSM_CUSTOMERS_HEADERS, + catch_response=True) + + locust.get('/servicedesk/customer/portals', catch_response=True) + + locust.post( + '/rest/servicedesk/1/customer/models', + json=params.resources_body.get("115"), + headers=RESOURCE_HEADERS, + catch_response=True) + + assert '"loginSucceeded":true' in r.content.decode('utf-8'), 'Customer login is failed' + + else: + logger.locust_info(f"2SV login flow for user {user[0]}") + + login_body = {'username': user[0], + 'password': user[1], + 'rememberMe': 'True', + 'targetUrl': '' + } + + headers = { + "Content-Type": "application/json", + "Accept": "*/*" + } + + locust.post('/rest/tsv/1.0/authenticate?os_authType=none', + json=login_body, + headers=headers, + catch_response=True) + + locust.get('/servicedesk/customer/portals', catch_response=True) + + locust.post( + '/rest/servicedesk/1/customer/models', + json=params.resources_body.get("115"), + headers=RESOURCE_HEADERS, + catch_response=True) - assert '"loginSucceeded":true' in r.content.decode( - 'utf-8'), 'Customer login is failed' + r = locust.get('/', catch_response=True) + if not r.content: + raise Exception('Please check server hostname in jsm.yml file') + r.content.decode('utf-8') @jsm_customer_measure('locust_customer_view_portal') diff --git a/app/selenium_ui/jsm/modules_agents.py b/app/selenium_ui/jsm/modules_agents.py index ace28dc37..bfe991a95 100644 --- a/app/selenium_ui/jsm/modules_agents.py +++ b/app/selenium_ui/jsm/modules_agents.py @@ -92,6 +92,7 @@ def measure(): @print_timing("selenium_agent_login:open_login_page") def sub_measure(): login_page.go_to() + login_page.is_2sv() sub_measure() @print_timing("selenium_agent_login:login_and_view_dashboard") diff --git a/app/selenium_ui/jsm/modules_customers.py b/app/selenium_ui/jsm/modules_customers.py index 9789ab86f..5c4d227bb 100644 --- a/app/selenium_ui/jsm/modules_customers.py +++ b/app/selenium_ui/jsm/modules_customers.py @@ -70,11 +70,11 @@ def measure(): @print_timing("selenium_customer_login:open_login_page") def sub_measure(): login_page.go_to() + login_page.is_2sv() webdriver.app_version = login_page.get_app_version() if login_page.is_logged_in(): login_page.delete_all_cookies() login_page.go_to() - login_page.wait_for_page_loaded() sub_measure() @print_timing("selenium_customer_login:login_and_view_portal") diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index 888db905f..46dc0073d 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -19,9 +19,18 @@ class Login(BasePage): base_url = UrlManager().host page_loaded_selector = LoginPageLocators.system_dashboard + def __init__(self, driver): + super().__init__(driver) + self.is_2sv_login = False + def is_first_login(self): return True if self.get_elements(LoginPageLocators.continue_button) else False + def is_2sv(self): + if not self.get_elements(LoginPageLocators.login_submit_button): + self.is_2sv_login = True + print("INFO: 2sv login form") + def is_first_login_second_page(self): return True if self.get_elements(LoginPageLocators.avatar_page_next_button) else False @@ -37,9 +46,21 @@ def first_login_second_page_setup(self): self.wait_until_visible(DashboardLocators.dashboard_window) def set_credentials(self, username, password): - self.get_element(LoginPageLocators.login_field).send_keys(username) - self.get_element(LoginPageLocators.password_field).send_keys(password) - self.get_element(LoginPageLocators.login_submit_button).click() + login_field = LoginPageLocators.login_field + password_field = LoginPageLocators.password_field + submit_button = LoginPageLocators.login_submit_button + if self.is_2sv_login: + login_field = LoginPageLocators.login_field_2sv + password_field = LoginPageLocators.password_field_2sv + submit_button = LoginPageLocators.login_submit_button_2sv + + self.wait_until_visible(login_field).send_keys(username) + self.wait_until_visible(password_field).send_keys(password) + self.wait_until_visible(submit_button).click() + + def wait_for_dashboard_or_first_login_loaded(self): + self.wait_until_any_ec_presented((LoginPageLocators.system_dashboard, + LoginPageLocators.continue_button)) def __get_footer_text(self): return self.get_element(LoginPageLocators.footer).text diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index 6c0af3819..cec3ba737 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -83,6 +83,9 @@ class LoginPageLocators: login_field = (By.ID, 'login-form-username') password_field = (By.ID, 'login-form-password') login_submit_button = (By.ID, 'login-form-submit') + login_field_2sv = (By.ID, 'username-field') + password_field_2sv = (By.ID, 'password-field') + login_submit_button_2sv = (By.ID, 'login-button') system_dashboard = (By.ID, "dashboard") footer = (By.ID, 'footer-build-information') diff --git a/app/selenium_ui/jsm/pages/customer_pages.py b/app/selenium_ui/jsm/pages/customer_pages.py index 3fdd8ecc1..9312930b1 100644 --- a/app/selenium_ui/jsm/pages/customer_pages.py +++ b/app/selenium_ui/jsm/pages/customer_pages.py @@ -14,19 +14,38 @@ class Login(BasePage): base_url = UrlManager().host page_loaded_selector = LoginPageLocators.login_submit_button + def __init__(self, driver): + super().__init__(driver) + self.is_2sv_login = False + + def is_2sv(self): + if not self.get_elements(LoginPageLocators.login_submit_button): + self.is_2sv_login = True + print("INFO: 2sv login form") + def set_credentials(self, username, password): - self.wait_until_visible(LoginPageLocators.login_field) - self.get_element(LoginPageLocators.login_field).send_keys(username) - self.get_element(LoginPageLocators.password_field).send_keys(password) - self.get_element(LoginPageLocators.login_submit_button).click() + if self.is_2sv_login: + self.wait_until_visible(LoginPageLocators.login_field_2sv) + self.get_element(LoginPageLocators.login_field_2sv).send_keys(username) + self.get_element(LoginPageLocators.password_field_2sv).send_keys(password) + self.get_element(LoginPageLocators.login_submit_button_2sv).click() + else: + self.wait_until_visible(LoginPageLocators.login_field) + self.get_element(LoginPageLocators.login_field).send_keys(username) + self.get_element(LoginPageLocators.password_field).send_keys(password) + self.get_element(LoginPageLocators.login_submit_button).click() def is_logged_in(self): elements = self.get_elements(CustomerPortalsSelectors.welcome_logged_in_page) return True if elements else False def get_app_version(self): - version_str = self.get_element(LoginPageLocators.app_version).get_attribute('content') - return version.parse(version_str) + if self.is_2sv_login: + version_str = self.get_element(LoginPageLocators.app_version_2sv).get_attribute('data-version') + return version.parse(version_str) + else: + version_str = self.get_element(LoginPageLocators.app_version).get_attribute('content') + return version.parse(version_str) class TopPanel(BasePage): diff --git a/app/selenium_ui/jsm/pages/customer_selectors.py b/app/selenium_ui/jsm/pages/customer_selectors.py index ae94d67d1..a9f57e111 100644 --- a/app/selenium_ui/jsm/pages/customer_selectors.py +++ b/app/selenium_ui/jsm/pages/customer_selectors.py @@ -38,7 +38,11 @@ class LoginPageLocators: login_field = (By.ID, 'os_username') password_field = (By.ID, 'os_password') login_submit_button = (By.ID, 'js-login-submit') + login_field_2sv = (By.ID, 'username-field') + password_field_2sv = (By.ID, 'password-field') + login_submit_button_2sv = (By.ID, 'login-button') app_version = (By.NAME, "ajs-sdPluginVersion") + app_version_2sv = (By.NAME, "application-name") class TopPanelSelectors: From 487f078a6d5e0a671b53774e232ce84149be914c Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 21 Jan 2025 11:21:32 +0200 Subject: [PATCH 078/765] replace snapshots --- app/util/k8s/dcapt-snapshots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 044dfc3f9..c13f7e54e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -9,7 +9,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0150ffccd83d4ad8b", + "us-east-2": "snap-06d9c6e477858e379", "us-east-1": "snap-03cd05deb4823e36d" } ] @@ -19,7 +19,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-052247488a495ba96", + "us-east-2": "snap-0be20f6987b960c88", "us-east-1": "snap-03454b600cf02a772" } ] From 4302a056798f8f266aee2c6c2cb83b40dff74e31 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 21 Jan 2025 15:22:49 +0200 Subject: [PATCH 079/765] jsm/fix-flaky-actions --- app/selenium_ui/jsm/pages/agent_pages.py | 18 ++++++++++++++---- app/selenium_ui/jsm/pages/agent_selectors.py | 2 ++ app/selenium_ui/jsm/pages/customer_pages.py | 8 ++++++-- .../jsm/pages/customer_selectors.py | 2 ++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index 46dc0073d..d068eec76 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -138,7 +138,10 @@ def add_request_comment(self, rte_status): textarea = self.get_element(ViewCustomerRequestLocators.comment_collapsed_textarea) self.driver.execute_script("arguments[0].scrollIntoView(true);", textarea) textarea.click() - comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn) + if not self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): + comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn_jsm10) + else: + comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn) self.driver.execute_script("arguments[0].scrollIntoView(true);", comment_button) if rte_status: @@ -219,9 +222,16 @@ def __init__(self, driver): self.page_url = url_manager.view_insight_all_schemas() def submit_login(self, username, password): - self.get_element(LoginPageLocators.login_field).send_keys(username) - self.get_element(LoginPageLocators.password_field).send_keys(password) - self.get_element(LoginPageLocators.login_submit_button).click() + self.wait_until_visible(LoginPageLocators.login_form) + if self.get_elements(LoginPageLocators.login_field): + self.get_element(LoginPageLocators.login_field).send_keys(username) + self.get_element(LoginPageLocators.password_field).send_keys(password) + self.get_element(LoginPageLocators.login_submit_button).click() + else: + self.get_element(LoginPageLocators.login_field_2sv).send_keys(username) + self.get_element(LoginPageLocators.password_field_2sv).send_keys(password) + self.get_element(LoginPageLocators.login_submit_button_2sv).click() + class InsightNewSchema(BasePage): diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index cec3ba737..4c1136f8e 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -88,6 +88,7 @@ class LoginPageLocators: login_submit_button_2sv = (By.ID, 'login-button') system_dashboard = (By.ID, "dashboard") footer = (By.ID, 'footer-build-information') + login_form = (By.ID, "login-form") class DashboardLocators: @@ -119,6 +120,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_internally_btn_jsm10 = (By.XPATH, "//span[normalize-space()='Comment internally']") customers_sidebar_selector = (By.CSS_SELECTOR, 'span.aui-icon.aui-icon-large.sd-sidebar-icon.icon-sidebar-customers') diff --git a/app/selenium_ui/jsm/pages/customer_pages.py b/app/selenium_ui/jsm/pages/customer_pages.py index 9312930b1..eaf32c0c7 100644 --- a/app/selenium_ui/jsm/pages/customer_pages.py +++ b/app/selenium_ui/jsm/pages/customer_pages.py @@ -56,7 +56,11 @@ def open_profile_menu(self): def logout(self): self.get_element(TopPanelSelectors.logout_button).click() - self.wait_until_visible(LoginPageLocators.login_field) + self.wait_until_visible(LoginPageLocators.login_form) + if not self.get_elements(LoginPageLocators.login_submit_button): + self.wait_until_visible(LoginPageLocators.login_field_2sv) + else: + self.wait_until_visible(LoginPageLocators.login_field) class CustomerPortals(BasePage): @@ -206,7 +210,7 @@ def __init__(self, driver, all_requests=False): url_manager = UrlManager() self.page_url = url_manager.all_requests_url() if all_requests else url_manager.my_requests_url() - page_loaded_selector = RequestsSelectors.requests_label + page_loaded_selector = RequestsSelectors.all_requests_filter class ViewRequestWithInsight(BasePage): diff --git a/app/selenium_ui/jsm/pages/customer_selectors.py b/app/selenium_ui/jsm/pages/customer_selectors.py index a9f57e111..071a2a910 100644 --- a/app/selenium_ui/jsm/pages/customer_selectors.py +++ b/app/selenium_ui/jsm/pages/customer_selectors.py @@ -43,6 +43,7 @@ class LoginPageLocators: login_submit_button_2sv = (By.ID, 'login-button') app_version = (By.NAME, "ajs-sdPluginVersion") app_version_2sv = (By.NAME, "application-name") + login_form = (By.ID, "login-form") class TopPanelSelectors: @@ -111,3 +112,4 @@ class InsightSelectors: class RequestsSelectors: my_requests_url = UrlManager().my_requests_url() requests_label = (By.XPATH, "//h2[contains(text(),'Requests')]") + all_requests_filter = (By.ID, "sd-all-requests-filter") From d3aca6d24bf3e704e06b05f6f37fe3ae92e36601 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 22 Jan 2025 11:29:05 +0200 Subject: [PATCH 080/765] replace snapshots us-east-1 --- app/util/k8s/dcapt-snapshots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index c13f7e54e..b5f2455f9 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -10,7 +10,7 @@ "snapshots": [ { "us-east-2": "snap-06d9c6e477858e379", - "us-east-1": "snap-03cd05deb4823e36d" + "us-east-1": "snap-054815273a0c1fddc" } ] }, @@ -20,7 +20,7 @@ "snapshots": [ { "us-east-2": "snap-0be20f6987b960c88", - "us-east-1": "snap-03454b600cf02a772" + "us-east-1": "snap-08b3bdb6b083c84ec" } ] }, From f43b3f2c62b0a4c85263aec8d84985438f4fa455 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 22 Jan 2025 11:44:33 +0200 Subject: [PATCH 081/765] add waits --- app/selenium_ui/bitbucket/pages/pages.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index 9978b2eb9..d8de8010a 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -20,23 +20,16 @@ def wait_for_page_loaded(self): self.is_2sv_login = True print("INFO: 2sv login form") - def __init__(self, driver): - super().__init__(driver) - self.is_2sv_login = False - - def wait_for_page_loaded(self): - self.wait_until_visible(LoginPageLocators.footer_panel) - if not self.get_elements(LoginPageLocators.submit_button): - self.is_2sv_login = True - print("INFO: 2sv login form") def fill_username(self, username): self.get_element(LoginPageLocators.username_textfield).send_keys(username) def fill_2sv_username(self, username): + self.wait_until_visible(LoginPageLocators.login_username_field_2sv) self.get_element(LoginPageLocators.login_username_field_2sv).send_keys(username) def fill_2sv_password(self, username): + self.wait_until_visible(LoginPageLocators.login_username_field_2sv) self.get_element(LoginPageLocators.login_password_field_2sv).send_keys(username) def fill_password(self, password): From a7ad345a0faf81c5a781abb3c3b25f9cdf8cf97e Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 22 Jan 2025 11:57:46 +0200 Subject: [PATCH 082/765] fix legacy-2sv-bb --- app/jmeter/bitbucket.jmx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/jmeter/bitbucket.jmx b/app/jmeter/bitbucket.jmx index 8ff6bbcdf..20da9074e 100644 --- a/app/jmeter/bitbucket.jmx +++ b/app/jmeter/bitbucket.jmx @@ -254,7 +254,7 @@ log.info("GIT_LOG_DIR: " + gitLogDir); - + ${__BeanShell(import org.apache.commons.lang3.SystemUtils; !SystemUtils.IS_OS_WINDOWS;)} false true @@ -316,7 +316,7 @@ else{ - + Accept-Language @@ -341,7 +341,7 @@ else{ - + 200 @@ -371,11 +371,11 @@ else{ String loginform = vars.get("loginform"); if ("NOT_FOUND".equals(loginform)) { - vars.put("legacy_login_form", "false"); - log.info("2SVlogin flow detected"); -} else { vars.put("legacy_login_form", "true"); log.info("legacy login flow detected"); +} else { + vars.put("legacy_login_form", "false"); + log.info("2SVlogin flow detected"); } @@ -417,7 +417,7 @@ if ("NOT_FOUND".equals(loginform)) { - + Content-Type @@ -438,7 +438,7 @@ if ("NOT_FOUND".equals(loginform)) { - + ${__groovy(vars.get("legacy_login_form") == 'true')} false true @@ -470,7 +470,7 @@ if ("NOT_FOUND".equals(loginform)) { - + 200 @@ -524,7 +524,7 @@ vars.put("USER_SSH_KEY", new File('${__P(PRIVATE_SSH_KEY_LOCATION - + ${__groovy( def userSshKey = vars.get("USER_SSH_KEY"); def key_list = vars.get("SERVER_SSH_KEYS"); @@ -541,7 +541,7 @@ vars.put("USER_SSH_KEY", new File('${__P(PRIVATE_SSH_KEY_LOCATION true - + ${application.postfix}/rest/ssh/latest/keys?user=${admin_login} true POST @@ -648,7 +648,7 @@ else{ shareMode.all - + groovy @@ -772,7 +772,7 @@ if (responseCode != "0") { - + java From ae15f9ca38f0d915549f02b9e2c36092e4154289 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 22 Jan 2025 15:52:09 +0200 Subject: [PATCH 083/765] added wait for page loaded --- app/selenium_ui/bitbucket/modules.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/selenium_ui/bitbucket/modules.py b/app/selenium_ui/bitbucket/modules.py index f8149ef2c..41e08b19d 100644 --- a/app/selenium_ui/bitbucket/modules.py +++ b/app/selenium_ui/bitbucket/modules.py @@ -54,8 +54,10 @@ def sub_measure(): def sub_measure(): login_page.submit_login() get_started_page = GetStarted(webdriver) + get_started_page.wait_for_page_loaded() PopupManager(webdriver).dismiss_default_popup() get_started_page.close_whats_new_window() + PopupManager(webdriver).dismiss_default_popup() get_started_page.wait_for_page_loaded() webdriver.node_id = login_page.get_node_id() print(f"node_id:{webdriver.node_id}") From 406f757745ba6d112118b29c4f58769df4a19bd3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 23 Jan 2025 06:00:50 +0100 Subject: [PATCH 084/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 7bdd0655c..4b80df9f3 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1c62571b818ac2282e395206c42ed4e08fc7383b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 23 Jan 2025 06:00:50 +0100 Subject: [PATCH 085/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index e823feb15..1a0ff7a92 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From dd88b1ef685366a2e881ecbdd53b081595f82ec0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 23 Jan 2025 06:00:51 +0100 Subject: [PATCH 086/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index bef03929d..fb88a5e6c 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1c05dc953f94502d206005d7adfa61acb7a554fc Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 23 Jan 2025 06:00:52 +0100 Subject: [PATCH 087/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index b24388406..f180927c0 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 807075505435a16b0b2d0d32e4b81c7e5c3e96fb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 23 Jan 2025 06:00:53 +0100 Subject: [PATCH 088/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 87512d6d7..6f7e47a45 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.83" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 116c557ac3bb8ecc6b883efeb980bbba518bac05 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:53:36 +0000 Subject: [PATCH 089/765] Update dependency filelock to v3.17.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 95821a19e..47d24201b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pandas==2.2.3 pytest==8.3.4 locust==2.32.6 selenium==4.27.1 -filelock==3.16.1 +filelock==3.17.0 packaging==24.2 prettytable==3.12.0 bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils From bc2e523cd8b3bbf6a66fb1f1181c6db339fc04f8 Mon Sep 17 00:00:00 2001 From: Alex Metelytsia Date: Thu, 23 Jan 2025 16:50:15 +0100 Subject: [PATCH 090/765] Revert "update crowd version to 6.2.0" --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b50aa3c1f..56c9bbfe0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.14` and `9.4.1` * Supported Crowd versions: - * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.2.0` + * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.0.0` * Supported Bamboo versions: * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.0` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index b5f2455f9..74b14cdef 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -440,15 +440,15 @@ "crowd": { "versions": [ { - "version": "6.2.0", + "version": "6.0.0", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-06c0080a7532b6b14", - "us-east-1": "snap-01231c998f6613955" + "us-east-2": "snap-0447ca5809d646efe", + "us-east-1": "snap-0877485f60faa521c" } ] }, @@ -457,8 +457,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-6-2-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-6-2-0" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-6-0-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-6-0-0" } ] } From 676037ddcc5355f05f3e3c65cb937b1c67840033 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 25 Jan 2025 22:35:28 +0200 Subject: [PATCH 091/765] fix jmeter vars parse --- app/jmeter/bitbucket.jmx | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/jmeter/bitbucket.jmx b/app/jmeter/bitbucket.jmx index 20da9074e..cc142974f 100644 --- a/app/jmeter/bitbucket.jmx +++ b/app/jmeter/bitbucket.jmx @@ -254,7 +254,7 @@ log.info("GIT_LOG_DIR: " + gitLogDir); - + ${__BeanShell(import org.apache.commons.lang3.SystemUtils; !SystemUtils.IS_OS_WINDOWS;)} false true @@ -303,9 +303,9 @@ else{ - + - + Detected the start of a redirect chain ${application.postfix}/login GET @@ -351,7 +351,7 @@ else{ 2 - + false j_username j_username @@ -363,18 +363,18 @@ else{ false - + groovy true - String loginform = vars.get("loginform"); + String loginform = vars.get("j_username"); if ("NOT_FOUND".equals(loginform)) { - vars.put("legacy_login_form", "true"); + vars.put("legacy_login_form", "false"); log.info("legacy login flow detected"); } else { - vars.put("legacy_login_form", "false"); + vars.put("legacy_login_form", "true"); log.info("2SVlogin flow detected"); } @@ -390,13 +390,13 @@ if ("NOT_FOUND".equals(loginform)) { - + ${__groovy(vars.get("legacy_login_form") == 'false')} false true - + 2sv login flow ${application.postfix}/rest/tsv/1.0/authenticate POST @@ -438,13 +438,13 @@ if ("NOT_FOUND".equals(loginform)) { - + ${__groovy(vars.get("legacy_login_form") == 'true')} false true - + ${application.postfix}/login true POST @@ -470,7 +470,7 @@ if ("NOT_FOUND".equals(loginform)) { - + 200 @@ -482,7 +482,7 @@ if ("NOT_FOUND".equals(loginform)) { - + ${application.postfix}/rest/ssh/1.0/keys true GET @@ -514,7 +514,7 @@ vars.put("SERVER_SSH_KEYS", result.join("::")); - + groovy @@ -648,7 +648,7 @@ else{ shareMode.all - + groovy From 50a1ec450eb006878eb1a189ba238c69b2587150 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 27 Jan 2025 15:00:34 +0200 Subject: [PATCH 092/765] jsm/fix-insight-view-queue-action --- app/selenium_ui/jsm/pages/agent_pages.py | 3 ++- app/selenium_ui/jsm/pages/agent_selectors.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index d068eec76..7e13923f3 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -338,9 +338,10 @@ def wait_for_page_loaded(self): def view_random_queue_with_insight(self): self.wait_until_visible(InsightViewQueueLocators.table_container) - if not self.get_elements(InsightViewQueueLocators.navigation): + if self.get_elements(InsightViewQueueLocators.all_queues): self.wait_until_visible(InsightViewQueueLocators.view_queue_insight_column) else: + self.wait_until_visible(InsightViewQueueLocators.navigation) self.wait_until_visible(InsightViewQueueLocators.view_queue_insight_column_jsm10) diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index 4c1136f8e..b42964c04 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -173,6 +173,7 @@ class InsightNewObjectLocators: class InsightViewQueueLocators: + all_queues = (By.XPATH, "//div[@class='aui-nav-heading pinned-nav-title nav-group-items']") view_queue_page = (By.XPATH, "//section[@id='sd-page-panel']") view_queue_insight_column = (By.XPATH, "//span[contains(text(),'Insight')]") table_container = (By.XPATH, "//div[@class='queue-react-table-container']") From 85f96c1f536663ba270fd44d4124a9be603917fe Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 28 Jan 2025 13:27:51 +0200 Subject: [PATCH 093/765] jsm/upd-comment-action-and-dismiss-popup --- app/selenium_ui/base_page.py | 21 +++++++++++++------- app/selenium_ui/jsm/pages/agent_pages.py | 10 ++++------ app/selenium_ui/jsm/pages/agent_selectors.py | 19 ++++++++++-------- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index f5267bf64..da82903b7 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -132,13 +132,20 @@ def __wait_until(self, expected_condition, locator, time_out=timeout): return WebDriverWait(self.driver, time_out).until(expected_condition, message=message) - def dismiss_popup(self, *args): - for elem in args: - if self.driver.find_elements(by=By.CSS_SELECTOR, value=elem): - try: - self.driver.execute_script(f"document.querySelector(\'{elem}\').click()") - except(WebDriverException, Exception): - pass + def dismiss_popup(self, popup_selectors): + for selector_type, selector_value in popup_selectors: + if selector_type.lower() == "css": + if self.driver.find_elements(by=By.CSS_SELECTOR, value=selector_value): + try: + self.driver.execute_script(f"document.querySelector('{selector_value}').click()") + except (WebDriverException, Exception): + pass + elif selector_type.lower() == "xpath": + if self.driver.find_elements(by=By.XPATH, value=selector_value): + try: + self.driver.find_element(by=By.XPATH, value=selector_value).click() + except (WebDriverException, Exception): + pass def return_to_parent_frame(self): return self.driver.switch_to.parent_frame() diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index 7e13923f3..d48e9a870 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -9,9 +9,7 @@ class PopupManager(BasePage): def dismiss_default_popup(self): - return self.dismiss_popup(PopupLocators.default_popup, PopupLocators.popup_1, PopupLocators.popup_2, - PopupLocators.popup_3, PopupLocators.popup_4, - PopupLocators.popup_5, PopupLocators.popup_6, PopupLocators.popup_7) + return self.dismiss_popup(PopupLocators.popup_selectors) class Login(BasePage): @@ -138,10 +136,10 @@ def add_request_comment(self, rte_status): textarea = self.get_element(ViewCustomerRequestLocators.comment_collapsed_textarea) self.driver.execute_script("arguments[0].scrollIntoView(true);", textarea) textarea.click() - if not self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): - comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn_jsm10) - else: + if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn) + else: + comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn_jsm10) self.driver.execute_script("arguments[0].scrollIntoView(true);", comment_button) if rte_status: diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index b42964c04..b9a99275c 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -3,14 +3,17 @@ class PopupLocators: - default_popup = '.aui-message .icon-close' - popup_1 = 'form.tip-footer>.helptip-close' - popup_2 = '.aui-inline-dialog-contents .cancel' - popup_3 = '.aui-close-button' - popup_4 = '.aui-button aui-button-link' - popup_5 = '.buttons-container > div > a' - popup_6 = '.css-19r5em7' - popup_7 = '.css-178ag6o' + popup_selectors = [ + ("css", ".aui-message .icon-close"), + ("css", "form.tip-footer>.helptip-close"), + ("css", ".aui-inline-dialog-contents .cancel"), + ("css", ".aui-close-button"), + ("css", ".aui-button aui-button-link"), + ("css", ".buttons-container > div > a"), + ("css", ".css-19r5em7"), + ("css", ".css-178ag6o"), + ("xpath", "//button[contains(text(),'Got it')]") + ] class UrlManager: From b7af605ef2509a34f03d38572ef6a3ff01e77896 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 28 Jan 2025 14:06:52 +0200 Subject: [PATCH 094/765] change popup selectors structure --- app/selenium_ui/bitbucket/pages/pages.py | 4 +--- app/selenium_ui/bitbucket/pages/selectors.py | 18 ++++++++++-------- app/selenium_ui/confluence/pages/pages.py | 6 +----- app/selenium_ui/confluence/pages/selectors.py | 14 ++++++++------ app/selenium_ui/jira/pages/pages.py | 2 +- app/selenium_ui/jira/pages/selectors.py | 8 +++++--- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index d8de8010a..78a620040 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -103,9 +103,7 @@ def wait_for_navigation_panel(self): class PopupManager(BasePage): def dismiss_default_popup(self): - return self.dismiss_popup(PopupLocators.default_popup, PopupLocators.popup_1, PopupLocators.popup_2, - PopupLocators.popup_3, PopupLocators.popup_4, PopupLocators.popup_5, - PopupLocators.popup_6, PopupLocators.popup_7) + return self.dismiss_popup(PopupLocators.popup_selectors) class Repository(BasePage): diff --git a/app/selenium_ui/bitbucket/pages/selectors.py b/app/selenium_ui/bitbucket/pages/selectors.py index b2473feb6..59708f8c9 100644 --- a/app/selenium_ui/bitbucket/pages/selectors.py +++ b/app/selenium_ui/bitbucket/pages/selectors.py @@ -75,14 +75,16 @@ def projects_url(self): class PopupLocators: - default_popup = '.feature-discovery-close' - popup_1 = '.css-1it7f5o' - popup_2 = 'button.aui-button-link.feature-discovery-close' - popup_3 = '.css-15p34h1' - popup_4 = '.css-1dqf51u' - popup_5 = '.css-1kflcxk' - popup_6 = '.css-1gh2dqy' - popup_7 = "[data-testid='whats-new-modal'] button[aria-label='Close modal'] > span > span[aria-hidden='true']" + popup_selectors = [ + ("css", ".feature-discovery-close"), + ("css", ".css-1it7f5o"), + ("css", "button.aui-button-link.feature-discovery-close"), + ("css", ".css-15p34h1"), + ("css", ".css-1dqf51u"), + ("css", ".css-1kflcxk"), + ("css", ".css-1gh2dqy"), + ("css", "[data-testid='whats-new-modal'] button[aria-label='Close modal'] > span > span[aria-hidden='true']") + ] class LoginPageLocators: diff --git a/app/selenium_ui/confluence/pages/pages.py b/app/selenium_ui/confluence/pages/pages.py index f294cce46..d4db1c058 100644 --- a/app/selenium_ui/confluence/pages/pages.py +++ b/app/selenium_ui/confluence/pages/pages.py @@ -82,11 +82,7 @@ class AllUpdates(BasePage): class PopupManager(BasePage): def dismiss_default_popup(self): - return self.dismiss_popup(PopupLocators.timezone_popups, PopupLocators.skip_onbording_1, - PopupLocators.skip_onboarding_2, - PopupLocators.time_saving_template, - PopupLocators.welcome_to_confluence, - PopupLocators.dark_theme_popup) + return self.dismiss_popup(PopupLocators.popup_selectors) class Page(BasePage): diff --git a/app/selenium_ui/confluence/pages/selectors.py b/app/selenium_ui/confluence/pages/selectors.py index d027b2c98..c98801829 100644 --- a/app/selenium_ui/confluence/pages/selectors.py +++ b/app/selenium_ui/confluence/pages/selectors.py @@ -29,12 +29,14 @@ def logout_url(self): class PopupLocators: - timezone_popups = '.button-panel-button .set-timezone-button' - skip_onbording_1 = '.aui-button aui-button-link .skip-onboarding' - skip_onboarding_2 = '.aui-button.aui-button-link.skip-onboarding' - time_saving_template = '#closeDisDialog' - welcome_to_confluence = '.aui-button.aui-button-primary.show-onboarding' - dark_theme_popup = 'button[aria-label="Close this modal"]' + popup_selectors = [ + ("css", ".button-panel-button .set-timezone-button"), + ("css", ".aui-button aui-button-link .skip-onboarding"), + ("css", ".aui-button.aui-button-link.skip-onboarding"), + ("css", "#closeDisDialog"), + ("css", ".aui-button.aui-button-primary.show-onboarding"), + ("css", "button[aria-label='Close this modal']") + ] class LoginPageLocators: diff --git a/app/selenium_ui/jira/pages/pages.py b/app/selenium_ui/jira/pages/pages.py index 197a11c0b..8121965a7 100644 --- a/app/selenium_ui/jira/pages/pages.py +++ b/app/selenium_ui/jira/pages/pages.py @@ -12,7 +12,7 @@ class PopupManager(BasePage): def dismiss_default_popup(self): - return self.dismiss_popup(PopupLocators.default_popup, PopupLocators.popup_1, PopupLocators.popup_2) + return self.dismiss_popup(PopupLocators.popup_selectors) class Login(BasePage): diff --git a/app/selenium_ui/jira/pages/selectors.py b/app/selenium_ui/jira/pages/selectors.py index d59b4ee26..d9f62f004 100644 --- a/app/selenium_ui/jira/pages/selectors.py +++ b/app/selenium_ui/jira/pages/selectors.py @@ -3,9 +3,11 @@ class PopupLocators: - default_popup = '.aui-message .icon-close' - popup_1 = 'form.tip-footer>.helptip-close' - popup_2 = '.aui-inline-dialog-contents .cancel' + popup_selectors = [ + ("css", ".aui-message .icon-close"), + ("css", "form.tip-footer>.helptip-close"), + ("css", ".aui-inline-dialog-contents .cancel") + ] class UrlManager: From 51007143a0f524a7f874d5a0ab6a038435c5755d Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 28 Jan 2025 16:02:06 +0200 Subject: [PATCH 095/765] upd logic --- app/selenium_ui/base_page.py | 18 +++++++----------- app/selenium_ui/bitbucket/pages/selectors.py | 16 ++++++++-------- app/selenium_ui/confluence/pages/selectors.py | 12 ++++++------ app/selenium_ui/jira/pages/selectors.py | 6 +++--- app/selenium_ui/jsm/pages/agent_selectors.py | 18 +++++++++--------- 5 files changed, 33 insertions(+), 37 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index da82903b7..6fafbbf79 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -134,18 +134,14 @@ def __wait_until(self, expected_condition, locator, time_out=timeout): def dismiss_popup(self, popup_selectors): for selector_type, selector_value in popup_selectors: - if selector_type.lower() == "css": - if self.driver.find_elements(by=By.CSS_SELECTOR, value=selector_value): - try: + if self.driver.find_elements(by=selector_type, value=selector_value): + try: + if selector_type == By.CSS_SELECTOR: self.driver.execute_script(f"document.querySelector('{selector_value}').click()") - except (WebDriverException, Exception): - pass - elif selector_type.lower() == "xpath": - if self.driver.find_elements(by=By.XPATH, value=selector_value): - try: - self.driver.find_element(by=By.XPATH, value=selector_value).click() - except (WebDriverException, Exception): - pass + elif selector_type == By.XPATH: + self.driver.find_element(by=selector_type, value=selector_value).click() + except (WebDriverException, Exception): + pass def return_to_parent_frame(self): return self.driver.switch_to.parent_frame() diff --git a/app/selenium_ui/bitbucket/pages/selectors.py b/app/selenium_ui/bitbucket/pages/selectors.py index 59708f8c9..91b6689f0 100644 --- a/app/selenium_ui/bitbucket/pages/selectors.py +++ b/app/selenium_ui/bitbucket/pages/selectors.py @@ -76,14 +76,14 @@ def projects_url(self): class PopupLocators: popup_selectors = [ - ("css", ".feature-discovery-close"), - ("css", ".css-1it7f5o"), - ("css", "button.aui-button-link.feature-discovery-close"), - ("css", ".css-15p34h1"), - ("css", ".css-1dqf51u"), - ("css", ".css-1kflcxk"), - ("css", ".css-1gh2dqy"), - ("css", "[data-testid='whats-new-modal'] button[aria-label='Close modal'] > span > span[aria-hidden='true']") + (By.CSS_SELECTOR, ".feature-discovery-close"), + (By.CSS_SELECTOR, ".css-1it7f5o"), + (By.CSS_SELECTOR, "button.aui-button-link.feature-discovery-close"), + (By.CSS_SELECTOR, ".css-15p34h1"), + (By.CSS_SELECTOR, ".css-1dqf51u"), + (By.CSS_SELECTOR, ".css-1kflcxk"), + (By.CSS_SELECTOR, ".css-1gh2dqy"), + (By.CSS_SELECTOR, "[data-testid='whats-new-modal'] button[aria-label='Close modal'] > span > span[aria-hidden='true']") ] diff --git a/app/selenium_ui/confluence/pages/selectors.py b/app/selenium_ui/confluence/pages/selectors.py index c98801829..f3f18f353 100644 --- a/app/selenium_ui/confluence/pages/selectors.py +++ b/app/selenium_ui/confluence/pages/selectors.py @@ -30,12 +30,12 @@ def logout_url(self): class PopupLocators: popup_selectors = [ - ("css", ".button-panel-button .set-timezone-button"), - ("css", ".aui-button aui-button-link .skip-onboarding"), - ("css", ".aui-button.aui-button-link.skip-onboarding"), - ("css", "#closeDisDialog"), - ("css", ".aui-button.aui-button-primary.show-onboarding"), - ("css", "button[aria-label='Close this modal']") + (By.CSS_SELECTOR, ".button-panel-button .set-timezone-button"), + (By.CSS_SELECTOR, ".aui-button aui-button-link .skip-onboarding"), + (By.CSS_SELECTOR, ".aui-button.aui-button-link.skip-onboarding"), + (By.CSS_SELECTOR, "#closeDisDialog"), + (By.CSS_SELECTOR, ".aui-button.aui-button-primary.show-onboarding"), + (By.CSS_SELECTOR, "button[aria-label='Close this modal']") ] diff --git a/app/selenium_ui/jira/pages/selectors.py b/app/selenium_ui/jira/pages/selectors.py index d9f62f004..fb830b7b9 100644 --- a/app/selenium_ui/jira/pages/selectors.py +++ b/app/selenium_ui/jira/pages/selectors.py @@ -4,9 +4,9 @@ class PopupLocators: popup_selectors = [ - ("css", ".aui-message .icon-close"), - ("css", "form.tip-footer>.helptip-close"), - ("css", ".aui-inline-dialog-contents .cancel") + (By.CSS_SELECTOR, ".aui-message .icon-close"), + (By.CSS_SELECTOR, "form.tip-footer>.helptip-close"), + (By.CSS_SELECTOR, ".aui-inline-dialog-contents .cancel") ] diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index b9a99275c..37b616287 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -4,15 +4,15 @@ class PopupLocators: popup_selectors = [ - ("css", ".aui-message .icon-close"), - ("css", "form.tip-footer>.helptip-close"), - ("css", ".aui-inline-dialog-contents .cancel"), - ("css", ".aui-close-button"), - ("css", ".aui-button aui-button-link"), - ("css", ".buttons-container > div > a"), - ("css", ".css-19r5em7"), - ("css", ".css-178ag6o"), - ("xpath", "//button[contains(text(),'Got it')]") + (By.CSS_SELECTOR, ".aui-message .icon-close"), + (By.CSS_SELECTOR, "form.tip-footer>.helptip-close"), + (By.CSS_SELECTOR, ".aui-inline-dialog-contents .cancel"), + (By.CSS_SELECTOR, ".aui-close-button"), + (By.CSS_SELECTOR, ".aui-button aui-button-link"), + (By.CSS_SELECTOR, ".buttons-container > div > a"), + (By.CSS_SELECTOR, ".css-19r5em7"), + (By.CSS_SELECTOR, ".css-178ag6o"), + (By.XPATH, "//button[contains(text(),'Got it')]") ] From b0828a8ae9711202e9b2c5f38933b8ef7d988563 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 28 Jan 2025 16:50:37 +0200 Subject: [PATCH 096/765] upd comment check --- app/selenium_ui/jsm/pages/agent_pages.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index d48e9a870..682dc4d0a 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -125,10 +125,16 @@ def check_comment_text_is_displayed(self, text, rte_status=None): if self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).text != text: self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).send_keys(text) self.return_to_parent_frame() - self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click() + if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): + self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click() + else: + self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click() elif self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).text != text: self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).send_keys(text) - self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click() + if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): + self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click() + else: + self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click() def add_request_comment(self, rte_status): comment_text = f"Add comment from selenium - {self.generate_random_string(30)}" From bc6057d93d204dc9f5199c3d333e181e37372493 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Jan 2025 06:00:56 +0100 Subject: [PATCH 097/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 4b80df9f3..8ec175b55 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6b90c2af2dab5c6217f645c900cb36f9dfacbc6c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Jan 2025 06:00:57 +0100 Subject: [PATCH 098/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 1a0ff7a92..0375f7279 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9aaa3c623b0ee9be0700cde736b0daa321d50c94 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Jan 2025 06:00:58 +0100 Subject: [PATCH 099/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index fb88a5e6c..e3890c0b0 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 14b5221cc8ee73ffb7466de8a2a3706e00e97701 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Jan 2025 06:00:58 +0100 Subject: [PATCH 100/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index f180927c0..315990013 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 790a8b99dba9fdf92cc832ad2f2593a207796203 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Jan 2025 06:00:59 +0100 Subject: [PATCH 101/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 6f7e47a45..d4778041b 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.110" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From dfe5ff7ae67f90a1ec3a9351fc800184a1e975a8 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 29 Jan 2025 11:39:44 +0100 Subject: [PATCH 102/765] Bump TF version to 2.9.7 --- app/util/k8s/README.MD | 24 +++++++++---------- ...s-performance-toolkit-user-guide-bamboo.md | 8 +++---- ...erformance-toolkit-user-guide-bitbucket.md | 16 ++++++------- ...rformance-toolkit-user-guide-confluence.md | 16 ++++++------- ...ps-performance-toolkit-user-guide-crowd.md | 14 +++++------ ...pps-performance-toolkit-user-guide-jira.md | 16 ++++++------- ...apps-performance-toolkit-user-guide-jsm.md | 16 ++++++------- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/app/util/k8s/README.MD b/app/util/k8s/README.MD index 69cf60162..da154b331 100644 --- a/app/util/k8s/README.MD +++ b/app/util/k8s/README.MD @@ -32,7 +32,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` ### Terminate development environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -44,7 +44,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.6 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.7 ./uninstall.sh -c conf.tfvars ``` # Enterprise-scale environment @@ -61,7 +61,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` ### Terminate enterprise-scale environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -73,7 +73,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.6 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.7 ./uninstall.sh -c conf.tfvars ``` # Collect detailed k8s logs @@ -93,7 +93,7 @@ export REGION=us-east-2 docker run --pull=always --env-file aws_envs \ -v "/$PWD/k8s_logs:/data-center-terraform/k8s_logs" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.6 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs +-it atlassianlabs/terraform:2.9.7 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs ``` # Force terminate cluster @@ -126,7 +126,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.6 bash + -it atlassianlabs/terraform:2.9.7 bash ``` 5. Connect to the product pod. Example below for jira pod with number 0. For other product or pod number change `PRODUCT_POD` accordingly. @@ -150,7 +150,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ - -it atlassianlabs/terraform:2.9.6 bash + -it atlassianlabs/terraform:2.9.7 bash ``` 5. Copy code base and connect to the execution environment pod: ``` bash @@ -178,7 +178,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e REGION=$REGION \ -e PRODUCT=$PRODUCT \ -v "/$PWD/script-runner.yml:/data-center-terraform/script-runner.yml" \ - -it atlassianlabs/terraform:2.9.6 bash + -it atlassianlabs/terraform:2.9.7 bash ``` 5. Run following commands one by one inside docker container: ``` bash @@ -206,7 +206,7 @@ To enable detailed CPU/Memory monitoring and Grafana dashboards for visualisatio docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.6 bash + -it atlassianlabs/terraform:2.9.7 bash ``` ``` bash aws eks update-kubeconfig --name atlas-$ENVIRONMENT_NAME-cluster --region $REGION @@ -242,7 +242,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml ``` # Retry to copy run results from the execution environment pod to local @@ -259,7 +259,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/copy_run_results.sh:/data-center-terraform/copy_run_results.sh" \ - -it atlassianlabs/terraform:2.9.6 bash copy_run_results.sh + -it atlassianlabs/terraform:2.9.7 bash copy_run_results.sh ``` # Debug AWS required policies @@ -268,7 +268,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n 3. Start and ssh to `atlassianlabs/terraform` docker container: ``` bash docker run --pull=always --env-file aws_envs \ - -it atlassianlabs/terraform:2.9.6 bash + -it atlassianlabs/terraform:2.9.7 bash ``` 4. Make sure you have IAM policies with names `policy1`, `policy2`, created from [policy1.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy1.json) and [policy2.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy2.json). 5. Run following commands one by one inside docker container to get effective policies permissions: diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 12394ac7b..0a7e1f8bf 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -102,7 +102,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. @@ -303,7 +303,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -334,7 +334,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -368,7 +368,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 5d516a8ff..d3e270805 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -115,7 +115,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -319,7 +319,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -394,7 +394,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -425,7 +425,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -475,7 +475,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -500,7 +500,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -513,7 +513,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -542,7 +542,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index 68fbc7fd2..cb5b07407 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -474,7 +474,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -504,7 +504,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index b804a44a0..8e176677e 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -97,7 +97,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -208,7 +208,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -237,7 +237,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -296,7 +296,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -320,7 +320,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -347,7 +347,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -390,7 +390,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 9367d7a07..9d3d567a5 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -122,7 +122,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -423,7 +423,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -498,7 +498,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -550,7 +550,7 @@ The re-index time for Jira is about ~50-70 minutes. -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -636,7 +636,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -649,7 +649,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -678,7 +678,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 4194a44b6..bdc07084a 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -124,7 +124,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -459,7 +459,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -539,7 +539,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -594,7 +594,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -679,7 +679,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.6 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -692,7 +692,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -721,7 +721,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.6 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From d2c52fd4047e04661b4291854d397409217df635 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 3 Feb 2025 15:51:52 +0200 Subject: [PATCH 103/765] added delete cookie logout --- app/selenium_ui/confluence/modules.py | 3 +++ app/util/k8s/dcapt-snapshots.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index fc699e313..66fcc30fb 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -318,10 +318,13 @@ def measure(): def log_out(webdriver, datasets): logout_page = Logout(webdriver) + login_page = Login(webdriver) @print_timing("selenium_log_out") def measure(): logout_page.go_to() logout_page.wait_for_logout() + login_page.wait_for_page_loaded() + login_page.delete_all_cookies() measure() diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 74b14cdef..ca034a3d2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -323,7 +323,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0-fixed", "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-0" } ] From c59ca1e35539ccb6d9ee46b35322a119c4fefbe4 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 4 Feb 2025 17:54:02 +0200 Subject: [PATCH 104/765] added wait --- app/selenium_ui/confluence/modules.py | 3 ++- app/selenium_ui/confluence/pages/pages.py | 2 -- app/selenium_ui/confluence/pages/selectors.py | 2 +- app/util/k8s/dcapt-snapshots.json | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index 66fcc30fb..4e14d76a4 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -78,9 +78,10 @@ def sub_measure(): def sub_measure(): login_page.click_login_button() + all_updates_page = AllUpdates(webdriver) + all_updates_page.wait_for_page_loaded() if login_page.is_first_login(): login_page.first_user_setup() - all_updates_page = AllUpdates(webdriver) all_updates_page.wait_for_page_loaded() measure_dom_requests(webdriver, interaction="selenium_login:login_and_view_dashboard") if CONFLUENCE_SETTINGS.extended_metrics: diff --git a/app/selenium_ui/confluence/pages/pages.py b/app/selenium_ui/confluence/pages/pages.py index d4db1c058..2cd1a7804 100644 --- a/app/selenium_ui/confluence/pages/pages.py +++ b/app/selenium_ui/confluence/pages/pages.py @@ -34,10 +34,8 @@ def set_credentials(self, username, password): def click_login_button(self): if self.is_2sv_login: self.wait_until_visible(LoginPageLocators.login_button_2sv).click() - self.wait_until_invisible(LoginPageLocators.login_button_2sv) else: self.wait_until_visible(LoginPageLocators.login_button).click() - self.wait_until_invisible(LoginPageLocators.login_button) def is_first_login(self): elements = self.get_elements(LoginPageLocators.first_login_setup_page) diff --git a/app/selenium_ui/confluence/pages/selectors.py b/app/selenium_ui/confluence/pages/selectors.py index f3f18f353..b5eac8fe5 100644 --- a/app/selenium_ui/confluence/pages/selectors.py +++ b/app/selenium_ui/confluence/pages/selectors.py @@ -35,7 +35,7 @@ class PopupLocators: (By.CSS_SELECTOR, ".aui-button.aui-button-link.skip-onboarding"), (By.CSS_SELECTOR, "#closeDisDialog"), (By.CSS_SELECTOR, ".aui-button.aui-button-primary.show-onboarding"), - (By.CSS_SELECTOR, "button[aria-label='Close this modal']") + (By.CSS_SELECTOR, 'button[aria-label="Close this modal"]') ] diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ca034a3d2..74b14cdef 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -323,7 +323,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0-fixed", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0", "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-0" } ] From 64db2a7aaf631f70020ddd163436c0ecf9c5fd38 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Feb 2025 06:00:47 +0100 Subject: [PATCH 105/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 8ec175b55..f612965b9 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ed057cd3c744f1af29551fda7052a9fb386a1133 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Feb 2025 06:00:48 +0100 Subject: [PATCH 106/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 0375f7279..0b9ea6d9a 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b715068421d80eb85df88933d3be6d9ae4d92f26 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Feb 2025 06:00:49 +0100 Subject: [PATCH 107/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index e3890c0b0..40c95b407 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 17a875630a9f02d287725bdd71825b4816f26851 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Feb 2025 06:00:49 +0100 Subject: [PATCH 108/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 315990013..922674f3b 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From dda94c6c12d5d0578ca13a5ba83283d1d30590c2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Feb 2025 06:00:50 +0100 Subject: [PATCH 109/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index d4778041b..1965c0278 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "132.0.6834.159" # Supports Chrome version 132. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 80a8fdb2cb16ef1873a75862cf42d099709595a9 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 5 Feb 2025 14:04:22 +0100 Subject: [PATCH 110/765] Release 8.6.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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f612965b9..cc63d0210 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for JMeter load executor view_all_builds: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 40c95b407..ccd678245 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/confluence.yml b/app/confluence.yml index 0b9ea6d9a..dea91e0ab 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. extended_metrics: False # Action percentage for JMeter and Locust load executors diff --git a/app/crowd.yml b/app/crowd.yml index 8d90b55ff..ebb999f12 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index 922674f3b..e39aadf84 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors create_issue: 4 diff --git a/app/jsm.yml b/app/jsm.yml index 1965c0278..95b0a1b82 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 From ededad481c1ea646321cad01e0fe01ed3b6ef926 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 5 Feb 2025 14:23:41 +0100 Subject: [PATCH 111/765] Bump toolkit verion up to 8.7.0 --- app/util/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/conf.py b/app/util/conf.py index cea0f9fa7..0611752ab 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -2,8 +2,8 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML -TOOLKIT_VERSION = '8.6.0' -UNSUPPORTED_VERSION = '8.2.2' +TOOLKIT_VERSION = '8.7.0' +UNSUPPORTED_VERSION = '8.3.1' def read_yml_file(file): From e488b407d0a3b836218f7571955734ae37ea15c6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 13 Feb 2025 06:01:20 +0100 Subject: [PATCH 112/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f612965b9..42f0a9abb 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 387d90426176697e81cf3e8e8857c7048a10e263 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 13 Feb 2025 06:01:20 +0100 Subject: [PATCH 113/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 0b9ea6d9a..7405b9329 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From aad1e00ac56bd0e6004559464d8cfd41be4600dc Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 13 Feb 2025 06:01:21 +0100 Subject: [PATCH 114/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 40c95b407..7b8889c3d 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1863c1fb624869e679ab6d59a0e8f2642034fab7 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 13 Feb 2025 06:01:22 +0100 Subject: [PATCH 115/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 922674f3b..8d643af01 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 14190e39053983c3b4071bc803abb6eab6b90160 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 13 Feb 2025 06:01:22 +0100 Subject: [PATCH 116/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 1965c0278..acc2b99dc 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1aec6a6e2904c643e5c93b1c0e274f24b12d424d Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 18 Feb 2025 15:40:20 +0200 Subject: [PATCH 117/765] results/improve-results-copying --- app/util/k8s/bzt_on_pod.sh | 2 +- app/util/k8s/copy_run_results.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index 9c4019afc..4d18e77b6 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -68,7 +68,7 @@ kubectl exec -it "$exec_pod_name" -n atlassian -- docker run --shm-size=4g -v "/ sleep 10 echo "INFO: Copy results folder from the exec env pod to local" -kubectl cp --retries 10 atlassian/"$exec_pod_name":dc-app-performance-toolkit/app/results dc-app-performance-toolkit/app/results +kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /dc-app-performance-toolkit/app/results if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 diff --git a/app/util/k8s/copy_run_results.sh b/app/util/k8s/copy_run_results.sh index 367cce03e..766888949 100755 --- a/app/util/k8s/copy_run_results.sh +++ b/app/util/k8s/copy_run_results.sh @@ -30,7 +30,7 @@ fi echo "INFO: Execution environment pod name: $exec_pod_name" echo "INFO: Copy results folder from the exec env pod to local" -kubectl cp --retries 100 atlassian/"$exec_pod_name":dc-app-performance-toolkit/app/results dc-app-performance-toolkit/app/results +kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /dc-app-performance-toolkit/app/results if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 From e58d80f4de1ebf1174f280ad4fecf960d3510afe Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 19 Feb 2025 06:00:53 +0100 Subject: [PATCH 118/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 42f0a9abb..6d70593be 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 34265e8080ebd412ba280967c0459b2075db597f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 19 Feb 2025 06:00:54 +0100 Subject: [PATCH 119/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 7405b9329..4811de656 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b95bd7aaecabddfa0bc331fc1664e57c0391e2b6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 19 Feb 2025 06:00:55 +0100 Subject: [PATCH 120/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 7b8889c3d..14e5ee3ff 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 590ffd2298308389ee951872be561b8514ac5b3c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 19 Feb 2025 06:00:55 +0100 Subject: [PATCH 121/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 8d643af01..8ac6d349b 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fe163425675cbad252d5f9fc9bb28b605ebe29fe Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 19 Feb 2025 06:00:56 +0100 Subject: [PATCH 122/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index acc2b99dc..0963d8c95 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.98" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b71ee53d087e4c6d5301fb336c8a0dab81096c37 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Thu, 20 Feb 2025 12:18:46 +0200 Subject: [PATCH 123/765] upd copying from local to pod --- app/util/k8s/bzt_on_pod.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index 4d18e77b6..a438f4118 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -50,9 +50,8 @@ echo "INFO: Copy latest dc-app-performance-toolkit folder to the exec env pod" start=$(date +%s) # tar only app folder, exclude results and util/k8s folder tar -czf dcapt.tar.gz -C dc-app-performance-toolkit --exclude results --exclude util/k8s app Dockerfile requirements.txt -kubectl cp --retries 10 dcapt.tar.gz atlassian/"$exec_pod_name":/dcapt.tar.gz kubectl exec -it "$exec_pod_name" -n atlassian -- mkdir /dc-app-performance-toolkit -kubectl exec -it "$exec_pod_name" -n atlassian -- tar -xf /dcapt.tar.gz -C /dc-app-performance-toolkit +cat dcapt.tar.gz | kubectl exec -i -n atlassian "$exec_pod_name" -- tar xzf - -C /dc-app-performance-toolkit rm -rf dcapt.tar.gz end=$(date +%s) runtime=$((end-start)) From 396e3431f2aedc612dd96387892699f51c0a554c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 26 Feb 2025 06:01:10 +0100 Subject: [PATCH 124/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 6d70593be..291722d41 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fc9b74ed9998406935a3d7eff760409a1e005c68 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 26 Feb 2025 06:01:11 +0100 Subject: [PATCH 125/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 4811de656..5e2118e08 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 92da3dfc91ecb3da2593aadd1d0ed24d070a40d3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 26 Feb 2025 06:01:11 +0100 Subject: [PATCH 126/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 14e5ee3ff..5417ef557 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b0ff14dcfca4fec8c1e1bd6f492d2e7ff3f1a048 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 26 Feb 2025 06:01:12 +0100 Subject: [PATCH 127/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 8ac6d349b..59a1b26d6 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 79ea13e0a7043de79e3086cefa35c79c31d5cc2d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 26 Feb 2025 06:01:12 +0100 Subject: [PATCH 128/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 0963d8c95..4cbf3ef35 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.126" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From db741280504acc9a3d3fe8e51d393e042083c47d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Mar 2025 06:01:27 +0100 Subject: [PATCH 129/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 291722d41..9c621171e 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 505afb6e7f614c70f2b8429d0d0f32a226f4e59f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Mar 2025 06:01:27 +0100 Subject: [PATCH 130/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 5e2118e08..de4d20cab 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 28bda8eb35e506819d894409258ff864b911e365 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Mar 2025 06:01:28 +0100 Subject: [PATCH 131/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 5417ef557..260fdcaed 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0873ff7aa7da0d510262a74ad2018c664a293f3d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Mar 2025 06:01:28 +0100 Subject: [PATCH 132/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 59a1b26d6..31bbfed54 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8c7787a4df164a267d05ccfe9ec90a0a2cdb53d4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Mar 2025 06:01:29 +0100 Subject: [PATCH 133/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 4cbf3ef35..df737c6b3 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "133.0.6943.141" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7d7a911299ca715d24a885b7048eb4f044d2bd4c Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Mon, 10 Mar 2025 16:44:32 +0100 Subject: [PATCH 134/765] DCA-2247 Add bitbucket websudo to extension.ui --- app/extension/bitbucket/extension_ui.py | 8 +++++++- app/selenium_ui/bitbucket/pages/pages.py | 21 +++++++++++++++++++- app/selenium_ui/bitbucket/pages/selectors.py | 12 +++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/app/extension/bitbucket/extension_ui.py b/app/extension/bitbucket/extension_ui.py index 4c2ac35a0..72c4a75be 100644 --- a/app/extension/bitbucket/extension_ui.py +++ b/app/extension/bitbucket/extension_ui.py @@ -4,7 +4,7 @@ from selenium_ui.base_page import BasePage from selenium_ui.conftest import print_timing -from selenium_ui.bitbucket.pages.pages import LoginPage, GetStarted +from selenium_ui.bitbucket.pages.pages import LoginPage, GetStarted, AdminPage, PopupManager from util.conf import BITBUCKET_SETTINGS @@ -25,10 +25,16 @@ def app_specific_action(webdriver, datasets): # login_page = LoginPage(webdriver) # login_page.delete_all_cookies() # login_page.go_to() + # login_page.wait_for_page_loaded() # login_page.set_credentials(username=username, password=password) # login_page.submit_login() # get_started_page = GetStarted(webdriver) # get_started_page.wait_for_page_loaded() + # PopupManager(webdriver).dismiss_default_popup() + # get_started_page.close_whats_new_window() + # + # # uncomment below line to do web_sudo and authorise access to admin pages + # # AdminPage(webdriver).go_to(password=password) # app_specific_user_login(username='admin', password='admin') # measure() diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index 78a620040..0a3d365c9 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -3,7 +3,7 @@ from selenium_ui.base_page import BasePage from selenium_ui.bitbucket.pages.selectors import LoginPageLocators, GetStartedLocators, \ DashboardLocators, ProjectsLocators, ProjectLocators, RepoLocators, RepoNavigationPanelLocators, PopupLocators, \ - PullRequestLocator, BranchesLocator, RepoCommitsLocator, LogoutPageLocators, UrlManager + PullRequestLocator, BranchesLocator, RepoCommitsLocator, LogoutPageLocators, UrlManager, AdminLocators class LoginPage(BasePage): @@ -254,3 +254,22 @@ def __init__(self, driver, project_key, repo_slug): BasePage.__init__(self, driver) url_manager = UrlManager(project_key=project_key, repo_slug=repo_slug) self.page_url = url_manager.commits_url() + + +class AdminPage(BasePage): + page_url = AdminLocators.admin_system_page_url + page_loaded_selector = AdminLocators.login_form + + def is_websudo(self): + return True if self.get_elements(AdminLocators.web_sudo_password) else False + + def do_websudo(self, password): + self.wait_until_clickable(AdminLocators.web_sudo_password).send_keys(password) + self.wait_until_clickable(AdminLocators.web_sudo_submit_btn).click() + self.wait_until_visible(AdminLocators.administration_link) + + def go_to(self, password=None): + super().go_to() + self.wait_for_page_loaded() + if self.is_websudo(): + self.do_websudo(password) \ No newline at end of file diff --git a/app/selenium_ui/bitbucket/pages/selectors.py b/app/selenium_ui/bitbucket/pages/selectors.py index 91b6689f0..e26a7bf23 100644 --- a/app/selenium_ui/bitbucket/pages/selectors.py +++ b/app/selenium_ui/bitbucket/pages/selectors.py @@ -26,6 +26,7 @@ def __init__(self, user=None, project_key=None, repo_slug=None, pull_request_key self.dashboard_params = '/dashboard' self.projects_params = '/projects' self.branches_base_branch = f'/projects/{self.project_key}/repos/{self.repo_slug}/branches?base=' + self.admin_system_params = '/admin' def create_pull_request_url(self, from_branch, to_branch): return f"{self.host}/projects/{self.project_key}/repos/{self.repo_slug}/pull-requests?create&targetBranch=" \ @@ -73,6 +74,9 @@ def dashboard_url(self): def projects_url(self): return f"{self.host}{self.projects_params}" + def admin_system_url(self): + return f"{self.host}{self.admin_system_params}" + class PopupLocators: popup_selectors = [ @@ -181,3 +185,11 @@ class BranchesLocator: class RepoCommitsLocator: repo_commits_graph = (By.ID, 'commits-table') + + +class AdminLocators: + admin_system_page_url = UrlManager().admin_system_url() + web_sudo_password = (By.ID, 'j_password-uid1') + web_sudo_submit_btn = (By.XPATH, "//span[contains(text(),'Confirm')]") + login_form = (By.ID, 'websudo-container') + administration_link = (By.XPATH, "//span[contains(text(),'Administration')]") From 480eb61264b7aba49bbe0abe7e5fb381fc4d33a0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 11 Mar 2025 06:01:44 +0100 Subject: [PATCH 135/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 9c621171e..2ee27a89b 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 687701ab85327d5953da8ee2e0b4b5c8ea59da75 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 11 Mar 2025 06:01:45 +0100 Subject: [PATCH 136/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index de4d20cab..20fd14d79 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a45767865ce2ba9147839556cffa95d9a4c72e6e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 11 Mar 2025 06:01:45 +0100 Subject: [PATCH 137/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 260fdcaed..1cbb8cdc4 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bb496727cf3dba59843e7fe98a70181f4293c663 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 11 Mar 2025 06:01:46 +0100 Subject: [PATCH 138/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 31bbfed54..c5d71ce3e 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 36fb6050680132fb858a026e0f7361103d357ef7 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 11 Mar 2025 06:01:47 +0100 Subject: [PATCH 139/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index df737c6b3..fd1cf1da4 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.35" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bc3dcd940c17ed7d8981e600c40c33a52e31cc8f Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 11 Mar 2025 14:59:20 +0200 Subject: [PATCH 140/765] confluence/fix-deployment-type --- app/util/api/confluence_clients.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py index 9570a616a..f9abc174e 100644 --- a/app/util/api/confluence_clients.py +++ b/app/util/api/confluence_clients.py @@ -192,7 +192,7 @@ def get_groups_membership(self, username): def get_system_info_page(self): login_url = f'{self.host}/dologin.action' - auth_url = f'{self.host}/doauthenticate.action' + auth_url = f'{self.host}/admin/websudo.action' tsv_auth_url = f'{self.host}/rest/tsv/1.0/authenticate' tsv_login_body = { 'username': self.user, @@ -202,9 +202,9 @@ def get_system_info_page(self): } auth_body = { - 'destination': '/admin/systeminfo.action', - 'authenticate': 'Confirm', - 'password': self.password + 'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa', + 'webSudoIsPost': False, + 'webSudoPassword': self.password } login_page_response = self.session.get(login_url) @@ -219,12 +219,12 @@ def get_system_info_page(self): else: self.session.post(url=tsv_auth_url, json=tsv_login_body) - self.headers['X-Atlassian-Token'] = 'no-check' - system_info_html = self.session.post(url=auth_url, data=auth_body, headers=self.headers) + auth_body['atl_token'] = self.session.cookies.get_dict()['atlassian.xsrf.token'] + system_info_html = self.session.post(url=auth_url, data=auth_body, verify=self.verify) return system_info_html.content.decode("utf-8") def get_deployment_type(self): - html_pattern = 'com.atlassian.dcapt.deployment=terraform' + html_pattern = 'deployment=terraform' confluence_system_page = self.get_system_info_page() if confluence_system_page.count(html_pattern): return 'terraform' From 796b646bb2e3f63f6ca0dbf2b9a233df386a4aa3 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 11 Mar 2025 15:01:27 +0200 Subject: [PATCH 141/765] upd info page --- app/util/api/confluence_clients.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py index f9abc174e..1e8aa794c 100644 --- a/app/util/api/confluence_clients.py +++ b/app/util/api/confluence_clients.py @@ -202,7 +202,7 @@ def get_system_info_page(self): } auth_body = { - 'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa', + 'webSudoDestination': '/admin/systeminfo.action', 'webSudoIsPost': False, 'webSudoPassword': self.password } From 088e37519c04f077ce7b56261113430511dd06f7 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Wed, 12 Mar 2025 15:10:31 +0200 Subject: [PATCH 142/765] improvements for Confluence 8.5 --- app/util/api/confluence_clients.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py index 1e8aa794c..623d97615 100644 --- a/app/util/api/confluence_clients.py +++ b/app/util/api/confluence_clients.py @@ -192,7 +192,7 @@ def get_groups_membership(self, username): def get_system_info_page(self): login_url = f'{self.host}/dologin.action' - auth_url = f'{self.host}/admin/websudo.action' + auth_url = f'{self.host}/doauthenticate.action' tsv_auth_url = f'{self.host}/rest/tsv/1.0/authenticate' tsv_login_body = { 'username': self.user, @@ -202,9 +202,9 @@ def get_system_info_page(self): } auth_body = { - 'webSudoDestination': '/admin/systeminfo.action', - 'webSudoIsPost': False, - 'webSudoPassword': self.password + 'authenticate': 'Confirm', + 'destination': '/admin/systeminfo.action', + 'password': self.password, } login_page_response = self.session.get(login_url) @@ -219,8 +219,8 @@ def get_system_info_page(self): else: self.session.post(url=tsv_auth_url, json=tsv_login_body) - auth_body['atl_token'] = self.session.cookies.get_dict()['atlassian.xsrf.token'] - system_info_html = self.session.post(url=auth_url, data=auth_body, verify=self.verify) + system_info_html = self.session.post(url=auth_url, data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, verify=self.verify) + print(system_info_html.content.decode("utf-8")) return system_info_html.content.decode("utf-8") def get_deployment_type(self): From e26e4ddd01ed0e47368df09db7c79305679a7cfc Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Wed, 12 Mar 2025 15:11:18 +0200 Subject: [PATCH 143/765] remove print --- app/util/api/confluence_clients.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py index 623d97615..987a7bbac 100644 --- a/app/util/api/confluence_clients.py +++ b/app/util/api/confluence_clients.py @@ -220,7 +220,6 @@ def get_system_info_page(self): self.session.post(url=tsv_auth_url, json=tsv_login_body) system_info_html = self.session.post(url=auth_url, data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, verify=self.verify) - print(system_info_html.content.decode("utf-8")) return system_info_html.content.decode("utf-8") def get_deployment_type(self): From 357ad91d811dad7c9cfc80fdaa1c61a196c59e30 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Wed, 12 Mar 2025 16:42:20 +0200 Subject: [PATCH 144/765] confluence/websudo-selenium --- app/extension/confluence/extension_ui.py | 5 ++++- app/selenium_ui/confluence/pages/pages.py | 21 ++++++++++++++++++- app/selenium_ui/confluence/pages/selectors.py | 11 ++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/app/extension/confluence/extension_ui.py b/app/extension/confluence/extension_ui.py index ea4aa40e2..18a3dfb02 100644 --- a/app/extension/confluence/extension_ui.py +++ b/app/extension/confluence/extension_ui.py @@ -4,7 +4,7 @@ from selenium_ui.base_page import BasePage from selenium_ui.conftest import print_timing -from selenium_ui.confluence.pages.pages import Login, AllUpdates +from selenium_ui.confluence.pages.pages import Login, AllUpdates, AdminPage from util.conf import CONFLUENCE_SETTINGS @@ -29,6 +29,9 @@ def app_specific_action(webdriver, datasets): # login_page.first_user_setup() # all_updates_page = AllUpdates(webdriver) # all_updates_page.wait_for_page_loaded() + # # uncomment below line to do web_sudo and authorise access to admin pages + # # AdminPage(webdriver).go_to(password=password) + # # app_specific_user_login(username='admin', password='admin') # measure() diff --git a/app/selenium_ui/confluence/pages/pages.py b/app/selenium_ui/confluence/pages/pages.py index 2cd1a7804..a77559479 100644 --- a/app/selenium_ui/confluence/pages/pages.py +++ b/app/selenium_ui/confluence/pages/pages.py @@ -3,7 +3,7 @@ from selenium_ui.base_page import BasePage from selenium_ui.confluence.pages.selectors import UrlManager, LoginPageLocators, AllUpdatesLocators, PopupLocators,\ - PageLocators, DashboardLocators, TopPanelLocators, EditorLocators, LogoutLocators, XsrfTokenLocators + PageLocators, DashboardLocators, TopPanelLocators, EditorLocators, LogoutLocators, XsrfTokenLocators, AdminLocators class Login(BasePage): @@ -176,3 +176,22 @@ def save_edited_page(self): self.wait_until_invisible(EditorLocators.save_spinner) self.wait_until_any_ec_presented(selectors=[PageLocators.page_title, EditorLocators.confirm_publishing_button]) + + +class AdminPage(BasePage): + page_url = AdminLocators.admin_system_page_url + page_loaded_selector = AdminLocators.login_form + + def is_websudo(self): + return True if self.get_elements(AdminLocators.web_sudo_password) else False + + def do_websudo(self, password): + self.wait_until_clickable(AdminLocators.web_sudo_password).send_keys(password) + self.wait_until_clickable(AdminLocators.web_sudo_submit_btn).click() + self.wait_until_visible(AdminLocators.edit_baseurl) + + def go_to(self, password=None): + super().go_to() + self.wait_for_page_loaded() + if self.is_websudo(): + self.do_websudo(password) diff --git a/app/selenium_ui/confluence/pages/selectors.py b/app/selenium_ui/confluence/pages/selectors.py index b5eac8fe5..66f0ec020 100644 --- a/app/selenium_ui/confluence/pages/selectors.py +++ b/app/selenium_ui/confluence/pages/selectors.py @@ -11,6 +11,7 @@ def __init__(self, page_id=None): self.dashboard_params = '/dashboard.action#all-updates' self.edit_page_params = f'/pages/editpage.action?pageId={page_id}' self.logout_params = "/logout.action" + self.admin_system_params = f"/admin/viewgeneralconfig.action" def login_url(self): return f"{self.host}{self.login_params}" @@ -27,6 +28,9 @@ def edit_page_url(self): def logout_url(self): return f"{self.host}{self.logout_params}" + def admin_system_url(self): + return f"{self.host}{self.admin_system_params}" + class PopupLocators: popup_selectors = [ @@ -110,3 +114,10 @@ class LogoutLocators: class XsrfTokenLocators: xsrf_token = (By.ID, "atlassian-token") + +class AdminLocators: + admin_system_page_url = UrlManager().admin_system_url() + web_sudo_password = (By.ID, 'password') + web_sudo_submit_btn = (By.ID, 'authenticateButton') + login_form = (By.ID, 'login-container') + edit_baseurl = (By.ID, 'editbaseurl') From 7c6e00882cb5572603e4bb83444c24c0b990b549 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 13 Mar 2025 12:14:42 +0200 Subject: [PATCH 145/765] use hardcoded cqls --- app/jmeter/confluence.jmx | 201 +++++++++++++++++++++----- app/selenium_ui/confluence/modules.py | 11 +- app/selenium_ui/confluence_ui.py | 7 +- 3 files changed, 179 insertions(+), 40 deletions(-) diff --git a/app/jmeter/confluence.jmx b/app/jmeter/confluence.jmx index 3b22e2aca..30501ba7a 100644 --- a/app/jmeter/confluence.jmx +++ b/app/jmeter/confluence.jmx @@ -91,7 +91,7 @@ shareMode.all - + total_actions_per_hr @@ -163,7 +163,7 @@ - + true false @@ -253,7 +253,7 @@ if ("NOT_FOUND".equals(loginform)) { - + ${__groovy(vars.get("legacy_login_form") == 'false')} false true @@ -301,7 +301,7 @@ if ("NOT_FOUND".equals(loginform)) { - + ${__groovy(vars.get("legacy_login_form") == 'true')} false true @@ -498,7 +498,7 @@ vars.put("confluence-version-number", "" + (versionNumbers[0 - + true -1 @@ -527,7 +527,7 @@ vars.put("confluence-version-number", "" + (versionNumbers[0 page_id,space_key - + datasets/confluence/cqls.csv UTF-8 , @@ -1029,7 +1029,7 @@ if ( sleep_time > 0 ) { - + 1 false 1 @@ -1486,14 +1486,14 @@ if ( sleep_time > 0 ) { - + 1 false 1 ${perc_search_cql} - + 1 0 0 @@ -1509,7 +1509,7 @@ if ( sleep_time > 0 ) { - + true false @@ -1556,12 +1556,12 @@ if ( sleep_time > 0 ) { - + true false - + ${application.postfix}/rest/api/search true GET @@ -1572,7 +1572,136 @@ if ( sleep_time > 0 ) { true cql - siteSearch~'${cql_var}' + siteSearch~"confluence agreement" + = + true + + + false + 0 + = + true + start + + + false + 20 + = + true + limit + + + + + + + + + Accept-Language + en-US,en;q=0.5 + + + X-Requested-With + XMLHttpRequest + + + Accept-Encoding + gzip, deflate + + + Accept + application/json, text/javascript, */*; q=0.01 + + + + + + + {"results":[ + + + Assertion.response_data + false + 16 + + + + + + 1 + 0 + 0 + + + + true + + + // concurrency +def concurrency = ctx.getThreadGroup().getNumThreads() + +// Delays between each action in milli-seconds +def delay_between_transactions = (1000 * 3600) / (vars.get("total_actions_per_hr").toDouble() / concurrency.toDouble()) + +//Sets the pacing length based on the last requests response time. x is the time in ms +def start_time = Long.valueOf(vars.get("loop_start_time")) +def sleep_time = (delay_between_transactions - (System.currentTimeMillis() - start_time)) as int +def action_time = delay_between_transactions - sleep_time as int +def thread_number = ${__threadNum} as int + +log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time + ", thread_number: " + thread_number + ", jmeter_search_cql action_time: " + action_time) + +if ( sleep_time > 0 ) { + return sleep_time +} else { + return 0 +} + + groovy + + + + + + 1 + false + 1 + ${perc_search_cql} + + + + 1 + 0 + 0 + + + + true + + + vars.put("loop_start_time",String.valueOf(System.currentTimeMillis())); + + groovy + + + + + true + false + + + + ${application.postfix}/rest/api/search + true + GET + true + false + + + + true + cql + siteSearch~"shoulder trip discussion" = true @@ -5367,7 +5496,7 @@ if ( sleep_time > 0 ) { - + app_specific_username @@ -5382,13 +5511,13 @@ if ( sleep_time > 0 ) { - + ${__groovy(vars.get("legacy_login_form") == 'false')} false true - + 2sv login flow ${application.postfix}/rest/tsv/1.0/authenticate POST @@ -5409,7 +5538,7 @@ if ( sleep_time > 0 ) { - + Content-Type @@ -5418,7 +5547,7 @@ if ( sleep_time > 0 ) { - + 200 @@ -5428,7 +5557,7 @@ if ( sleep_time > 0 ) { 2 - + groovy @@ -5436,7 +5565,7 @@ if ( sleep_time > 0 ) { vars.put("run_as_specific_user", "true") - + groovy @@ -5446,13 +5575,13 @@ if ( sleep_time > 0 ) { - + ${__groovy(vars.get("legacy_login_form") == 'true')} false true - + Detected the start of a redirect chain ${application.postfix}/dologin.action POST @@ -5499,7 +5628,7 @@ if ( sleep_time > 0 ) { - + Accept-Language @@ -5534,7 +5663,7 @@ if ( sleep_time > 0 ) { 2 - + groovy @@ -5542,7 +5671,7 @@ if ( sleep_time > 0 ) { vars.put("run_as_specific_user", "true") - + groovy @@ -5552,7 +5681,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/rest/api/user/current true GET @@ -5563,7 +5692,7 @@ if ( sleep_time > 0 ) { - + groovy @@ -5587,7 +5716,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + true false @@ -5635,7 +5764,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + ${application.postfix}/app/post_endpoint true GET @@ -5673,19 +5802,19 @@ if (response_data.username != vars.get("app_specific_username")) { - + ${run_as_specific_user} false true - + ${__groovy(vars.get("legacy_login_form") == 'false')} false true - + 2sv login flow ${application.postfix}/rest/tsv/1.0/authenticate POST @@ -5749,7 +5878,7 @@ if (response_data.username != vars.get("app_specific_username")) { true - + Detected the start of a redirect chain ${application.postfix}/dologin.action POST @@ -5849,7 +5978,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + ${application.postfix}/rest/api/user/current true GET @@ -5860,7 +5989,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + groovy @@ -5882,7 +6011,7 @@ if (response_data.username != vars.get("username")) { - + 1 0 0 diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index 4e14d76a4..0deeb9994 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -301,8 +301,15 @@ def sub_measure(): measure() +def cql_search_three_words(webdriver, datasets): + cql_search(webdriver, datasets, cql_string='shoulder trip discussion') -def cql_search(webdriver, datasets): + +def cql_search_two_words(webdriver, datasets): + cql_search(webdriver, datasets, cql_string='confluence agreement') + + +def cql_search(webdriver, datasets, cql_string): random_cql = random.choice(datasets[CQLS]) page = Page(webdriver) page.wait_until_visible(PageLocators.search_box) @@ -310,7 +317,7 @@ def cql_search(webdriver, datasets): @print_timing("selenium_cql_search") def measure(): - page.get_element(PageLocators.search_box).send_keys(random_cql) + page.get_element(PageLocators.search_box).send_keys(cql_string) page.wait_until_any_ec_presented((PageLocators.empty_search_results, PageLocators.search_results), timeout=30) page.get_element(PageLocators.close_search_button).click() diff --git a/app/selenium_ui/confluence_ui.py b/app/selenium_ui/confluence_ui.py index 49b3e9fee..fc4ea3490 100644 --- a/app/selenium_ui/confluence_ui.py +++ b/app/selenium_ui/confluence_ui.py @@ -22,6 +22,8 @@ def test_1_selenium_view_page(confluence_webdriver, confluence_datasets, conflue def test_1_selenium_view_page_from_cache(confluence_webdriver, confluence_datasets, confluence_screen_shots): modules.view_page_from_cache(confluence_webdriver, confluence_datasets) +def test_1_selenium_cql_search_two_words(confluence_webdriver, confluence_datasets, confluence_screen_shots): + modules.cql_search_two_words(confluence_webdriver, confluence_datasets) def test_1_selenium_create_page(confluence_webdriver, confluence_datasets, confluence_screen_shots): modules.create_confluence_page(confluence_webdriver, confluence_datasets) @@ -39,8 +41,9 @@ def test_1_selenium_create_inline_comment(confluence_webdriver, confluence_datas modules.create_inline_comment(confluence_webdriver, confluence_datasets) -def test_1_selenium_cql_search(confluence_webdriver, confluence_datasets, confluence_screen_shots): - modules.cql_search(confluence_webdriver, confluence_datasets) +def test_1_selenium_cql_search_three_words(confluence_webdriver, confluence_datasets, confluence_screen_shots): + modules.cql_search_three_words(confluence_webdriver, confluence_datasets) + """ From 3a6c70902ad49668a3188c23efec6bbe29ce7ae3 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 13 Mar 2025 13:15:11 +0100 Subject: [PATCH 146/765] DCA-2451 Locust Jira - run as app specific user 2sv --- app/locustio/common_utils.py | 102 +++++++++++++++++++++++------------ 1 file changed, 69 insertions(+), 33 deletions(-) diff --git a/app/locustio/common_utils.py b/app/locustio/common_utils.py index 1c9149ff8..b31ee8816 100644 --- a/app/locustio/common_utils.py +++ b/app/locustio/common_utils.py @@ -1,22 +1,20 @@ -import functools - -from locust import events -import time import csv -import re +import functools +import inspect +import json import logging import random -import string -import json +import re import socket -from logging.handlers import RotatingFileHandler +import string +import time from datetime import datetime +from logging.handlers import RotatingFileHandler + +from locust import exception, TaskSet, events + from util.conf import JIRA_SETTINGS, CONFLUENCE_SETTINGS, JSM_SETTINGS, BAMBOO_SETTINGS, BaseAppSettings from util.project_paths import ENV_TAURUS_ARTIFACT_DIR -from locust import exception -import inspect -from locust import TaskSet - TEXT_HEADERS = { 'Accept-Language': 'en-US,en;q=0.5', @@ -66,10 +64,16 @@ 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8', "X-Atlassian-Token": "no-check" } +LOGIN_BODY = { + 'os_username': '', + 'os_password': '', + 'os_destination': '', + 'os_cookie': True, + 'user_role': '', + 'atl_token': '', + 'login': 'Log in' +} -JIRA_API_URL = '/' -CONFLUENCE_API_URL = '/' -BAMBOO_API_URL = '/' JIRA_TOKEN_PATTERN = r'name="atlassian-token" content="(.+?)">' CONFLUENCE_TOKEN_PATTERN = r'"ajs-atl-token" content="(.+?)"' @@ -368,36 +372,68 @@ def wrapper(*args, **kwargs): # Jira or JSM Agent - redefine token value if app == JIRA or (app == JSM and app_type == TYPE_AGENT): - url = JIRA_API_URL token_pattern = JIRA_TOKEN_PATTERN - # JSM Customer - elif app == JSM and app_type == TYPE_CUSTOMER: - url = JIRA_API_URL # Confluence - redefine token value elif app == CONFLUENCE: - url = CONFLUENCE_API_URL token_pattern = CONFLUENCE_TOKEN_PATTERN - # Bamboo - elif app == BAMBOO: - url = BAMBOO_API_URL - else: - raise Exception(f'The "{app}" application type is not known.') - def do_login(usr, pwd): + def do_login_jira(usr, pwd): locust.client.cookies.clear() - r = locust.get(url, auth=(usr, pwd), catch_response=True) - if token_pattern: - content = r.content.decode('utf-8') - token = fetch_by_re(token_pattern, content) - locust.session_data_storage["token"] = token + body = LOGIN_BODY + body['os_username'] = usr + body['os_password'] = pwd + + legacy_form = False + + # Check if 2sv login form + r = locust.get('/login.jsp', catch_response=True) + content = r.content.decode('utf-8') + if 'login-form-remember-me' in content: + legacy_form = True + + # 100 /login.jsp + if legacy_form: + locust.post('/login.jsp', body, + TEXT_HEADERS, + catch_response=True) + else: + login_body = {'username': usr, + 'password': pwd, + 'rememberMe': 'True', + 'targetUrl': '' + } + + headers = { + "Content-Type": "application/json" + } + + # 15 /rest/tsv/1.0/authenticate + locust.post('/rest/tsv/1.0/authenticate', + json=login_body, + headers=headers, + catch_response=True) + + r = locust.get('/', catch_response=True) + if not r.content: + raise Exception('Please check server hostname in jira.yml file') + if token_pattern: + content = r.content.decode('utf-8') + token = fetch_by_re(token_pattern, content) + locust.session_data_storage["token"] = token # send requests by the specific user - do_login(usr=username, pwd=password) + if app == JIRA or (app == JSM and app_type == TYPE_AGENT): + do_login_jira(usr=username, pwd=password) + else: + raise SystemExit(f"Unsupported app type: {app}") func(*args, **kwargs) # send requests by the session user - do_login(usr=session_user_name, pwd=session_user_password) + if app == JIRA or (app == JSM and app_type == TYPE_AGENT): + do_login_jira(usr=session_user_name, pwd=session_user_password) + else: + raise SystemExit(f"Unsupported app type: {app}") else: raise SystemExit(f"There is no 'locust' object in the '{func.__name__}' function.") From 17a090932b5c4e6c60546a05e0fdfc2533ff9a40 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 14 Mar 2025 14:56:54 +0200 Subject: [PATCH 147/765] hardcode for cql --- app/locustio/confluence/http_actions.py | 35 ++++++++++++++++--- app/locustio/confluence/locustfile.py | 6 +++- app/selenium_ui/confluence/modules.py | 14 ++++---- app/selenium_ui/confluence_ui.py | 9 ++--- .../confluence_prepare_data.py | 4 --- 5 files changed, 48 insertions(+), 20 deletions(-) diff --git a/app/locustio/confluence/http_actions.py b/app/locustio/confluence/http_actions.py index 805e3ec89..3457fba78 100644 --- a/app/locustio/confluence/http_actions.py +++ b/app/locustio/confluence/http_actions.py @@ -12,6 +12,9 @@ logger = init_logger(app_type='confluence') confluence_dataset = confluence_datasets() +TWO_WORDS_CQL = 'confluence agreement' +THREE_WORDS_CQL = 'shoulder trip discussion' + @confluence_measure('locust_login_and_view_dashboard') def login_and_view_dashboard(locust): @@ -402,9 +405,8 @@ def view_blog(locust): catch_response=True) -def search_cql_and_view_results(locust): +def search_cql_two_words_and_view_results(locust): raise_if_login_failed(locust) - cql = random.choice(confluence_dataset["cqls"])[0] @confluence_measure('locust_search_cql:recently_viewed') def search_recently_viewed(): @@ -413,11 +415,11 @@ def search_recently_viewed(): '?limit=8', catch_response=True) - @confluence_measure('locust_search_cql:search_results') + @confluence_measure('locust_search_cql:search_results_2_words') def search_cql(): # 530 rest/api/search r = locust.get(f"/rest/api/search" - f"?cql=siteSearch~'{cql}'" + f"?cql=siteSearch~'{TWO_WORDS_CQL}'" f"&start=0" f"&limit=20", catch_response=True) @@ -435,6 +437,31 @@ def search_cql(): search_recently_viewed() search_cql() +def search_cql_three_words(locust): + raise_if_login_failed(locust) + + @confluence_measure('locust_search_cql:search_results_3_words') + def search_cql(): + # 530 rest/api/search + r = locust.get(f"/rest/api/search" + f"?cql=siteSearch~'{THREE_WORDS_CQL}'" + f"&start=0" + f"&limit=20", + catch_response=True) + + if '{"results":[' not in r.content.decode('utf-8'): + logger.locust_info(r.content.decode('utf-8')) + content = r.content.decode('utf-8') + if 'results' not in content: + logger.error(f"Search cql failed: {content}") + assert 'results' in content, "Search cql failed." + + # 540 rest/mywork/latest/status/notification/count + locust.get('/rest/mywork/latest/status/notification/count', catch_response=True) + + search_cql() + + def open_editor_and_create_blog(locust): params = CreateBlog() diff --git a/app/locustio/confluence/locustfile.py b/app/locustio/confluence/locustfile.py index 9e9a5ab8e..88a4a7cf5 100644 --- a/app/locustio/confluence/locustfile.py +++ b/app/locustio/confluence/locustfile.py @@ -30,7 +30,11 @@ def view_blog_action(self): @task(config.percentage('search_cql')) def search_cql_action(self): - search_cql_and_view_results(self) + search_cql_two_words_and_view_results(self) + + @task(config.percentage('search_cql')) + def search_cql_action(self): + search_cql_three_words(self) @task(config.percentage('create_blog')) def create_blog_action(self): diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index 0deeb9994..a37580167 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -13,7 +13,8 @@ CQLS = "cqls" CUSTOM_PAGES = "custom_pages" BLOGS = "blogs" - +TWO_WORDS_CQL = 'confluence agreement' +THREE_WORDS_CQL = 'shoulder trip discussion' def setup_run_data(datasets): datasets['current_session'] = {} @@ -301,16 +302,15 @@ def sub_measure(): measure() -def cql_search_three_words(webdriver, datasets): - cql_search(webdriver, datasets, cql_string='shoulder trip discussion') +def cql_search_three_words(webdriver): + return cql_search(webdriver, cql_string=THREE_WORDS_CQL) -def cql_search_two_words(webdriver, datasets): - cql_search(webdriver, datasets, cql_string='confluence agreement') +def cql_search_two_words(webdriver): + return cql_search(webdriver, cql_string=TWO_WORDS_CQL) -def cql_search(webdriver, datasets, cql_string): - random_cql = random.choice(datasets[CQLS]) +def cql_search(webdriver, cql_string): page = Page(webdriver) page.wait_until_visible(PageLocators.search_box) PopupManager(webdriver).dismiss_default_popup() diff --git a/app/selenium_ui/confluence_ui.py b/app/selenium_ui/confluence_ui.py index fc4ea3490..a723b767d 100644 --- a/app/selenium_ui/confluence_ui.py +++ b/app/selenium_ui/confluence_ui.py @@ -22,9 +22,6 @@ def test_1_selenium_view_page(confluence_webdriver, confluence_datasets, conflue def test_1_selenium_view_page_from_cache(confluence_webdriver, confluence_datasets, confluence_screen_shots): modules.view_page_from_cache(confluence_webdriver, confluence_datasets) -def test_1_selenium_cql_search_two_words(confluence_webdriver, confluence_datasets, confluence_screen_shots): - modules.cql_search_two_words(confluence_webdriver, confluence_datasets) - def test_1_selenium_create_page(confluence_webdriver, confluence_datasets, confluence_screen_shots): modules.create_confluence_page(confluence_webdriver, confluence_datasets) @@ -33,6 +30,10 @@ def test_1_selenium_edit_by_url(confluence_webdriver, confluence_datasets, confl modules.edit_confluence_page_by_url(confluence_webdriver, confluence_datasets) +def test_1_selenium_cql_search_two_words(confluence_webdriver, confluence_datasets, confluence_screen_shots): + modules.cql_search_two_words(confluence_webdriver) + + def test_1_selenium_edit_page_quick_edit(confluence_webdriver, confluence_datasets, confluence_screen_shots): modules.edit_confluence_page_quick_edit(confluence_webdriver, confluence_datasets) @@ -42,7 +43,7 @@ def test_1_selenium_create_inline_comment(confluence_webdriver, confluence_datas def test_1_selenium_cql_search_three_words(confluence_webdriver, confluence_datasets, confluence_screen_shots): - modules.cql_search_three_words(confluence_webdriver, confluence_datasets) + modules.cql_search_three_words(confluence_webdriver) diff --git a/app/util/data_preparation/confluence_prepare_data.py b/app/util/data_preparation/confluence_prepare_data.py index 0bec9c027..920428854 100644 --- a/app/util/data_preparation/confluence_prepare_data.py +++ b/app/util/data_preparation/confluence_prepare_data.py @@ -76,8 +76,6 @@ def __create_data_set(rest_client, rpc_client): dataset[PAGES] = async_pages.get() dataset[BLOGS] = async_blogs.get() - dataset[CQLS] = __generate_cqls(words_count=CQL_WORDS_COUNT) - dataset[CUSTOM_PAGES] = __get_custom_pages(perf_user_api, 5000, CONFLUENCE_SETTINGS.custom_dataset_query) print(f'Users count: {len(dataset[USERS])}') print(f'Pages count: {len(dataset[PAGES])}') @@ -211,8 +209,6 @@ def write_test_data_to_files(dataset): users = [f"{user['user']['username']},{DEFAULT_USER_PASSWORD}" for user in dataset[USERS]] __write_to_file(CONFLUENCE_USERS, users) - __write_to_file(CONFLUENCE_CQLS, dataset[CQLS]) - custom_pages = [f"{page['id']},{page['space']['key']}" for page in dataset[CUSTOM_PAGES]] __write_to_file(CONFLUENCE_CUSTOM_PAGES, custom_pages) From 408ef6c68d120ad6e10a166af57cb529c290ca04 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 18 Mar 2025 11:20:01 +0200 Subject: [PATCH 148/765] test on new snapshots --- app/util/k8s/dcapt-snapshots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 74b14cdef..ca034a3d2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -323,7 +323,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0-fixed", "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-0" } ] From d29cf47a621c35bb73b4a0978b9ab15e9679292d Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 18 Mar 2025 15:34:55 +0200 Subject: [PATCH 149/765] fix jmeter --- app/jmeter/confluence.jmx | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/app/jmeter/confluence.jmx b/app/jmeter/confluence.jmx index 30501ba7a..97b604f2c 100644 --- a/app/jmeter/confluence.jmx +++ b/app/jmeter/confluence.jmx @@ -91,7 +91,7 @@ shareMode.all - + total_actions_per_hr @@ -163,7 +163,7 @@ - + true false @@ -527,17 +527,6 @@ vars.put("confluence-version-number", "" + (versionNumbers[0 page_id,space_key - - datasets/confluence/cqls.csv - UTF-8 - , - cql_var - true - false - true - false - - , @@ -1029,7 +1018,7 @@ if ( sleep_time > 0 ) { - + 1 false 1 @@ -1493,7 +1482,7 @@ if ( sleep_time > 0 ) { ${perc_search_cql} - + 1 0 0 @@ -1509,7 +1498,7 @@ if ( sleep_time > 0 ) { - + true false @@ -1627,7 +1616,7 @@ if ( sleep_time > 0 ) { - + 1 0 0 @@ -1662,14 +1651,14 @@ if ( sleep_time > 0 ) { - + 1 false 1 ${perc_search_cql} - + 1 0 0 @@ -1685,12 +1674,12 @@ if ( sleep_time > 0 ) { - + true false - + ${application.postfix}/rest/api/search true GET From 6c7e80aed34b704c39e459408e2bec994a949da3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 20 Mar 2025 06:00:53 +0100 Subject: [PATCH 150/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 2ee27a89b..f0685b975 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6acbc167e7660515c1495fd50c51f9dba3250559 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 20 Mar 2025 06:00:53 +0100 Subject: [PATCH 151/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 20fd14d79..a533a7fcc 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a2324c72cfaeda73c431ec5e892a47ffd33051bd Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 20 Mar 2025 06:00:54 +0100 Subject: [PATCH 152/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 1cbb8cdc4..a0c50a796 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 046f888c74bf5d3627c0946cfee7ebfbd0fcaf46 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 20 Mar 2025 06:00:55 +0100 Subject: [PATCH 153/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index c5d71ce3e..fd1feb9c6 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 317d7b101eca0ec88c826f4212452c86dfcf8745 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 20 Mar 2025 06:00:55 +0100 Subject: [PATCH 154/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index fd1cf1da4..2101fc574 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.88" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0660cf88229ed834960dfacbc13de7678cea779a Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 20 Mar 2025 14:17:07 +0200 Subject: [PATCH 155/765] fix cqls for selenium --- app/locustio/confluence/requests_params.py | 4 +--- app/selenium_ui/confluence/modules.py | 8 ++++---- app/selenium_ui/conftest.py | 3 +-- app/util/data_preparation/confluence_prepare_data.py | 2 +- app/util/project_paths.py | 1 - 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/locustio/confluence/requests_params.py b/app/locustio/confluence/requests_params.py index e4d7d26a6..f0a9cd706 100644 --- a/app/locustio/confluence/requests_params.py +++ b/app/locustio/confluence/requests_params.py @@ -1,7 +1,6 @@ # flake8: noqa from locustio.common_utils import read_input_file, BaseResource -from util.project_paths import (CONFLUENCE_PAGES, CONFLUENCE_BLOGS, CONFLUENCE_USERS, CONFLUENCE_STATIC_CONTENT, - CONFLUENCE_CQLS) +from util.project_paths import (CONFLUENCE_PAGES, CONFLUENCE_BLOGS, CONFLUENCE_USERS, CONFLUENCE_STATIC_CONTENT) def confluence_datasets(): @@ -9,7 +8,6 @@ def confluence_datasets(): data_sets["pages"] = read_input_file(CONFLUENCE_PAGES) data_sets["blogs"] = read_input_file(CONFLUENCE_BLOGS) data_sets["users"] = read_input_file(CONFLUENCE_USERS) - data_sets["cqls"] = read_input_file(CONFLUENCE_CQLS) data_sets['static-content'] = read_input_file(CONFLUENCE_STATIC_CONTENT) return data_sets diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index a37580167..8acc0c6d1 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -303,19 +303,19 @@ def sub_measure(): measure() def cql_search_three_words(webdriver): - return cql_search(webdriver, cql_string=THREE_WORDS_CQL) + return cql_search(webdriver, cql_string=THREE_WORDS_CQL, print_timing_suffix='3_words') def cql_search_two_words(webdriver): - return cql_search(webdriver, cql_string=TWO_WORDS_CQL) + return cql_search(webdriver, cql_string=TWO_WORDS_CQL, print_timing_suffix='2_words') -def cql_search(webdriver, cql_string): +def cql_search(webdriver, cql_string, print_timing_suffix): page = Page(webdriver) page.wait_until_visible(PageLocators.search_box) PopupManager(webdriver).dismiss_default_popup() - @print_timing("selenium_cql_search") + @print_timing(f"selenium_cql_search_{print_timing_suffix}") def measure(): page.get_element(PageLocators.search_box).send_keys(cql_string) page.wait_until_any_ec_presented((PageLocators.empty_search_results, PageLocators.search_results), diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index 4b50489a2..4006b9e85 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -24,7 +24,7 @@ BITBUCKET_PROJECTS, BITBUCKET_REPOS, BITBUCKET_PRS, CONFLUENCE_BLOGS, CONFLUENCE_PAGES, CONFLUENCE_CUSTOM_PAGES, \ CONFLUENCE_USERS, ENV_TAURUS_ARTIFACT_DIR, JSM_DATASET_REQUESTS, JSM_DATASET_CUSTOMERS, JSM_DATASET_AGENTS, \ JSM_DATASET_SERVICE_DESKS_L, JSM_DATASET_SERVICE_DESKS_M, JSM_DATASET_SERVICE_DESKS_S, JSM_DATASET_CUSTOM_ISSUES, \ - JSM_DATASET_INSIGHT_SCHEMAS, JSM_DATASET_INSIGHT_ISSUES, BAMBOO_USERS, BAMBOO_BUILD_PLANS, CONFLUENCE_CQLS + JSM_DATASET_INSIGHT_SCHEMAS, JSM_DATASET_INSIGHT_ISSUES, BAMBOO_USERS, BAMBOO_BUILD_PLANS SCREEN_WIDTH = 1920 SCREEN_HEIGHT = 1080 @@ -87,7 +87,6 @@ def confluence_dataset(self): self.dataset["pages"] = self.__read_input_file(CONFLUENCE_PAGES) self.dataset["blogs"] = self.__read_input_file(CONFLUENCE_BLOGS) self.dataset["users"] = self.__read_input_file(CONFLUENCE_USERS) - self.dataset["cqls"] = self.__read_input_file(CONFLUENCE_CQLS) self.dataset["custom_pages"] = self.__read_input_file( CONFLUENCE_CUSTOM_PAGES) return self.dataset diff --git a/app/util/data_preparation/confluence_prepare_data.py b/app/util/data_preparation/confluence_prepare_data.py index 920428854..5be5167ae 100644 --- a/app/util/data_preparation/confluence_prepare_data.py +++ b/app/util/data_preparation/confluence_prepare_data.py @@ -8,7 +8,7 @@ from util.api.confluence_clients import ConfluenceRpcClient, ConfluenceRestClient from util.common_util import print_timing from util.conf import CONFLUENCE_SETTINGS -from util.project_paths import (CONFLUENCE_USERS, CONFLUENCE_PAGES, CONFLUENCE_BLOGS, CONFLUENCE_CQLS, +from util.project_paths import (CONFLUENCE_USERS, CONFLUENCE_PAGES, CONFLUENCE_BLOGS, CONFLUENCE_CUSTOM_PAGES, CONFLUENCE_WORDS) __warnings_filter() diff --git a/app/util/project_paths.py b/app/util/project_paths.py index a439fab3b..f4ba35504 100644 --- a/app/util/project_paths.py +++ b/app/util/project_paths.py @@ -121,7 +121,6 @@ def __get_default_test_actions(): CONFLUENCE_USERS = __get_confluence_dataset('users.csv') CONFLUENCE_PAGES = __get_confluence_dataset('pages.csv') CONFLUENCE_BLOGS = __get_confluence_dataset('blogs.csv') -CONFLUENCE_CQLS = __get_confluence_dataset('cqls.csv') CONFLUENCE_STATIC_CONTENT = __get_confluence_dataset('static-content/files_upload.csv') CONFLUENCE_CUSTOM_PAGES = __get_confluence_dataset('custom_pages.csv') CONFLUENCE_WORDS = __get_confluence_dataset('static-content/words.csv') From e50b658019bd470bda99563bd2c084d773a5fa84 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 22 Mar 2025 06:01:46 +0100 Subject: [PATCH 156/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f0685b975..697b2e145 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 472fae8bb1d9d045ed981c804abcb3bf5c5edd43 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 22 Mar 2025 06:01:47 +0100 Subject: [PATCH 157/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index a533a7fcc..b0feeb27d 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6a7e17311ca9689e41beb862b5185121287d65ff Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 22 Mar 2025 06:01:47 +0100 Subject: [PATCH 158/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index a0c50a796..b970be170 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0e8f6167c7397e818997f55fed0a74204f7e90e3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 22 Mar 2025 06:01:48 +0100 Subject: [PATCH 159/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index fd1feb9c6..7ea3f55c1 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bce9b4cfa4ebd9ff9a9bf2e1e8439ab1976d96a1 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 22 Mar 2025 06:01:49 +0100 Subject: [PATCH 160/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 2101fc574..4d04acf47 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.90" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 15b8baac665935811125d66da49d684e974ec6fb Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 24 Mar 2025 10:02:07 +0200 Subject: [PATCH 161/765] fix default test actions --- app/util/default_test_actions.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/util/default_test_actions.json b/app/util/default_test_actions.json index 6321e0396..8c07a9eaa 100644 --- a/app/util/default_test_actions.json +++ b/app/util/default_test_actions.json @@ -87,7 +87,8 @@ "selenium_create_comment", "selenium_create_comment:write_comment", "selenium_create_comment:save_comment", - "selenium_cql_search", + "selenium_cql_search_two_words", + "selenium_cql_search_three_words", "selenium_log_out" ], "jmeter": [ @@ -95,7 +96,8 @@ "jmeter_view_page:open_page", "jmeter_view_blog", "jmeter_search_cql:recently_viewed", - "jmeter_search_cql:search_results", + "jmeter_search_cql:search_results_2_words", + "jmeter_search_cql:search_results_3_words", "jmeter_view_dashboard", "jmeter_create_and_edit_page:create_page_editor", "jmeter_create_and_edit_page:create_page", @@ -116,7 +118,8 @@ "locust_view_dashboard", "locust_view_blog", "locust_search_cql:recently_viewed", - "locust_search_cql:search_results", + "locust_search_cql:search_results_3_words", + "locust_search_cql:search_results_2_words", "locust_comment_page", "locust_create_and_edit_page:create_page_editor", "locust_create_and_edit_page:create_page", From 4cbb0589a8b93dbe4b7ce252d013e197d43bb5c0 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 24 Mar 2025 11:20:23 +0200 Subject: [PATCH 162/765] confluence/bump-9-2-upm --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 22 +++++++++++----------- app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 56c9bbfe0..4ca1cc1b4 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): `5.12.17` and `10.3.1` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.18` and `9.2.0` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.18` and `9.2.2` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.14` and `9.4.1` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 3c92e75e9..963a17c18 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -161,7 +161,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "9.2.0" +confluence_version_tag = "9.2.2" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 74b14cdef..642a67013 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -286,15 +286,15 @@ "build_number": "9012" }, { - "version": "9.2.0", + "version": "9.2.2", "data": [ { "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "snap-03bd9289ff7b87051", - "us-east-1": "snap-0d1ceb385cdf36d84" + "us-east-2": "snap-0cd3a211ef6d9c1d4", + "us-east-1": "snap-08552ebe7c3185082" } ] }, @@ -303,8 +303,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-0" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-2" } ] }, @@ -313,8 +313,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0877428a1f19c5de2", - "us-east-1": "snap-04deb20a69b0dc23b" + "us-east-2": "snap-03b8437f931e28c57", + "us-east-1": "snap-0fd19ad39c99d286f" } ] }, @@ -323,8 +323,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-0" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-2" } ] }, @@ -333,8 +333,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0cee0a51628de136e", - "us-east-1": "snap-0c7d00e251e7ce592" + "us-east-2": "snap-0af55f20a2333c8a9", + "us-east-1": "snap-074976ace4598a845" } ] } diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index fe494eb2c..acae48b43 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -172,7 +172,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "9.2.0" +confluence_version_tag = "9.2.2" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "large" From 43cd97e894dddb4b073d69d464b5f0c78920fab7 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 24 Mar 2025 15:19:14 +0100 Subject: [PATCH 163/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 642a67013..71a75b2f5 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -110,6 +110,41 @@ ] } ] + }, + { + "version": "10.3.4", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-016011df34a062ba7", + "us-east-1": "snap-0d99e192c44742dc7" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-4", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-4" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-03d3f14a39e4b7267", + "us-east-1": "snap-0e9b37d13d94e9a48" + } + ] + } + ] } ] }, From 0eaecfaee6019f23f951c212fa5150ec8aeda417 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 25 Mar 2025 11:14:16 +0200 Subject: [PATCH 164/765] remove test snapshot --- app/util/k8s/dcapt-snapshots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ca034a3d2..74b14cdef 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -323,7 +323,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0-fixed", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-0", "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-0" } ] From 7ef1856eb35130e6357d63b9fcf29c9bd30f7a58 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 27 Mar 2025 11:45:36 +0200 Subject: [PATCH 165/765] added snapshots with upm Jira large --- app/util/k8s/dcapt-snapshots.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 71a75b2f5..7216b5542 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -119,8 +119,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-016011df34a062ba7", - "us-east-1": "snap-0d99e192c44742dc7" + "us-east-2": "snap-027e50d4e441175e7", + "us-east-1": "snap-05e66c50b0b9abaaa" } ] }, @@ -139,8 +139,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-03d3f14a39e4b7267", - "us-east-1": "snap-0e9b37d13d94e9a48" + "us-east-2": "snap-05ea132f3bd8851c0", + "us-east-1": "snap-06905c0e2956c8cf1" } ] } From 0bdce2552d4f76799f52f4afd45ec64e4e68a0e4 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 28 Mar 2025 11:19:37 +0200 Subject: [PATCH 166/765] added no-upm 10-3-4 jsm large ohio --- app/util/k8s/dcapt-snapshots.json | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 7216b5542..0649ad32f 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -259,6 +259,41 @@ ] } ] + }, + { + "version": "10.3.4", + "data": [ + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0322e3d70ad49e63d", + "us-east-1": "snap-06b87e40b22f84c9f" + } + ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-01842f9456a92712e", + "us-east-1": "snap-0f24c67fa1a002b07" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-4", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-4" + } + ] + } + ] } ] }, From f2cc3894b5473404b9b4dcaf34d98d5e6b4f0224 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 28 Mar 2025 18:45:53 +0200 Subject: [PATCH 167/765] added upm to jsm large 10.3.4 --- app/util/k8s/dcapt-snapshots.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 0649ad32f..555dbda6a 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -268,8 +268,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0322e3d70ad49e63d", - "us-east-1": "snap-06b87e40b22f84c9f" + "us-east-2": "snap-0feb610e3f8837536", + "us-east-1": "snap-06b06c30c3f6d3fd5" } ] }, @@ -278,8 +278,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-01842f9456a92712e", - "us-east-1": "snap-0f24c67fa1a002b07" + "us-east-2": "snap-017366c26d67a868e", + "us-east-1": "snap-0605f8d83017dee68" } ] }, From 1b70fdb41238e21cb5774b97c937718fff62a604 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 30 Mar 2025 15:49:45 +0300 Subject: [PATCH 168/765] added jira-small 10-3-4 --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 7216b5542..684a31023 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -143,6 +143,26 @@ "us-east-1": "snap-06905c0e2956c8cf1" } ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0a2e612a8f11232ef", + "us-east-1": "snap-061764b1ef2681388" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-3-4", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-4" + } + ] } ] } From 94e198e62b88e91a6d9e5cdf58bdf9771e951679 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 31 Mar 2025 12:05:56 +0300 Subject: [PATCH 169/765] added jsm small 10.3.4 without upm --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 555dbda6a..774eb6840 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -292,6 +292,26 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-4" } ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-05af1274badb2e616", + "us-east-1": "snap-" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-4", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-4" + } + ] } ] } From 563ae3f8f4003918377f9e395360044e9e893ea7 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 31 Mar 2025 12:41:52 +0300 Subject: [PATCH 170/765] copy-results/fix-results-copying --- app/util/k8s/bzt_on_pod.sh | 4 ++-- app/util/k8s/copy_run_results.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index a438f4118..1a84c7cb9 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DCAPT_DOCKER_IMAGE="atlassian/dcapt" +DCAPT_DOCKER_IMAGE="atlassian/dcapt:dev" echo "INFO: DCAPT docker image: $DCAPT_DOCKER_IMAGE" if [[ -z "$ENVIRONMENT_NAME" ]]; then @@ -67,7 +67,7 @@ kubectl exec -it "$exec_pod_name" -n atlassian -- docker run --shm-size=4g -v "/ sleep 10 echo "INFO: Copy results folder from the exec env pod to local" -kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /dc-app-performance-toolkit/app/results +kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 diff --git a/app/util/k8s/copy_run_results.sh b/app/util/k8s/copy_run_results.sh index 766888949..799f7b2bf 100755 --- a/app/util/k8s/copy_run_results.sh +++ b/app/util/k8s/copy_run_results.sh @@ -30,7 +30,7 @@ fi echo "INFO: Execution environment pod name: $exec_pod_name" echo "INFO: Copy results folder from the exec env pod to local" -kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /dc-app-performance-toolkit/app/results +kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 From c85510c5be9e1c8d20a74831493b8b1c849131a7 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 31 Mar 2025 12:47:22 +0300 Subject: [PATCH 171/765] remove dev tag --- app/util/k8s/bzt_on_pod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index 1a84c7cb9..74252efeb 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DCAPT_DOCKER_IMAGE="atlassian/dcapt:dev" +DCAPT_DOCKER_IMAGE="atlassian/dcapt" echo "INFO: DCAPT docker image: $DCAPT_DOCKER_IMAGE" if [[ -z "$ENVIRONMENT_NAME" ]]; then From 25918712320f7c9e88bade3cd459bd0b0c274fe5 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 31 Mar 2025 12:56:07 +0300 Subject: [PATCH 172/765] added jsm small 10-3-4 upm --- app/util/k8s/dcapt-snapshots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 774eb6840..6ce539874 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -298,8 +298,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-05af1274badb2e616", - "us-east-1": "snap-" + "us-east-2": "snap-09d1a3aae5d18957b", + "us-east-1": "snap-04236bd26d6533992" } ] }, From 5ef259a5b482ba4490933442a998e9dd362cb3b1 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 31 Mar 2025 15:14:14 +0300 Subject: [PATCH 173/765] copy-results/avoid-results-subfolder --- app/util/k8s/bzt_on_pod.sh | 2 +- app/util/k8s/copy_run_results.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index 74252efeb..b6e619b4a 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -67,7 +67,7 @@ kubectl exec -it "$exec_pod_name" -n atlassian -- docker run --shm-size=4g -v "/ sleep 10 echo "INFO: Copy results folder from the exec env pod to local" -kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results +kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - --transform='s|^results/||' -C /data-center-terraform/dc-app-performance-toolkit/app/results if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 diff --git a/app/util/k8s/copy_run_results.sh b/app/util/k8s/copy_run_results.sh index 799f7b2bf..22c96faf2 100755 --- a/app/util/k8s/copy_run_results.sh +++ b/app/util/k8s/copy_run_results.sh @@ -30,7 +30,7 @@ fi echo "INFO: Execution environment pod name: $exec_pod_name" echo "INFO: Copy results folder from the exec env pod to local" -kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results +kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - --transform='s|^results/||' -C /data-center-terraform/dc-app-performance-toolkit/app/results if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 From 79534ad19db5359819cf36fa5cfdbc246ede3735 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 31 Mar 2025 15:49:00 +0300 Subject: [PATCH 174/765] use strip-components --- app/util/k8s/bzt_on_pod.sh | 2 +- app/util/k8s/copy_run_results.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index b6e619b4a..4c09675da 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -67,7 +67,7 @@ kubectl exec -it "$exec_pod_name" -n atlassian -- docker run --shm-size=4g -v "/ sleep 10 echo "INFO: Copy results folder from the exec env pod to local" -kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - --transform='s|^results/||' -C /data-center-terraform/dc-app-performance-toolkit/app/results +kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1 if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 diff --git a/app/util/k8s/copy_run_results.sh b/app/util/k8s/copy_run_results.sh index 22c96faf2..7cee93ef9 100755 --- a/app/util/k8s/copy_run_results.sh +++ b/app/util/k8s/copy_run_results.sh @@ -30,7 +30,7 @@ fi echo "INFO: Execution environment pod name: $exec_pod_name" echo "INFO: Copy results folder from the exec env pod to local" -kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - --transform='s|^results/||' -C /data-center-terraform/dc-app-performance-toolkit/app/results +kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1 if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 From 9b9164eb49ca64750b158e52bf8ef4ce088a2fae Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 1 Apr 2025 12:00:25 +0200 Subject: [PATCH 175/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 39 +++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 31602db9f..f6b24033e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -144,7 +144,7 @@ } ] }, - { + { "type": "ebs", "size": "small", "snapshots": [ @@ -313,7 +313,7 @@ } ] }, - { + { "type": "ebs", "size": "small", "snapshots": [ @@ -334,6 +334,41 @@ ] } ] + }, + { + "version": "5.12.19", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0e7a06bb82dd1d420", + "us-east-1": "snap-0b5e70a3d15389b83" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-12-19", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-12-19" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-063549033fee34aba", + "us-east-1": "snap-0b0d5e9364de611c5" + } + ] + } + ] } ] }, From d9b8b31d3aab54c9e226d97226b9dc021ca38810 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 1 Apr 2025 12:03:41 +0200 Subject: [PATCH 176/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 39 +++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 31602db9f..f9715fd61 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -144,7 +144,7 @@ } ] }, - { + { "type": "ebs", "size": "small", "snapshots": [ @@ -165,6 +165,41 @@ ] } ] + }, + { + "version": "9.12.19", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0fea6811c2f497082", + "us-east-1": "snap-0411cd2d1390040b4" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-12-19", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-12-19" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-05730c109aadccabf", + "us-east-1": "snap-076529679e89c43f4" + } + ] + } + ] } ] }, @@ -313,7 +348,7 @@ } ] }, - { + { "type": "ebs", "size": "small", "snapshots": [ From 0157cf5c5422810755de13c5510e72495db682b3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 2 Apr 2025 07:01:18 +0200 Subject: [PATCH 177/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 697b2e145..c4879285b 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8d3f4ad5b1aac6982b8e344fe5bfcb0811913cb0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 2 Apr 2025 07:01:18 +0200 Subject: [PATCH 178/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index b0feeb27d..b05227ad4 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8612af831ce4a67c7e11fdfa63783d739980d390 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 2 Apr 2025 07:01:19 +0200 Subject: [PATCH 179/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index b970be170..96b2d2839 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bc858ceacb57c5f1243de24ad45f29507e838201 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 2 Apr 2025 07:01:20 +0200 Subject: [PATCH 180/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 7ea3f55c1..272facc02 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f2a1405667e93311aa784d21ab1fc268867418a6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 2 Apr 2025 07:01:20 +0200 Subject: [PATCH 181/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 4d04acf47..be3f47d3f 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "134.0.6998.165" # Supports Chrome version 134. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 669646323e8c616e91a0bd0b10cd58a0d21ca2f9 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 3 Apr 2025 12:44:23 +0300 Subject: [PATCH 182/765] added jira 9.12.19 small --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f9715fd61..6946572a2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -198,6 +198,26 @@ "us-east-1": "snap-076529679e89c43f4" } ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-02fc7b1de3e444d6e", + "us-east-1": "snap-0c4f2b2cc58e2ca64" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-12-19", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-19" + } + ] } ] } From 3632905942201426b12979663f1e16ba8b95747f Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 3 Apr 2025 12:49:50 +0300 Subject: [PATCH 183/765] added 5.12.19 docs --- README.md | 4 +- app/util/k8s/dcapt-small.tfvars | 4 +- app/util/k8s/dcapt-snapshots.json | 240 +++--------------------------- app/util/k8s/dcapt.tfvars | 4 +- 4 files changed, 26 insertions(+), 226 deletions(-) diff --git a/README.md b/README.md index 4ca1cc1b4..384a2c99b 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): `9.12.17` and `10.3.0` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.19` and `10.3.4` * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.17` and `10.3.1` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.19` and `10.3.4` * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.18` and `9.2.2` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 963a17c18..85b32f47e 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -89,10 +89,10 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version. -jira_version_tag = "10.3.0" +jira_version_tag = "10.3.4" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "10.3.1" +# jira_version_tag = "10.3.4" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large jira_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 35bfc2069..52f79d1c1 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -1,116 +1,6 @@ { "jira": { "versions": [ - { - "version": "9.12.17", - "data": [ - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-06d9c6e477858e379", - "us-east-1": "snap-054815273a0c1fddc" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0be20f6987b960c88", - "us-east-1": "snap-08b3bdb6b083c84ec" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-12-17", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-12-17" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0dc9f5f8739e96aa4", - "us-east-1": "snap-07f295b5c6da0224f" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-12-17", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-17" - } - ] - } - ] - }, - { - "version": "10.3.0", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-03260aba5a188e81e", - "us-east-1": "snap-087b3154bb64b625f" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-0" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-022a6d10e6fb4a24b", - "us-east-1": "snap-0a28c4d98b4f14090" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-01028de0f83e60d8f", - "us-east-1": "snap-0bd8efeebd7eabc9e" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-3-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-0" - } - ] - } - ] - }, { "version": "10.3.4", "data": [ @@ -225,116 +115,6 @@ }, "jsm": { "versions": [ - { - "version": "5.12.17", - "data": [ - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0b7eef76ade618a32", - "us-east-1": "snap-0d0a260c6564be370" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-019290fc0d58fe919", - "us-east-1": "snap-0e4965f909a1564c8" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-12-17", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-12-17" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-04360846db0df3352", - "us-east-1": "snap-0489ec755e5c9c61c" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-12-17", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-17" - } - ] - } - ] - }, - { - "version": "10.3.1", - "data": [ - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0dccf556703c13e7d", - "us-east-1": "snap-06b87e40b22f84c9f" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0ca0574941e952446", - "us-east-1": "snap-0f24c67fa1a002b07" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-1" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-033df6a68e1378d2d", - "us-east-1": "snap-00a99bacfb8d6932a" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-1" - } - ] - } - ] - }, { "version": "10.3.4", "data": [ @@ -422,6 +202,26 @@ "us-east-1": "snap-0b0d5e9364de611c5" } ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-027bac6ece3a628a9", + "us-east-1": "snap-0b73b2ff6800a1ca4" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-12-19", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-19" + } + ] } ] } diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index acae48b43..5bd2a7995 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -110,11 +110,11 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version -jira_version_tag = "10.3.0" +jira_version_tag = "10.3.4" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "10.3.1" +# jira_version_tag = "10.3.4" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large. jira_dataset_size = "large" From 0f21714df335d8fb15ffa168a22bfc9102388849 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Thu, 3 Apr 2025 13:11:17 +0300 Subject: [PATCH 184/765] copy-results/add-retry-and-timeout --- app/util/k8s/bzt_on_pod.sh | 10 +++++++++- app/util/k8s/copy_run_results.sh | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index 4c09675da..0f7475f63 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -67,7 +67,15 @@ kubectl exec -it "$exec_pod_name" -n atlassian -- docker run --shm-size=4g -v "/ sleep 10 echo "INFO: Copy results folder from the exec env pod to local" -kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1 +for _ in {1..3}; do + if kubectl exec -n atlassian "$exec_pod_name" --request-timeout=60s -- tar czf - -C /dc-app-performance-toolkit/app results | tar xzf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1; then + break + else + echo "Copying failed, retrying..." + sleep 5 + fi +done + if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 diff --git a/app/util/k8s/copy_run_results.sh b/app/util/k8s/copy_run_results.sh index 7cee93ef9..280b74794 100755 --- a/app/util/k8s/copy_run_results.sh +++ b/app/util/k8s/copy_run_results.sh @@ -30,7 +30,16 @@ fi echo "INFO: Execution environment pod name: $exec_pod_name" echo "INFO: Copy results folder from the exec env pod to local" -kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1 + +for _ in {1..3}; do + if kubectl exec -n atlassian "$exec_pod_name" --request-timeout=60s -- tar czf - -C /dc-app-performance-toolkit/app results | tar xzf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1; then + break + else + echo "Copying failed, retrying..." + sleep 5 + fi +done + if [[ $? -ne 0 ]]; then echo "ERROR: Copy results folder failed" exit 1 From ebb7c4629a48e9c81471cf70f45591846363b5c6 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Thu, 3 Apr 2025 14:34:22 +0300 Subject: [PATCH 185/765] bitbucket/bump-versions-upm-and-no-popups --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 36 +++++++++++++++---------------- app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 384a2c99b..5896314df 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.18` and `9.2.2` * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.14` and `9.4.1` + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.16` and `9.4.4` * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.0.0` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 85b32f47e..a68c14881 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -238,7 +238,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "9.4.1" +bitbucket_version_tag = "9.4.4" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 52f79d1c1..42f82b660 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -346,15 +346,15 @@ "bitbucket": { "versions": [ { - "version": "8.19.14", + "version": "8.19.16", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-0798bf7120fded49c", - "us-east-1": "snap-0f5201b2552f9d977" + "us-east-2": "snap-0c998f2ea96338661", + "us-east-1": "snap-047820fee3a1294ff" } ] }, @@ -363,8 +363,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-19-14", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-19-14" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-19-16", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-19-16" } ] }, @@ -373,8 +373,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-07833b387b8dd6736", - "us-east-1": "snap-0682852926407d536" + "us-east-2": "snap-0cc8510ddf52843bc", + "us-east-1": "snap-005a89805387fa383" } ] }, @@ -383,23 +383,23 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-14", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-14" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-16", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-16" } ] } ] }, { - "version": "9.4.1", + "version": "9.4.4", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-0119ddc3496991c22", - "us-east-1": "snap-091b87a31f67baa03" + "us-east-2": "snap-0112fed8bf6866bc0", + "us-east-1": "snap-0344ae06684ba0b37" } ] }, @@ -408,8 +408,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-4-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-4-1" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-4-4", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-4-4" } ] }, @@ -418,8 +418,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-08f182f7d6b2f506b", - "us-east-1": "snap-0c55d1e12cca090a1" + "us-east-2": "snap-0530f70c6916d8329", + "us-east-1": "snap-0c4e784a1acf30043" } ] }, @@ -428,8 +428,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-9-4-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-4-1" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-9-4-4", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-4-4" } ] } diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 5bd2a7995..4e7715020 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -247,7 +247,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "9.4.1" +bitbucket_version_tag = "9.4.4" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "large" From 5a92ecc7300afd3464d49b1f3549f44525075887 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Thu, 3 Apr 2025 16:00:53 +0300 Subject: [PATCH 186/765] confluence/bump-8-5-20 --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 5896314df..63ca80f94 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): `5.12.19` and `10.3.4` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.18` and `9.2.2` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.20` and `9.2.2` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.16` and `9.4.4` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 42f82b660..caece3293 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -230,15 +230,15 @@ "confluence": { "versions": [ { - "version": "8.5.18", + "version": "8.5.20", "data": [ { "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "snap-0109f4729e0ae632a", - "us-east-1": "snap-0c4ea051fbe1d7855" + "us-east-2": "snap-025ed06e325f3e993", + "us-east-1": "snap-0dc4fe5e05d41b342" } ] }, @@ -247,8 +247,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-18", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-18" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-20", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-20" } ] }, @@ -257,8 +257,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0f4fb2beb7ad38c9b", - "us-east-1": "snap-058e65850ec984202" + "us-east-2": "snap-0267a462e98ffdaec", + "us-east-1": "snap-0c7c80285157c1fe1" } ] }, @@ -267,8 +267,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-18", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-18" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-20", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-20" } ] }, @@ -277,8 +277,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-04bccf3e19b8c2a77", - "us-east-1": "snap-06b41ef7cd1a1b01e" + "us-east-2": "snap-0fc33474a6932eef4", + "us-east-1": "snap-088774c9ef2b58e6a" } ] } From a5b54c600cc8032e34c127b3605877b88c88c132 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Fri, 4 Apr 2025 16:05:35 +0300 Subject: [PATCH 187/765] crowd/add-upm-configuration --- app/util/k8s/dcapt-snapshots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index caece3293..94095e83e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -447,8 +447,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0447ca5809d646efe", - "us-east-1": "snap-0877485f60faa521c" + "us-east-2": "snap-0c2b0a5babef9c61a", + "us-east-1": "snap-090290090a3ef2185" } ] }, From 46263212ae99d48cb2ef3c0b02e79dfc20f21253 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Fri, 4 Apr 2025 16:09:01 +0300 Subject: [PATCH 188/765] bamboo/bump-10-2-3 --- README.md | 2 +- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 63ca80f94..3bdc78deb 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.0.0` * Supported Bamboo versions: - * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.0` + * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.3` ## Support In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 380d6b29a..4f346c2ea 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 10.2.0 + 10.2.3 diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 4e7715020..3f9ec9640 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -399,8 +399,8 @@ crowd_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] # By default, latest supported by DCAPT version is set. # https://hub.docker.com/r/atlassian/bamboo/tags # https://hub.docker.com/r/atlassian/bamboo-agent-base/tags -bamboo_version_tag = "10.2.0" -bamboo_agent_version_tag = "10.2.0" +bamboo_version_tag = "10.2.3" +bamboo_agent_version_tag = "10.2.3" # Helm chart version of Bamboo and Bamboo agent instances # bamboo_helm_chart_version = "" From c0d20b0321ed5c448f9728688c270eb444afb1aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Apr 2025 13:16:59 +0000 Subject: [PATCH 189/765] Update dependency com.google.guava:guava to v33.4.6-jre --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 4f346c2ea..288687134 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -62,7 +62,7 @@ com.google.guava guava - 33.4.0-jre + 33.4.6-jre com.fasterxml.jackson.core From 2c35d6c00365593536fd3c52bb8527f1900fadf6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Apr 2025 13:17:04 +0000 Subject: [PATCH 190/765] Update jackson monorepo to v2.18.3 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 4f346c2ea..3eedf326f 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -67,12 +67,12 @@ com.fasterxml.jackson.core jackson-core - 2.18.2 + 2.18.3 com.fasterxml.jackson.core jackson-databind - 2.18.2 + 2.18.3 com.jayway.jsonpath From 0e2507b77bb36f10edbaf47d05f2c64e0bcc5d5a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 12:05:00 +0000 Subject: [PATCH 191/765] Update dependency net.minidev:json-smart to v2.5.2 [SECURITY] --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 288687134..d359db626 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -82,7 +82,7 @@ net.minidev json-smart - 2.5.1 + 2.5.2 org.slf4j From 290e987a785ca88ce8fac6088cc2fe157f063c92 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 12:05:06 +0000 Subject: [PATCH 192/765] Update dependency matplotlib to v3.10.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 47d24201b..b5fc4f33b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -matplotlib==3.10.0 +matplotlib==3.10.1 pandas==2.2.3 pytest==8.3.4 locust==2.32.6 From 2bf653a38635b63c4956b040ae645608e1112e59 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 12:05:55 +0000 Subject: [PATCH 193/765] Update dependency pytest to v8.3.5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b5fc4f33b..f41967ad5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ matplotlib==3.10.1 pandas==2.2.3 -pytest==8.3.4 +pytest==8.3.5 locust==2.32.6 selenium==4.27.1 filelock==3.17.0 From 2641faad0e4486de4f15c59eac56e591f2819f8f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 12:06:03 +0000 Subject: [PATCH 194/765] Update dependency filelock to v3.18.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b5fc4f33b..fe11a13fd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pandas==2.2.3 pytest==8.3.4 locust==2.32.6 selenium==4.27.1 -filelock==3.17.0 +filelock==3.18.0 packaging==24.2 prettytable==3.12.0 bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils From 93463e6b410a6756c181cb8fd131188b6b0f098a Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 8 Apr 2025 15:10:35 +0300 Subject: [PATCH 195/765] upgrade requirements.txt --- requirements.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 47d24201b..e38565c5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -matplotlib==3.10.0 +matplotlib==3.10.1 pandas==2.2.3 -pytest==8.3.4 -locust==2.32.6 -selenium==4.27.1 -filelock==3.17.0 +pytest==8.3.5 +locust==2.34.0 +selenium==4.31.0 +filelock==3.18.0 packaging==24.2 -prettytable==3.12.0 -bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils -boto3==1.36.0 +prettytable==3.16.0 +bzt==1.16.39 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils +boto3==1.37.29 retry==0.9.2 From e7fab84d8b88090b9ec06366cd282a712ae14b4d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Apr 2025 07:00:49 +0200 Subject: [PATCH 196/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index c4879285b..a1af76ddc 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From d35ce5eaf553a5f4a63b224c35e34e50a1839deb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Apr 2025 07:00:49 +0200 Subject: [PATCH 197/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index b05227ad4..d32c5e0d4 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b9df1472e790989eca40861453407cebea56c336 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Apr 2025 07:00:50 +0200 Subject: [PATCH 198/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 96b2d2839..2789c2c09 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a2ceb6d0e2e67e5055952a083c86463837c0645e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Apr 2025 07:00:50 +0200 Subject: [PATCH 199/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 272facc02..ce32d4293 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fa80fd204ff2da7b6beec1f0613760b00b829c8c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Apr 2025 07:00:51 +0200 Subject: [PATCH 200/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index be3f47d3f..51390193a 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.42" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e6ed6b59305ce7720acd127dcfa6b0e091598da3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 08:12:11 +0000 Subject: [PATCH 201/765] Update dependency com.google.guava:guava to v33.4.7-android --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 14e261dd7..00cdf4efb 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -62,7 +62,7 @@ com.google.guava guava - 33.4.6-jre + 33.4.7-android com.fasterxml.jackson.core From 0994c7e288cab70f525c635814be2810eb122ba8 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 9 Apr 2025 11:51:02 +0300 Subject: [PATCH 202/765] revert bzt version --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- requirements.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index c4879285b..0c6681685 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -51,7 +51,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.27.1 + - selenium==4.31.0 execution: - scenario: jmeter executor: jmeter diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 96b2d2839..04b8d04a1 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -37,7 +37,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.27.1 + - selenium==4.31.0 execution: - scenario: ${load_executor} concurrency: ${concurrency} diff --git a/app/confluence.yml b/app/confluence.yml index b05227ad4..ccdd1781f 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -52,7 +52,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.27.1 + - selenium==4.31.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jira.yml b/app/jira.yml index 272facc02..b0e33718e 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -52,7 +52,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.27.1 + - selenium==4.31.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jsm.yml b/app/jsm.yml index be3f47d3f..15a6dbea7 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -68,7 +68,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.27.1 + - selenium==4.31.0 execution: - scenario: ${load_executor}_agents executor: ${load_executor} diff --git a/requirements.txt b/requirements.txt index e38565c5e..3fe663288 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ filelock==3.18.0 packaging==24.2 prettytable==3.16.0 bzt==1.16.39 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils -boto3==1.37.29 +boto3==1.16.32 retry==0.9.2 From da20b52e99ade4e673a3656202821bf1a85214bc Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 9 Apr 2025 11:59:42 +0300 Subject: [PATCH 203/765] fix boto3 --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3fe663288..d97459264 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ selenium==4.31.0 filelock==3.18.0 packaging==24.2 prettytable==3.16.0 -bzt==1.16.39 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils -boto3==1.16.32 +bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils +boto3==1.37.30 retry==0.9.2 From 24738aa4baeef065a7f1341ffd555d6b6cd47249 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:11:11 +0000 Subject: [PATCH 204/765] Update dependency commons-codec:commons-codec to v1.18.0 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 00cdf4efb..f16b29e35 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -92,7 +92,7 @@ commons-codec commons-codec - 1.17.2 + 1.18.0 org.apache.logging.log4j From f601cfa67db90133cd828288143e60992256a635 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 10 Apr 2025 13:01:53 +0300 Subject: [PATCH 205/765] bump atlassianlabs/terraform to 2.9.8 --- app/util/k8s/README.MD | 24 +++++++++---------- ...s-performance-toolkit-user-guide-bamboo.md | 8 +++---- ...erformance-toolkit-user-guide-bitbucket.md | 16 ++++++------- ...rformance-toolkit-user-guide-confluence.md | 16 ++++++------- ...ps-performance-toolkit-user-guide-crowd.md | 14 +++++------ ...pps-performance-toolkit-user-guide-jira.md | 16 ++++++------- ...apps-performance-toolkit-user-guide-jsm.md | 16 ++++++------- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/app/util/k8s/README.MD b/app/util/k8s/README.MD index da154b331..77851ef5a 100644 --- a/app/util/k8s/README.MD +++ b/app/util/k8s/README.MD @@ -32,7 +32,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` ### Terminate development environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -44,7 +44,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.7 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.8 ./uninstall.sh -c conf.tfvars ``` # Enterprise-scale environment @@ -61,7 +61,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` ### Terminate enterprise-scale environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -73,7 +73,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.7 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.8 ./uninstall.sh -c conf.tfvars ``` # Collect detailed k8s logs @@ -93,7 +93,7 @@ export REGION=us-east-2 docker run --pull=always --env-file aws_envs \ -v "/$PWD/k8s_logs:/data-center-terraform/k8s_logs" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.7 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs +-it atlassianlabs/terraform:2.9.8 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs ``` # Force terminate cluster @@ -126,7 +126,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.7 bash + -it atlassianlabs/terraform:2.9.8 bash ``` 5. Connect to the product pod. Example below for jira pod with number 0. For other product or pod number change `PRODUCT_POD` accordingly. @@ -150,7 +150,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ - -it atlassianlabs/terraform:2.9.7 bash + -it atlassianlabs/terraform:2.9.8 bash ``` 5. Copy code base and connect to the execution environment pod: ``` bash @@ -178,7 +178,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e REGION=$REGION \ -e PRODUCT=$PRODUCT \ -v "/$PWD/script-runner.yml:/data-center-terraform/script-runner.yml" \ - -it atlassianlabs/terraform:2.9.7 bash + -it atlassianlabs/terraform:2.9.8 bash ``` 5. Run following commands one by one inside docker container: ``` bash @@ -206,7 +206,7 @@ To enable detailed CPU/Memory monitoring and Grafana dashboards for visualisatio docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.7 bash + -it atlassianlabs/terraform:2.9.8 bash ``` ``` bash aws eks update-kubeconfig --name atlas-$ENVIRONMENT_NAME-cluster --region $REGION @@ -242,7 +242,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml ``` # Retry to copy run results from the execution environment pod to local @@ -259,7 +259,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/copy_run_results.sh:/data-center-terraform/copy_run_results.sh" \ - -it atlassianlabs/terraform:2.9.7 bash copy_run_results.sh + -it atlassianlabs/terraform:2.9.8 bash copy_run_results.sh ``` # Debug AWS required policies @@ -268,7 +268,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n 3. Start and ssh to `atlassianlabs/terraform` docker container: ``` bash docker run --pull=always --env-file aws_envs \ - -it atlassianlabs/terraform:2.9.7 bash + -it atlassianlabs/terraform:2.9.8 bash ``` 4. Make sure you have IAM policies with names `policy1`, `policy2`, created from [policy1.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy1.json) and [policy2.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy2.json). 5. Run following commands one by one inside docker container to get effective policies permissions: diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 0a7e1f8bf..00dfc9db1 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -102,7 +102,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. @@ -303,7 +303,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -334,7 +334,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -368,7 +368,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index d3e270805..c6b3b60ac 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -115,7 +115,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -319,7 +319,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -394,7 +394,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -425,7 +425,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -475,7 +475,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -500,7 +500,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -513,7 +513,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -542,7 +542,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index cb5b07407..d1eb2e461 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -474,7 +474,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -504,7 +504,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 8e176677e..7dc88fd8e 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -97,7 +97,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -208,7 +208,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -237,7 +237,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -296,7 +296,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -320,7 +320,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -347,7 +347,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -390,7 +390,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 9d3d567a5..9e0dc7c06 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -122,7 +122,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -423,7 +423,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -498,7 +498,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -550,7 +550,7 @@ The re-index time for Jira is about ~50-70 minutes. -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -636,7 +636,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -649,7 +649,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -678,7 +678,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index bdc07084a..1560820fc 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -124,7 +124,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -459,7 +459,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -539,7 +539,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -594,7 +594,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -679,7 +679,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.7 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -692,7 +692,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -721,7 +721,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.7 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From 4f5f41e880569f01e49be44445bdbc13d01213c8 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 11 Apr 2025 12:10:59 +0300 Subject: [PATCH 206/765] fix error in locustfile --- app/locustio/confluence/locustfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/locustio/confluence/locustfile.py b/app/locustio/confluence/locustfile.py index 88a4a7cf5..b60552ef4 100644 --- a/app/locustio/confluence/locustfile.py +++ b/app/locustio/confluence/locustfile.py @@ -2,9 +2,9 @@ from extension.confluence.extension_locust import app_specific_action from locustio.common_utils import LocustConfig, MyBaseTaskSet -from locustio.confluence.http_actions import login_and_view_dashboard, view_dashboard, view_blog, \ - search_cql_and_view_results, open_editor_and_create_blog, create_and_edit_page, comment_page, view_attachments, \ - upload_attachments, like_page, view_page +from locustio.confluence.http_actions import login_and_view_dashboard, view_dashboard, view_blog,\ + open_editor_and_create_blog, create_and_edit_page, comment_page, view_attachments, \ + upload_attachments, like_page, view_page, search_cql_two_words_and_view_results, search_cql_three_words from util.conf import CONFLUENCE_SETTINGS config = LocustConfig(config_yml=CONFLUENCE_SETTINGS) From 989ce32242e2842c1bd6226a13d92530d57d3eaa Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 15 Apr 2025 14:31:03 +0300 Subject: [PATCH 207/765] remove empty line --- app/util/k8s/copy_run_results.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/app/util/k8s/copy_run_results.sh b/app/util/k8s/copy_run_results.sh index 280b74794..45f708017 100755 --- a/app/util/k8s/copy_run_results.sh +++ b/app/util/k8s/copy_run_results.sh @@ -30,7 +30,6 @@ fi echo "INFO: Execution environment pod name: $exec_pod_name" echo "INFO: Copy results folder from the exec env pod to local" - for _ in {1..3}; do if kubectl exec -n atlassian "$exec_pod_name" --request-timeout=60s -- tar czf - -C /dc-app-performance-toolkit/app results | tar xzf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1; then break From 22bcb5a9956da3920cb5f5bf153e4c3001b73dd5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Apr 2025 07:01:11 +0200 Subject: [PATCH 208/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index c37f34651..f8e384049 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fefd3f3fae378a0bfab57474b61a319a454443fe Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Apr 2025 07:01:11 +0200 Subject: [PATCH 209/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 4ea44d127..e13b415fd 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 34c305e0159937b04f52dadecb4419bd6341fac1 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Apr 2025 07:01:12 +0200 Subject: [PATCH 210/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 6082a4e60..3c6d689c8 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fa88171731c3be6fc3808220de7c8f3a867ca238 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Apr 2025 07:01:13 +0200 Subject: [PATCH 211/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 59124cabd..389a4f9d3 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 3e3760594ef22d1f58c52d38f748c6495943422d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Apr 2025 07:01:13 +0200 Subject: [PATCH 212/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 5db7da648..72a3b2b02 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.84" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 988a863ad4b88721b3a8d967967a173947bd6cc9 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Wed, 16 Apr 2025 14:14:48 +0300 Subject: [PATCH 213/765] crowd/bump-6-3-0-and-upd-resources --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 12 ++++++------ app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3bdc78deb..80865819a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.16` and `9.4.4` * Supported Crowd versions: - * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.0.0` + * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.3.0` * Supported Bamboo versions: * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.3` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 94095e83e..6b2040fb7 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -440,15 +440,15 @@ "crowd": { "versions": [ { - "version": "6.0.0", + "version": "6.3.0", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-0c2b0a5babef9c61a", - "us-east-1": "snap-090290090a3ef2185" + "us-east-2": "snap-0938248bec3bb51bb", + "us-east-1": "snap-057e8e2c67fc25793" } ] }, @@ -457,13 +457,13 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-6-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-6-0-0" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-6-3-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-6-3-0" } ] } ], - "build_number": "2091" + "build_number": "2301" } ] } diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 3f9ec9640..60c02dfca 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -335,7 +335,7 @@ bitbucket_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -crowd_version_tag = "6.0.0" +crowd_version_tag = "6.3.0" # Helm chart version of Crowd and Crowd agent instances. By default the latest version is installed. # crowd_helm_chart_version = "" @@ -346,7 +346,7 @@ crowd_version_tag = "6.0.0" crowd_installation_timeout = 20 # Crowd instance resource configuration -crowd_cpu = "2" +crowd_cpu = "4" crowd_mem = "8Gi" crowd_min_heap = "2048m" crowd_max_heap = "2048m" From fa82c6a793ba65232c7456a900173e44ff485fcd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Apr 2025 15:28:39 +0000 Subject: [PATCH 214/765] Update dependency locust to v2.35.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d97459264..499433d30 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ matplotlib==3.10.1 pandas==2.2.3 pytest==8.3.5 -locust==2.34.0 +locust==2.35.0 selenium==4.31.0 filelock==3.18.0 packaging==24.2 From e8fba02072246f6b8c08ad476ef7e1373150f4dc Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 17 Apr 2025 14:02:43 +0200 Subject: [PATCH 215/765] Docs update 870 --- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-bitbucket.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 2 +- 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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 00dfc9db1..3b95de52c 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: "2024-11-22" +date: "2025-04-22" --- # 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 c6b3b60ac..277cd2afa 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: "2024-11-22" +date: "2025-04-22" --- # 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 d1eb2e461..b0e5ee3be 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: "2024-11-22" +date: "2025-04-22" --- # Data Center App Performance Toolkit User Guide For Confluence diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 7dc88fd8e..ed82f9dd1 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: "2024-11-22" +date: "2025-04-22" --- # 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 9e0dc7c06..be7db2c10 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: "2024-11-22" +date: "2025-04-22" --- # 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 1560820fc..f933041f8 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: "2024-11-22" +date: "2025-04-22" --- # Data Center App Performance Toolkit User Guide For Jira Service Management From 4e26a27cf94ad521b9e7b069e4813d393f69e00e Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Thu, 17 Apr 2025 16:23:37 +0300 Subject: [PATCH 216/765] copy-results/add-results-dir-creation --- app/util/k8s/bzt_on_pod.sh | 6 +++++- app/util/k8s/copy_run_results.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index 0f7475f63..ef43234e0 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -67,8 +67,12 @@ kubectl exec -it "$exec_pod_name" -n atlassian -- docker run --shm-size=4g -v "/ sleep 10 echo "INFO: Copy results folder from the exec env pod to local" +# Ensure the local results directory exists +local_results_dir="/data-center-terraform/dc-app-performance-toolkit/app/results" +mkdir -p "$local_results_dir" + for _ in {1..3}; do - if kubectl exec -n atlassian "$exec_pod_name" --request-timeout=60s -- tar czf - -C /dc-app-performance-toolkit/app results | tar xzf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1; then + if kubectl exec -n atlassian "$exec_pod_name" --request-timeout=60s -- tar czf - -C /dc-app-performance-toolkit/app results | tar xzf - -C "$local_results_dir" --strip-components=1; then break else echo "Copying failed, retrying..." diff --git a/app/util/k8s/copy_run_results.sh b/app/util/k8s/copy_run_results.sh index 45f708017..ea19b6b36 100755 --- a/app/util/k8s/copy_run_results.sh +++ b/app/util/k8s/copy_run_results.sh @@ -30,8 +30,12 @@ fi echo "INFO: Execution environment pod name: $exec_pod_name" echo "INFO: Copy results folder from the exec env pod to local" +# Ensure the local results directory exists +local_results_dir="/data-center-terraform/dc-app-performance-toolkit/app/results" +mkdir -p "$local_results_dir" + for _ in {1..3}; do - if kubectl exec -n atlassian "$exec_pod_name" --request-timeout=60s -- tar czf - -C /dc-app-performance-toolkit/app results | tar xzf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1; then + if kubectl exec -n atlassian "$exec_pod_name" --request-timeout=60s -- tar czf - -C /dc-app-performance-toolkit/app results | tar xzf - -C "$local_results_dir" --strip-components=1; then break else echo "Copying failed, retrying..." From 215f748832a25d1932cca369b0cdda0dcc287573 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 18 Apr 2025 11:55:28 +0300 Subject: [PATCH 217/765] fix confluence default test actions names --- app/selenium_ui/confluence/modules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index 8acc0c6d1..d19524df5 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -303,11 +303,11 @@ def sub_measure(): measure() def cql_search_three_words(webdriver): - return cql_search(webdriver, cql_string=THREE_WORDS_CQL, print_timing_suffix='3_words') + return cql_search(webdriver, cql_string=THREE_WORDS_CQL, print_timing_suffix='three_words') def cql_search_two_words(webdriver): - return cql_search(webdriver, cql_string=TWO_WORDS_CQL, print_timing_suffix='2_words') + return cql_search(webdriver, cql_string=TWO_WORDS_CQL, print_timing_suffix='two_words') def cql_search(webdriver, cql_string, print_timing_suffix): From 69682d4b2fe92827597eb433124766aaeea0ad75 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 18 Apr 2025 19:07:12 +0300 Subject: [PATCH 218/765] fix sytax jmeter cql confluence --- app/jmeter/confluence.jmx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jmeter/confluence.jmx b/app/jmeter/confluence.jmx index 97b604f2c..ac801d4e4 100644 --- a/app/jmeter/confluence.jmx +++ b/app/jmeter/confluence.jmx @@ -1545,7 +1545,7 @@ if ( sleep_time > 0 ) { - + true false From 1fcd0dcb2845bbeeefe6f84f6789bbb7f9d99d88 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 22 Apr 2025 13:43:59 +0300 Subject: [PATCH 219/765] bamboo/support-version-10-2-2 --- README.md | 2 +- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 80865819a..b37549fb2 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.3.0` * Supported Bamboo versions: - * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.3` + * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.2` ## Support In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index f16b29e35..441b05c5e 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 10.2.3 + 10.2.2 diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 60c02dfca..e0f679dce 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -399,8 +399,8 @@ crowd_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] # By default, latest supported by DCAPT version is set. # https://hub.docker.com/r/atlassian/bamboo/tags # https://hub.docker.com/r/atlassian/bamboo-agent-base/tags -bamboo_version_tag = "10.2.3" -bamboo_agent_version_tag = "10.2.3" +bamboo_version_tag = "10.2.2" +bamboo_agent_version_tag = "10.2.2" # Helm chart version of Bamboo and Bamboo agent instances # bamboo_helm_chart_version = "" From ef8fc6a05eba4d2c87e30428747f27a54858d484 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Apr 2025 07:01:09 +0200 Subject: [PATCH 220/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f8e384049..fcfaa62bf 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1273afb691a626eb2766b751edc09e6741a43ab2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Apr 2025 07:01:09 +0200 Subject: [PATCH 221/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index e13b415fd..bec2ca263 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b881376a779811694bef5b5c22008b5589bd23f9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Apr 2025 07:01:10 +0200 Subject: [PATCH 222/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 3c6d689c8..4110f7714 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From be858b34c518dc2d695c73298379d96489011342 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Apr 2025 07:01:11 +0200 Subject: [PATCH 223/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 389a4f9d3..b7299a2fb 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2d54bfeb63981af9ad1538667431ae78b7aadb76 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Apr 2025 07:01:11 +0200 Subject: [PATCH 224/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 72a3b2b02..8d2233f31 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.95" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0cc051e6f7876c9ac8bd3791326ade5e56273591 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 23 Apr 2025 16:29:45 +0300 Subject: [PATCH 225/765] fix upm snapshots --- app/util/k8s/dcapt-snapshots.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 6b2040fb7..e7a85e77d 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -9,8 +9,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-027e50d4e441175e7", - "us-east-1": "snap-05e66c50b0b9abaaa" + "us-east-2": "snap-0dd3fc64b0ebf359d", + "us-east-1": "snap-0a8316674a2dfbd86" } ] }, @@ -29,7 +29,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-05ea132f3bd8851c0", + "us-east-2": "snap-03cbfbb2b9bf21148", "us-east-1": "snap-06905c0e2956c8cf1" } ] From f2a93489b54c10728e2d3c952e324aa9cfbe15b5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 24 Apr 2025 07:00:50 +0200 Subject: [PATCH 226/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index fcfaa62bf..f8da07e25 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b8cb1e6d1f653a4d41aee5c1f2b5c81c3ab9e93f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 24 Apr 2025 07:00:51 +0200 Subject: [PATCH 227/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index bec2ca263..fc31eb500 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2cb11af38b093f3a1e7fb70677d653a427224758 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 24 Apr 2025 07:00:51 +0200 Subject: [PATCH 228/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 4110f7714..40d1ce174 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 3feb8eaae47b21ff4ff7d257fb77708bf1d5f5bd Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 24 Apr 2025 07:00:52 +0200 Subject: [PATCH 229/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index b7299a2fb..e2639915a 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5d0f5d64a107ec6a417884c186f7fed1226dcbf0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 24 Apr 2025 07:00:53 +0200 Subject: [PATCH 230/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 8d2233f31..e4641fdd2 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.97" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a153a3d679bd4ccb21b287a2542aeea4847dc970 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 25 Apr 2025 12:15:27 +0300 Subject: [PATCH 231/765] fix upm for jira snapshots --- app/util/k8s/dcapt-snapshots.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index e7a85e77d..d4a238d63 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -9,8 +9,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0dd3fc64b0ebf359d", - "us-east-1": "snap-0a8316674a2dfbd86" + "us-east-2": "snap-084486021b02f0ef8", + "us-east-1": "snap-067a84324533ad5a2" } ] }, @@ -29,8 +29,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-03cbfbb2b9bf21148", - "us-east-1": "snap-06905c0e2956c8cf1" + "us-east-2": "snap-09d056fb9ec6fb35b", + "us-east-1": "snap-0039fe4e0fa3461f9" } ] }, From 1b5d683e0242b1935485b04a9ba62cbbcdc654b0 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Mon, 28 Apr 2025 13:02:19 +0200 Subject: [PATCH 232/765] Release 8.7.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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f8da07e25..211f8abe2 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for JMeter load executor view_all_builds: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 40d1ce174..169e95e03 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/confluence.yml b/app/confluence.yml index fc31eb500..d90c667ec 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. extended_metrics: False # Action percentage for JMeter and Locust load executors diff --git a/app/crowd.yml b/app/crowd.yml index 8d90b55ff..ebb999f12 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index e2639915a..72abca9e8 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors create_issue: 4 diff --git a/app/jsm.yml b/app/jsm.yml index e4641fdd2..1c20ad257 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 From 33da9a78a113593591e6af8423486f2f3fca676b Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Mon, 28 Apr 2025 13:06:25 +0200 Subject: [PATCH 233/765] Bump toolkit version 8.8.0 --- app/util/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/conf.py b/app/util/conf.py index 0611752ab..9aee3369b 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -2,8 +2,8 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML -TOOLKIT_VERSION = '8.7.0' -UNSUPPORTED_VERSION = '8.3.1' +TOOLKIT_VERSION = '8.8.0' +UNSUPPORTED_VERSION = '8.4.0' def read_yml_file(file): From d633516bbc803c5e37408cdc44e14d2f1b87ad63 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 30 Apr 2025 07:01:03 +0200 Subject: [PATCH 234/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f8da07e25..e472a1581 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 52f9ba27cb303d4cd78582d31ce5982321be2b55 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 30 Apr 2025 07:01:03 +0200 Subject: [PATCH 235/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index fc31eb500..1cfd18488 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 3598e9aaa03c3b5117442f06e708f9799ac374a3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 30 Apr 2025 07:01:04 +0200 Subject: [PATCH 236/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 40d1ce174..fdce40ec9 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 655ab2451f7671e1a26fc8f3f3d116eb5882db62 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 30 Apr 2025 07:01:05 +0200 Subject: [PATCH 237/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index e2639915a..4c38579a1 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e4f5ebc0fc1ec9933d76b44b422fc55c451f0602 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 30 Apr 2025 07:01:05 +0200 Subject: [PATCH 238/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index e4641fdd2..9e1f1137b 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "135.0.7049.114" # Supports Chrome version 135. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b30364a7f0c5412b81986805ce298d045bacfbb8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 May 2025 07:01:05 +0200 Subject: [PATCH 239/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index e472a1581..89c1d0734 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9b639b2ec5b9f2daa3e84162a7358e3ec89e6bc2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 May 2025 07:01:05 +0200 Subject: [PATCH 240/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 1cfd18488..d4972d080 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c7223e87c4058553cf34486787edc3b0526bac3e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 May 2025 07:01:06 +0200 Subject: [PATCH 241/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index fdce40ec9..da9d36c6a 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 510e212d1a9cc1d1ed995ba6d935546d435fcbe8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 May 2025 07:01:07 +0200 Subject: [PATCH 242/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 4c38579a1..1e6a7098a 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 42d78fa4b066d1e7c1852adb3597b59f7e727672 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 May 2025 07:01:07 +0200 Subject: [PATCH 243/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 9e1f1137b..daaf9a1c7 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.49" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b4c4ab04813630388f2e74af93d0bd610f0691b5 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 8 May 2025 14:23:02 +0200 Subject: [PATCH 244/765] Improve edit_issue_submit for Jira --- app/selenium_ui/jira/pages/pages.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/selenium_ui/jira/pages/pages.py b/app/selenium_ui/jira/pages/pages.py index 8121965a7..39f36f4db 100644 --- a/app/selenium_ui/jira/pages/pages.py +++ b/app/selenium_ui/jira/pages/pages.py @@ -1,4 +1,5 @@ from selenium.webdriver.common.keys import Keys +from selenium.common.exceptions import ElementClickInterceptedException from selenium_ui.conftest import retry import time import random @@ -139,7 +140,13 @@ def __fill_textfield(self, text, selector): self.get_element(selector).send_keys(text) def edit_issue_submit(self): - self.get_element(IssueLocators.edit_issue_submit).click() + element = self.get_element(IssueLocators.edit_issue_submit) + try: + element.click() + except ElementClickInterceptedException: + print('INFO: Trying JS click for edit_issue_submit button...') + self.driver.execute_script("arguments[0].click();", element) + def fill_description_edit(self, rte): text_description = f"Edit description form selenium - {self.generate_random_string(30)}" From 1716947e7e74c4894d75dbf9c08870ccc6c5b0b0 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 12:48:49 +0300 Subject: [PATCH 245/765] fix jira websude for tsv --- app/util/api/jira_clients.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/app/util/api/jira_clients.py b/app/util/api/jira_clients.py index 81d16da73..874362c8d 100644 --- a/app/util/api/jira_clients.py +++ b/app/util/api/jira_clients.py @@ -2,7 +2,8 @@ import string from selenium.common.exceptions import WebDriverException -from util.api.abstract_clients import RestClient, JSM_EXPERIMENTAL_HEADERS +from util.api.abstract_clients import RestClient + from selenium_ui.conftest import retry BATCH_SIZE_BOARDS = 1000 @@ -201,14 +202,29 @@ def get_nodes(self): def get_system_info_page(self): login_url = f'{self.host}/login.jsp' auth_url = f'{self.host}/secure/admin/WebSudoAuthenticate.jspa' + tsv_login_url = f'{self.host}/rest/tsv/1.0/authenticate' auth_body = { 'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa', 'webSudoIsPost': False, 'webSudoPassword': self.password } - self.post(login_url, error_msg='Could not login in') + tsv_login_body = {"username": self.user, + "password": self.password, + "rememberMe": "True", + "targetUrl": "" + } + + r = self.session.get(login_url) + if not r.status_code == 200: + raise Exception(f'ERROR: Could not login to Jira with url {login_url}, status code: {r.status_code}') + legacy_login = 'login-form-remember-me' in r.text + if not legacy_login: + print(f'INFO: 2sv login on Jira detected') + self.session.post(url=tsv_login_url, json=tsv_login_body) + else: + self.post(login_url, error_msg='Could not login in') auth_body['atl_token'] = self.session.cookies.get_dict()['atlassian.xsrf.token'] - system_info_html = self._session.post(auth_url, data=auth_body, verify=self.verify) + system_info_html = self.session.post(auth_url, data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, verify=self.verify) return system_info_html.content.decode("utf-8") def get_available_processors(self): From aee88ffa7087aa15262403d851e10a08cf3e718a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 15 May 2025 07:00:55 +0200 Subject: [PATCH 246/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 89c1d0734..f62375b4b 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c7880d9c2604da47a355c68081991718933dc8a3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 15 May 2025 07:00:56 +0200 Subject: [PATCH 247/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index d4972d080..51981dcb1 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From d4642f0889ac23991ecbe00dedf3020b5c99e648 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 15 May 2025 07:00:56 +0200 Subject: [PATCH 248/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index da9d36c6a..3be742b1f 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From af3e3e45865029d4ccbcbcb52d291243c87bbf69 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 15 May 2025 07:00:57 +0200 Subject: [PATCH 249/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 1e6a7098a..f327bb9a0 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e8041bb8ccd594fec8e20576cbdf5b6f83235e75 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 15 May 2025 07:00:58 +0200 Subject: [PATCH 250/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index daaf9a1c7..b56ca108b 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.92" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bab37a4af367c6b583c27adf1e716b3f1a612b19 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 15 May 2025 11:51:22 +0300 Subject: [PATCH 251/765] fix for app specific --- app/locustio/common_utils.py | 154 ++++++++++++++++++++++------------- 1 file changed, 99 insertions(+), 55 deletions(-) diff --git a/app/locustio/common_utils.py b/app/locustio/common_utils.py index b31ee8816..57bed7f6e 100644 --- a/app/locustio/common_utils.py +++ b/app/locustio/common_utils.py @@ -73,6 +73,13 @@ 'atl_token': '', 'login': 'Log in' } +LOGIN_BODY_CONFLUENCE = { + 'os_username': '', + 'os_password': '', + 'os_cookie': True, + 'os_destination': '', + 'login': 'Log in' + } JIRA_TOKEN_PATTERN = r'name="atlassian-token" content="(.+?)">' CONFLUENCE_TOKEN_PATTERN = r'"ajs-atl-token" content="(.+?)"' @@ -241,7 +248,7 @@ def wrapper(*args, **kwargs): if total < confluence_action_time: sleep = (confluence_action_time - total) logger.info(f'action: {interaction}, action_execution_time: {total}, sleep {sleep}') - time.sleep(sleep) + time.sleep(5) return result return wrapper return deco_wrapper @@ -349,6 +356,86 @@ def raise_if_login_failed(locust): raise exception.StopUser('Action login_and_view_dashboard failed') +def do_confluence_login(locust, usr, pwd): + locust.client.cookies.clear() + r = locust.get('/dologin.action', catch_response=True) + content = r.content.decode('utf-8') + is_legacy_login_form = 'loginform' in content + + if is_legacy_login_form: + + login_body = LOGIN_BODY_CONFLUENCE + login_body['os_username'] = usr + login_body['os_password'] = pwd + + locust.post('/dologin.action', + login_body, + TEXT_HEADERS, + catch_response=True) + else: + + login_body = {'username': usr, + 'password': pwd, + 'rememberMe': 'True', + 'targetUrl': '' + } + + headers = { + "Content-Type": "application/json" + } + + # 15 /rest/tsv/1.0/authenticate + locust.post('/rest/tsv/1.0/authenticate', + json=login_body, + headers=headers, + catch_response=True) + + +def do_login_jira(locust, usr, pwd): + locust.client.cookies.clear() + body = LOGIN_BODY + body['os_username'] = usr + body['os_password'] = pwd + + legacy_form = False + + # Check if 2sv login form + r = locust.get('/login.jsp', catch_response=True) + content = r.content.decode('utf-8') + if 'login-form-remember-me' in content: + legacy_form = True + + # 100 /login.jsp + if legacy_form: + locust.post('/login.jsp', body, + TEXT_HEADERS, + catch_response=True) + else: + login_body = {'username': usr, + 'password': pwd, + 'rememberMe': 'True', + 'targetUrl': '' + } + + headers = { + "Content-Type": "application/json" + } + + # 15 /rest/tsv/1.0/authenticate + locust.post('/rest/tsv/1.0/authenticate', + json=login_body, + headers=headers, + catch_response=True) + + r = locust.get('/', catch_response=True) + if not r.content: + raise Exception('Please check server hostname in jira.yml file') + if locust.session_data_storage['token_pattern']: + content = r.content.decode('utf-8') + token = fetch_by_re(locust.session_data_storage['token_pattern'], content) + locust.session_data_storage["token"] = token + + def run_as_specific_user(username=None, password=None): if not (username and password): raise SystemExit(f'The credentials are not valid: {{username: {username}, password: {password}}}.') @@ -367,72 +454,29 @@ def wrapper(*args, **kwargs): session_user_name = locust.session_data_storage["username"] session_user_password = locust.session_data_storage["password"] app = locust.session_data_storage['app'] + locust.session_data_storage['token_pattern'] = None app_type = locust.session_data_storage.get('app_type', None) token_pattern = None # Jira or JSM Agent - redefine token value if app == JIRA or (app == JSM and app_type == TYPE_AGENT): - token_pattern = JIRA_TOKEN_PATTERN + locust.session_data_storage['token_pattern'] = JIRA_TOKEN_PATTERN # Confluence - redefine token value elif app == CONFLUENCE: - token_pattern = CONFLUENCE_TOKEN_PATTERN - - def do_login_jira(usr, pwd): - locust.client.cookies.clear() - body = LOGIN_BODY - body['os_username'] = usr - body['os_password'] = pwd - - legacy_form = False - - # Check if 2sv login form - r = locust.get('/login.jsp', catch_response=True) - content = r.content.decode('utf-8') - if 'login-form-remember-me' in content: - legacy_form = True - - # 100 /login.jsp - if legacy_form: - locust.post('/login.jsp', body, - TEXT_HEADERS, - catch_response=True) - else: - login_body = {'username': usr, - 'password': pwd, - 'rememberMe': 'True', - 'targetUrl': '' - } - - headers = { - "Content-Type": "application/json" - } - - # 15 /rest/tsv/1.0/authenticate - locust.post('/rest/tsv/1.0/authenticate', - json=login_body, - headers=headers, - catch_response=True) - - r = locust.get('/', catch_response=True) - if not r.content: - raise Exception('Please check server hostname in jira.yml file') - if token_pattern: - content = r.content.decode('utf-8') - token = fetch_by_re(token_pattern, content) - locust.session_data_storage["token"] = token + locust.session_data_storage['token_pattern'] = CONFLUENCE_TOKEN_PATTERN # send requests by the specific user if app == JIRA or (app == JSM and app_type == TYPE_AGENT): - do_login_jira(usr=username, pwd=password) - else: - raise SystemExit(f"Unsupported app type: {app}") + do_login_jira(locust, username, password) + func(*args, **kwargs) + do_login_jira(locust, session_user_name, session_user_password) - func(*args, **kwargs) + if app == CONFLUENCE: + do_confluence_login(locust, username, password) + func(*args, **kwargs) + do_confluence_login(locust, session_user_name, session_user_password) - # send requests by the session user - if app == JIRA or (app == JSM and app_type == TYPE_AGENT): - do_login_jira(usr=session_user_name, pwd=session_user_password) - else: + if app not in [CONFLUENCE, JIRA, JSM]: raise SystemExit(f"Unsupported app type: {app}") else: From 0b8a9d6eed042d75a5d34b7941ed9458197b6253 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 15 May 2025 11:52:17 +0300 Subject: [PATCH 252/765] fix for app specific --- app/locustio/common_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/locustio/common_utils.py b/app/locustio/common_utils.py index 57bed7f6e..d2d486ff2 100644 --- a/app/locustio/common_utils.py +++ b/app/locustio/common_utils.py @@ -248,7 +248,7 @@ def wrapper(*args, **kwargs): if total < confluence_action_time: sleep = (confluence_action_time - total) logger.info(f'action: {interaction}, action_execution_time: {total}, sleep {sleep}') - time.sleep(5) + time.sleep(sleep) return result return wrapper return deco_wrapper From 049da0945432f0f514365cd135b8cd36091380db Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 22 May 2025 07:00:59 +0200 Subject: [PATCH 253/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f62375b4b..8a8f303b4 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From cde96640399c7dad4cf9a429fd657bccffed3ccf Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 22 May 2025 07:00:59 +0200 Subject: [PATCH 254/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 51981dcb1..af69d882d 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9660657f8e953537d177ed9a2c2da44c3846a693 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 22 May 2025 07:01:00 +0200 Subject: [PATCH 255/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 3be742b1f..eb6ca9234 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1d5b35f1a595e9b54238be8a3739d8e269a5cc77 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 22 May 2025 07:01:01 +0200 Subject: [PATCH 256/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index f327bb9a0..45f28b7f7 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6d6bbdac88b8b264779e7d25c812e3695fb06375 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 22 May 2025 07:01:01 +0200 Subject: [PATCH 257/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index b56ca108b..cabebd46b 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.94" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b4c650ba13e2f35b043d8eef502c6563ecfef206 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 25 May 2025 23:00:08 +0300 Subject: [PATCH 258/765] fix for common_utils --- app/locustio/common_utils.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/locustio/common_utils.py b/app/locustio/common_utils.py index d2d486ff2..6494b6446 100644 --- a/app/locustio/common_utils.py +++ b/app/locustio/common_utils.py @@ -83,6 +83,8 @@ JIRA_TOKEN_PATTERN = r'name="atlassian-token" content="(.+?)">' CONFLUENCE_TOKEN_PATTERN = r'"ajs-atl-token" content="(.+?)"' +CONFLUENCE_KEYBOARD_HASH_RE = 'name=\"ajs-keyboardshortcut-hash\" content=\"(.*?)\">' +CONFLUENCE_BUILD_NUMBER_RE = 'meta name=\"ajs-build-number\" content=\"(.*?)\"' JIRA = 'jira' JSM = 'jsm' @@ -389,6 +391,25 @@ def do_confluence_login(locust, usr, pwd): json=login_body, headers=headers, catch_response=True) + r = locust.get(url='/', catch_response=True) + content = r.content.decode('utf-8') + + if 'Log Out' not in content: + print(f'Login with {usr}, {pwd} failed: {content}') + assert 'Log Out' in content, 'User authentication failed.' + print(f'User {usr} is successfully logged in back') + keyboard_hash = fetch_by_re(CONFLUENCE_KEYBOARD_HASH_RE, content) + build_number = fetch_by_re(CONFLUENCE_BUILD_NUMBER_RE, content) + token = fetch_by_re(locust.session_data_storage['token_pattern'], content) + + # 20 index.action + locust.get('/index.action', catch_response=True) + + locust.session_data_storage['build_number'] = build_number + locust.session_data_storage['keyboard_hash'] = keyboard_hash + locust.session_data_storage['username'] = usr + locust.session_data_storage['password'] = pwd + locust.session_data_storage['token'] = token def do_login_jira(locust, usr, pwd): From 3794144050660e445864b4ef2ca7631bcd8cc585 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 May 2025 07:01:01 +0200 Subject: [PATCH 259/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 8a8f303b4..f3a88bab5 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ca8ec1c26feac15b56b3eb701e0133bfb3b2e6c8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 May 2025 07:01:02 +0200 Subject: [PATCH 260/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index af69d882d..fe4f61f4d 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bfdd8145ecb310969343983e3389b7685d9b9a90 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 May 2025 07:01:02 +0200 Subject: [PATCH 261/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index eb6ca9234..6162e1bd0 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 39285a14ae4ee7b3b09cafe850c1ac8b94c16a2e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 May 2025 07:01:03 +0200 Subject: [PATCH 262/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 45f28b7f7..dabc5178a 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From beb57688e6981d6aed21453812740272e032df02 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 May 2025 07:01:04 +0200 Subject: [PATCH 263/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index cabebd46b..2e0f124bc 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "136.0.7103.113" # Supports Chrome version 136. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e3e5508a00568b5e701e0a44a4436cd55b5cb4ef Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 28 May 2025 11:30:59 +0300 Subject: [PATCH 264/765] added token update to jmeter app specific action confluence --- app/jmeter/confluence.jmx | 175 +++++++++++++++++++++++++++++++++++++- 1 file changed, 174 insertions(+), 1 deletion(-) diff --git a/app/jmeter/confluence.jmx b/app/jmeter/confluence.jmx index ac801d4e4..71cdb072f 100644 --- a/app/jmeter/confluence.jmx +++ b/app/jmeter/confluence.jmx @@ -5704,13 +5704,99 @@ if (response_data.username != vars.get("app_specific_username")) { + + ${application.postfix}/ + true + GET + true + false + + + + + + + + + Accept-Language + en-US,en;q=0.5 + + + Upgrade-Insecure-Requests + 1 + + + Accept-Encoding + gzip, deflate + + + Accept + text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 + + + + + + false + ajs-build-number + meta name=\"ajs-build-number\" content=\"(.*?)\"> + $1$ + NOT FOUND + 1 + all + + false + + + + false + ajs-remote-user-key + meta name=\"ajs-remote-user-key\" content=\"(.*?)\"> + $1$ + + 1 + all + false + + + + false + atlassian-token + meta name=\"ajs-atl-token\" content=\"(.*?)\"> + $1$ + + 1 + all + true + + + + false + confluence-version + meta name=\"ajs-version-number\" content=\"(.*?)\"> + $1$ + + 1 + all + true + + + + groovy + + + true + prev.setIgnore() + + + true false - + ${application.postfix}/app/get_endpoint true GET @@ -5995,6 +6081,93 @@ if (response_data.username != vars.get("username")) { } else { prev.setIgnore() } + + + + + + ${application.postfix}/ + true + GET + true + false + + + + + + + + + Accept-Language + en-US,en;q=0.5 + + + Upgrade-Insecure-Requests + 1 + + + Accept-Encoding + gzip, deflate + + + Accept + text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 + + + + + + false + ajs-build-number + meta name=\"ajs-build-number\" content=\"(.*?)\"> + $1$ + NOT FOUND + 1 + all + + false + + + + false + ajs-remote-user-key + meta name=\"ajs-remote-user-key\" content=\"(.*?)\"> + $1$ + + 1 + all + false + + + + false + atlassian-token + meta name=\"ajs-atl-token\" content=\"(.*?)\"> + $1$ + + 1 + all + true + + + + false + confluence-version + meta name=\"ajs-version-number\" content=\"(.*?)\"> + $1$ + + 1 + all + true + + + + groovy + + + true + prev.setIgnore() From 1c6858da7b2891d64b67a56d48272f8c50fb3925 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 29 May 2025 13:46:39 +0300 Subject: [PATCH 265/765] added workaround for latest bzt --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28210ab84..93e52b554 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,8 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_ && rm -rf ./google-chrome.deb COPY requirements.txt /tmp/requirements.txt -RUN pip install --no-cache-dir -r /tmp/requirements.txt +#TODO Remove --no-deps after Taurus will install the latest setuptools https://raw.githubusercontent.com/Blazemeter/taurus/refs/heads/master/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements.txt --no-deps RUN if [ "$INCLUDE_BZT" = "true" ]; then \ wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \ From 945597e105fc41fff49fd168f0a22a6699a7e944 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 29 May 2025 14:45:04 +0300 Subject: [PATCH 266/765] add websudo for confluence locust --- app/extension/confluence/extension_locust.py | 5 ++++- app/locustio/common_utils.py | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/extension/confluence/extension_locust.py b/app/extension/confluence/extension_locust.py index 5d2053e4d..932368762 100644 --- a/app/extension/confluence/extension_locust.py +++ b/app/extension/confluence/extension_locust.py @@ -5,7 +5,10 @@ @confluence_measure("locust_app_specific_action") -# @run_as_specific_user(username='admin', password='admin') # run as specific user +# WebSudo is a feature that enhances security by requiring administrators to re-authenticate before +# accessing administrative functions within Atlassian applications. +# do_websudo=True requires user administrative rights, otherwise requests fail. +#@run_as_specific_user(username='admin', password='admin', do_websudo=False) # run as specific user def app_specific_action(locust): r = locust.get('/app/get_endpoint', catch_response=True) # call app-specific GET endpoint content = r.content.decode('utf-8') # decode response content diff --git a/app/locustio/common_utils.py b/app/locustio/common_utils.py index 6494b6446..448f98d10 100644 --- a/app/locustio/common_utils.py +++ b/app/locustio/common_utils.py @@ -358,7 +358,7 @@ def raise_if_login_failed(locust): raise exception.StopUser('Action login_and_view_dashboard failed') -def do_confluence_login(locust, usr, pwd): +def do_confluence_login(locust, usr, pwd, do_websudo=False): locust.client.cookies.clear() r = locust.get('/dologin.action', catch_response=True) content = r.content.decode('utf-8') @@ -411,6 +411,18 @@ def do_confluence_login(locust, usr, pwd): locust.session_data_storage['password'] = pwd locust.session_data_storage['token'] = token + if do_websudo: + auth_body = { + 'authenticate': 'Confirm', + 'destination': '/admin/systeminfo.action', + 'password': pwd, + } + system_info_html = locust.post(url='/doauthenticate.action', data=auth_body, + headers={'X-Atlassian-Token': 'no-check'}, catch_response=True) + print(system_info_html.content.decode('utf-8')) + + + def do_login_jira(locust, usr, pwd): locust.client.cookies.clear() @@ -457,7 +469,7 @@ def do_login_jira(locust, usr, pwd): locust.session_data_storage["token"] = token -def run_as_specific_user(username=None, password=None): +def run_as_specific_user(username=None, password=None, do_websudo=False): if not (username and password): raise SystemExit(f'The credentials are not valid: {{username: {username}, password: {password}}}.') @@ -493,7 +505,7 @@ def wrapper(*args, **kwargs): do_login_jira(locust, session_user_name, session_user_password) if app == CONFLUENCE: - do_confluence_login(locust, username, password) + do_confluence_login(locust, username, password, do_websudo) func(*args, **kwargs) do_confluence_login(locust, session_user_name, session_user_password) From 81c2819b3459f4dd112dda719c61a88b6db091f6 Mon Sep 17 00:00:00 2001 From: Bradley Hyde Date: Thu, 29 May 2025 21:04:00 +1000 Subject: [PATCH 267/765] add better wait logic for login form --- app/selenium_ui/confluence/pages/pages.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/selenium_ui/confluence/pages/pages.py b/app/selenium_ui/confluence/pages/pages.py index a77559479..c15a3908d 100644 --- a/app/selenium_ui/confluence/pages/pages.py +++ b/app/selenium_ui/confluence/pages/pages.py @@ -19,6 +19,10 @@ def wait_for_page_loaded(self): if not self.get_elements(LoginPageLocators.login_button): self.is_2sv_login = True print("INFO: 2sv login form") + self.wait_until_visible(LoginPageLocators.login_username_field_2sv) + else: + print("INFO: legacy login form") + self.wait_until_visible(LoginPageLocators.login_username_field) def set_credentials(self, username, password): if self.is_2sv_login: @@ -71,6 +75,12 @@ class Logout(BasePage): def wait_for_logout(self): self.wait_until_visible(LoginPageLocators.sidebar) + if not self.get_elements(LoginPageLocators.login_button): + print("INFO: 2sv login form") + self.wait_until_visible(LoginPageLocators.login_username_field_2sv) + else: + print("INFO: legacy login form") + self.wait_until_visible(LoginPageLocators.login_username_field) class AllUpdates(BasePage): From bb87a281dcf2a501156670eb86df7db628c53ebb Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 30 May 2025 12:01:23 +0300 Subject: [PATCH 268/765] bump bzt to latest --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 499433d30..bce841903 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ selenium==4.31.0 filelock==3.18.0 packaging==24.2 prettytable==3.16.0 -bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils +bzt==1.16.42 boto3==1.37.30 retry==0.9.2 From 715b1c2c0a82150b6213fe7a8a8931ea3da38541 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 30 May 2025 12:57:19 +0300 Subject: [PATCH 269/765] added websudo jmeter confluence --- app/jmeter/confluence.jmx | 98 ++++++++++++++++++++++++++++++--------- 1 file changed, 75 insertions(+), 23 deletions(-) diff --git a/app/jmeter/confluence.jmx b/app/jmeter/confluence.jmx index 71cdb072f..c4a900956 100644 --- a/app/jmeter/confluence.jmx +++ b/app/jmeter/confluence.jmx @@ -1780,7 +1780,7 @@ if ( sleep_time > 0 ) { - + 1 false 1 @@ -2032,7 +2032,7 @@ if ( sleep_time > 0 ) { false - + utf-8 ${application.postfix}/rest/api/content/${ajs-content-id}?status=draft true @@ -2098,7 +2098,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/${x_new_title_blog} true GET @@ -2141,7 +2141,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/rest/likes/1.0/content/${ajs-content-id}/likes true GET @@ -2189,7 +2189,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/rest/inlinecomments/1.0/comments true GET @@ -2237,7 +2237,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/plugins/editor-loader/editor.action true GET @@ -2356,7 +2356,7 @@ if ( sleep_time > 0 ) { - + 1 false 1 @@ -2384,7 +2384,7 @@ if ( sleep_time > 0 ) { false - + ${application.postfix}/pages/createpage.action true GET @@ -2575,7 +2575,7 @@ if (isFail) { false - + ${application.postfix}/rest/api/content/${ajs-content-id}?status=draft true PUT @@ -4960,7 +4960,7 @@ if ( sleep_time > 0 ) { - + 1 false 1 @@ -4989,7 +4989,7 @@ if ( sleep_time > 0 ) { false - + ${application.postfix}/rest/likes/1.0/content/${page_id}/likes true GET @@ -5054,7 +5054,7 @@ if ( sleep_time > 0 ) { true - + ${application.postfix}/rest/likes/1.0/content/${page_id}/likes true DELETE @@ -5098,7 +5098,7 @@ if ( sleep_time > 0 ) { true - + ${application.postfix}/rest/likes/1.0/content/${page_id}/likes true POST @@ -5485,7 +5485,7 @@ if ( sleep_time > 0 ) { - + app_specific_username @@ -5564,13 +5564,13 @@ if ( sleep_time > 0 ) { - + ${__groovy(vars.get("legacy_login_form") == 'true')} false true - + Detected the start of a redirect chain ${application.postfix}/dologin.action POST @@ -5652,7 +5652,7 @@ if ( sleep_time > 0 ) { 2 - + groovy @@ -5670,7 +5670,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/rest/api/user/current true GET @@ -5681,7 +5681,7 @@ if ( sleep_time > 0 ) { - + groovy @@ -5704,7 +5704,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + ${application.postfix}/ true GET @@ -5781,7 +5781,59 @@ if (response_data.username != vars.get("app_specific_username")) { true - + + groovy + + + true + prev.setIgnore() + + + + + Works only with admin permissions + ${application.postfix}/doauthenticate.action + true + POST + true + false + + + + false + Confirm + = + true + authenticate + + + false + /admin/systeminfo.action + = + true + destination + + + false + ${app_specific_password} + = + true + password + + + + + + + + + X-Atlassian-Token + no-check + + + + + groovy @@ -5791,7 +5843,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + true false @@ -5877,7 +5929,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + ${run_as_specific_user} false true From e5fd9a32eb7a6c930894a9f2da67c6a93722d0b8 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 30 May 2025 13:02:01 +0300 Subject: [PATCH 270/765] added websudo jmeter confluence --- app/jmeter/confluence.jmx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/jmeter/confluence.jmx b/app/jmeter/confluence.jmx index c4a900956..409fddc12 100644 --- a/app/jmeter/confluence.jmx +++ b/app/jmeter/confluence.jmx @@ -1780,7 +1780,7 @@ if ( sleep_time > 0 ) { - + 1 false 1 @@ -2032,7 +2032,7 @@ if ( sleep_time > 0 ) { false - + utf-8 ${application.postfix}/rest/api/content/${ajs-content-id}?status=draft true @@ -2098,7 +2098,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/${x_new_title_blog} true GET @@ -2141,7 +2141,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/rest/likes/1.0/content/${ajs-content-id}/likes true GET @@ -2189,7 +2189,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/rest/inlinecomments/1.0/comments true GET @@ -2237,7 +2237,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/plugins/editor-loader/editor.action true GET @@ -2356,7 +2356,7 @@ if ( sleep_time > 0 ) { - + 1 false 1 @@ -2384,7 +2384,7 @@ if ( sleep_time > 0 ) { false - + ${application.postfix}/pages/createpage.action true GET From bf60912105efd7dcea285dc30d23f2fce5d99b33 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 30 May 2025 13:05:31 +0300 Subject: [PATCH 271/765] added websudo jmeter confluence --- app/jmeter/confluence.jmx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/jmeter/confluence.jmx b/app/jmeter/confluence.jmx index 409fddc12..f4cc8aaa4 100644 --- a/app/jmeter/confluence.jmx +++ b/app/jmeter/confluence.jmx @@ -2575,7 +2575,7 @@ if (isFail) { false - + ${application.postfix}/rest/api/content/${ajs-content-id}?status=draft true PUT @@ -4960,7 +4960,7 @@ if ( sleep_time > 0 ) { - + 1 false 1 @@ -4989,7 +4989,7 @@ if ( sleep_time > 0 ) { false - + ${application.postfix}/rest/likes/1.0/content/${page_id}/likes true GET @@ -5054,7 +5054,7 @@ if ( sleep_time > 0 ) { true - + ${application.postfix}/rest/likes/1.0/content/${page_id}/likes true DELETE @@ -5098,7 +5098,7 @@ if ( sleep_time > 0 ) { true - + ${application.postfix}/rest/likes/1.0/content/${page_id}/likes true POST @@ -5485,7 +5485,7 @@ if ( sleep_time > 0 ) { - + app_specific_username @@ -5564,13 +5564,13 @@ if ( sleep_time > 0 ) { - + ${__groovy(vars.get("legacy_login_form") == 'true')} false true - + Detected the start of a redirect chain ${application.postfix}/dologin.action POST @@ -5652,7 +5652,7 @@ if ( sleep_time > 0 ) { 2 - + groovy @@ -5670,7 +5670,7 @@ if ( sleep_time > 0 ) { - + ${application.postfix}/rest/api/user/current true GET @@ -5681,7 +5681,7 @@ if ( sleep_time > 0 ) { - + groovy From 9978028bdb7d7f3a807f990f35c9c88ba53808bb Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 30 May 2025 13:07:01 +0300 Subject: [PATCH 272/765] added websudo jmeter confluence --- app/jmeter/confluence.jmx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/jmeter/confluence.jmx b/app/jmeter/confluence.jmx index f4cc8aaa4..46c89658e 100644 --- a/app/jmeter/confluence.jmx +++ b/app/jmeter/confluence.jmx @@ -5704,7 +5704,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + ${application.postfix}/ true GET @@ -5843,7 +5843,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + true false @@ -5929,7 +5929,7 @@ if (response_data.username != vars.get("app_specific_username")) { - + ${run_as_specific_user} false true From 110fb972b43a764ca80bda109dddfc12a23e3ac2 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 30 May 2025 13:59:41 +0300 Subject: [PATCH 273/765] added websudo for jira locust --- app/extension/jira/extension_locust.py | 5 ++++- app/locustio/common_utils.py | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/extension/jira/extension_locust.py b/app/extension/jira/extension_locust.py index 27ee33260..3ab85efcd 100644 --- a/app/extension/jira/extension_locust.py +++ b/app/extension/jira/extension_locust.py @@ -5,7 +5,10 @@ @jira_measure("locust_app_specific_action") -# @run_as_specific_user(username='admin', password='admin') # run as specific user +# WebSudo is a feature that enhances security by requiring administrators to re-authenticate before +# accessing administrative functions within Atlassian applications. +# do_websudo=True requires user administrative rights, otherwise requests fail. +#@run_as_specific_user(username='admin', password='admin', do_websudo=False) # run as specific user def app_specific_action(locust): r = locust.get('/app/get_endpoint', catch_response=True) # call app-specific GET endpoint content = r.content.decode('utf-8') # decode response content diff --git a/app/locustio/common_utils.py b/app/locustio/common_utils.py index 448f98d10..c751ecbd0 100644 --- a/app/locustio/common_utils.py +++ b/app/locustio/common_utils.py @@ -419,12 +419,9 @@ def do_confluence_login(locust, usr, pwd, do_websudo=False): } system_info_html = locust.post(url='/doauthenticate.action', data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, catch_response=True) - print(system_info_html.content.decode('utf-8')) - - -def do_login_jira(locust, usr, pwd): +def do_login_jira(locust, usr, pwd, do_websudo=False): locust.client.cookies.clear() body = LOGIN_BODY body['os_username'] = usr @@ -468,6 +465,16 @@ def do_login_jira(locust, usr, pwd): token = fetch_by_re(locust.session_data_storage['token_pattern'], content) locust.session_data_storage["token"] = token + if do_websudo: + auth_body = { + 'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa', + 'webSudoIsPost': False, + 'webSudoPassword': pwd, + 'atl_token': locust.session_data_storage["token"] + } + system_info_html = locust.post(url='/secure/admin/WebSudoAuthenticate.jspa', data=auth_body, + headers={'X-Atlassian-Token': 'no-check'}, catch_response=True) + def run_as_specific_user(username=None, password=None, do_websudo=False): if not (username and password): @@ -500,7 +507,7 @@ def wrapper(*args, **kwargs): # send requests by the specific user if app == JIRA or (app == JSM and app_type == TYPE_AGENT): - do_login_jira(locust, username, password) + do_login_jira(locust, username, password, do_websudo) func(*args, **kwargs) do_login_jira(locust, session_user_name, session_user_password) From 1d5297af2c4037118a4619f4bafc82991485de9a Mon Sep 17 00:00:00 2001 From: Bradley Hyde Date: Mon, 2 Jun 2025 11:51:35 +1000 Subject: [PATCH 274/765] Revert "Merge pull request #1766 from atlassian/dca-2483-install-latest-bzt-workaround" This reverts commit 97108eaa4890adad3a7b3f0c7e99ca4db2baa079, reversing changes made to b7d4bb5c828e9bba851da6cc00df4b6c9b800bad. --- Dockerfile | 3 +-- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 93e52b554..28210ab84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,7 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_ && rm -rf ./google-chrome.deb COPY requirements.txt /tmp/requirements.txt -#TODO Remove --no-deps after Taurus will install the latest setuptools https://raw.githubusercontent.com/Blazemeter/taurus/refs/heads/master/requirements.txt -RUN pip install --no-cache-dir -r /tmp/requirements.txt --no-deps +RUN pip install --no-cache-dir -r /tmp/requirements.txt RUN if [ "$INCLUDE_BZT" = "true" ]; then \ wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \ diff --git a/requirements.txt b/requirements.txt index bce841903..499433d30 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ selenium==4.31.0 filelock==3.18.0 packaging==24.2 prettytable==3.16.0 -bzt==1.16.42 +bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils boto3==1.37.30 retry==0.9.2 From f727ce0b581895ebfcff5b3254335541e16d5317 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:01:01 +0200 Subject: [PATCH 275/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f3a88bab5..35300a649 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e8ebf1fdd67fd5ff20e51bb0d47b8e26e0d5ad50 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:01:02 +0200 Subject: [PATCH 276/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index fe4f61f4d..3510b7c04 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f7682af225728397c665d505feb0a3d7db0b6d8e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:01:03 +0200 Subject: [PATCH 277/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 6162e1bd0..e4eae9449 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5ef362227eb1b16b2185ca99725946cca562b611 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:01:03 +0200 Subject: [PATCH 278/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index dabc5178a..8409cc0f2 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5c53684ff7b616169fe94c237df053ed33509ee0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:01:04 +0200 Subject: [PATCH 279/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 2e0f124bc..05d5fe3a9 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.55" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f0cfaca4f84baadf5d0bae5ec6e6c01798141b4c Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 9 Jun 2025 11:12:48 +0300 Subject: [PATCH 280/765] added websudo and fixes --- app/jmeter/jira.jmx | 477 +++++++++++++++++++++++++++++++++----------- 1 file changed, 358 insertions(+), 119 deletions(-) diff --git a/app/jmeter/jira.jmx b/app/jmeter/jira.jmx index f16f52509..a9d5c85ad 100644 --- a/app/jmeter/jira.jmx +++ b/app/jmeter/jira.jmx @@ -335,13 +335,13 @@ if ("NOT_FOUND".equals(loginform)) { - + ${__groovy(vars.get("legacy_login_form") == 'true')} false true - + Detected the start of a redirect chain UTF-8 ${application.postfix}/login.jsp @@ -7225,7 +7225,7 @@ if ( sleep_time > 0 ) { - + 1 false 1 @@ -7250,7 +7250,7 @@ if ( sleep_time > 0 ) { - + app_specific_username @@ -7265,13 +7265,13 @@ if ( sleep_time > 0 ) { - + ${__groovy(vars.get("legacy_login_form") == 'true')} false true - + Detected the start of a redirect chain UTF-8 ${application.postfix}/login.jsp @@ -7360,7 +7360,7 @@ if ( sleep_time > 0 ) { - + groovy @@ -7371,13 +7371,13 @@ prev.setIgnore() - + ${__groovy(vars.get("legacy_login_form") == 'false')} false true - + 2sv login flow ${application.postfix}/rest/tsv/1.0/authenticate POST @@ -7407,7 +7407,7 @@ prev.setIgnore() - + 200 @@ -7417,9 +7417,18 @@ prev.setIgnore() 2 + + groovy + + + true + vars.put("run_as_specific_user", "true") +prev.setIgnore() + + - + ${application.postfix}/rest/api/2/myself true GET @@ -7430,7 +7439,7 @@ prev.setIgnore() - + groovy @@ -7445,19 +7454,132 @@ if (response_data.name != vars.get("app_specific_username")) { prev.setResponseMessage("Login Failed: Your app_specific_username: '" + vars.get("app_specific_username") + "' or password is incorrect. Also, check the CAPTCHA for '" + vars.get("app_specific_username") + "' user.") prev.setTestLogicalAction(org.apache.jmeter.threads.JMeterContext.TestLogicalAction.BREAK_CURRENT_LOOP) } else { + log.info("Logged in as ${response_data.name}") prev.setIgnore() } + + ${application.postfix}/ + true + GET + true + false + + + + + + + + + Accept-Language + en-US,en;q=0.5 + + + Upgrade-Insecure-Requests + 1 + + + Accept-Encoding + gzip, deflate + + + Accept + text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 + + + + + + false + x-atl-token + name="atlassian-token" content="(.+?)" + $1$ + + 1 + all + true + + + + groovy + + + true + log.info("atl token ${x-atl-token}") +prev.setIgnore() + + + + + Works only with admin permissions + ${application.postfix}/secure/admin/WebSudoAuthenticate.jspa + true + POST + true + false + + + + false + /secure/admin/ViewSystemInfo.jspa + = + true + webSudoDestination + + + false + false + = + true + webSudoIsPost + + + false + ${app_specific_password} + = + true + webSudoPassword + + + false + ${x-atl-token} + = + true + atl_token + + + + + + + + + X-Atlassian-Token + no-check + + + + + + groovy + + + true + prev.setIgnore() + + + - + true false - + ${application.postfix}/app/get_endpoint true GET @@ -7468,7 +7590,7 @@ if (response_data.name != vars.get("app_specific_username")) { - + false app_id "id":"(.+?)" @@ -7478,7 +7600,7 @@ if (response_data.name != vars.get("app_specific_username")) { false - + false app_token "token":"(.+?)" @@ -7499,7 +7621,7 @@ if (response_data.name != vars.get("app_specific_username")) { - + ${application.postfix}/app/post_endpoint true POST @@ -7537,111 +7659,174 @@ if (response_data.name != vars.get("app_specific_username")) { - + ${run_as_specific_user} false true - - Detected the start of a redirect chain - UTF-8 - ${application.postfix}/login.jsp - true - POST - true - false - - - - false - os_username - ${username} - = - true - - - false - os_password - ${password} - = - true - - - false - os_destination - - = - true - - - false - user_role - - = - true - - - false - atl_token - - = - true - - - true - login - Log In - = - true - - - - + + ${__groovy(vars.get("legacy_login_form") == 'true')} + false + true + - - - - Accept-Language - en-US,en;q=0.5 - - - Pragma - no-cache - - - Accept - text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 - - - Upgrade-Insecure-Requests - 1 - - - Content-Type - application/x-www-form-urlencoded - - - Cache-Control - no-cache - - - Accept-Encoding - gzip, deflate - - - - - - groovy - - - true - prev.setIgnore() - - + + Detected the start of a redirect chain + UTF-8 + ${application.postfix}/login.jsp + true + POST + true + false + + + + false + os_username + ${username} + = + true + + + false + os_password + ${password} + = + true + + + false + os_destination + + = + true + + + false + user_role + + = + true + + + false + atl_token + + = + true + + + true + login + Log In + = + true + + + + + + + + + Accept-Language + en-US,en;q=0.5 + + + Pragma + no-cache + + + Accept + text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 + + + Upgrade-Insecure-Requests + 1 + + + Content-Type + application/x-www-form-urlencoded + + + Cache-Control + no-cache + + + Accept-Encoding + gzip, deflate + + + + + + groovy + + + true + prev.setIgnore() + + + - + + ${__groovy(vars.get("legacy_login_form") == 'false')} + false + true + + + + 2sv login flow + ${application.postfix}/rest/tsv/1.0/authenticate + POST + true + true + + + + false + {"username": "${username}", + "password": "${password}", + "rememberMe": "True", + "targetUrl": "" +} + = + + + + + + + + + Content-Type + application/json + + + + + + + 200 + + + Assertion.response_code + false + 2 + + + + groovy + + + true + prev.setIgnore() + + + + + ${application.postfix}/rest/api/2/myself true GET @@ -7652,7 +7837,7 @@ if (response_data.name != vars.get("app_specific_username")) { - + groovy @@ -7665,8 +7850,9 @@ response_data = slurper.parseText(prev.getResponseDataAsString()) if (response_data.name != vars.get("username")) { prev.setSuccessful(false) prev.setResponseMessage("Re-login Failed: username: '" + vars.get("username") + "' failed to login. Check the CAPTCHA for '" + vars.get("username") + "' user.") - prev.setTestLogicalAction(org.apache.jmeter.threads.JMeterContext.TestLogicalAction.BREAK_CURRENT_LOOP) + prev.setTestLogicalAction(org.apache.jmeter.threads.JMeterContext.TestLogicalAction.BREAK_CURRENT_LOOP) } else { + log.info("Logged in back as ${response_data.name}") prev.setIgnore() } @@ -7675,14 +7861,67 @@ if (response_data.name != vars.get("username")) { + + ${application.postfix}/ + true + GET + true + false + + + + + + + + + Accept-Language + en-US,en;q=0.5 + + + Upgrade-Insecure-Requests + 1 + + + Accept-Encoding + gzip, deflate + + + Accept + text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 + + + + + + false + x-atl-token + name="atlassian-token" content="(.+?)" + $1$ + + 1 + all + true + + + + groovy + + + true + log.info("atl token after ${x-atl-token}") +prev.setIgnore() + + + - + 1 0 0 - + true From 7b3331598597ad32e561dc359302566e489ec050 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Jun 2025 07:00:57 +0200 Subject: [PATCH 281/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 35300a649..ddd2b7e21 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9ce56785b05e0c86666e5213bf87e65f6b20948c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Jun 2025 07:00:57 +0200 Subject: [PATCH 282/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 3510b7c04..2893a6d83 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From d420062248f9fac9c2bc22ab0aa0b9dae30271a9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Jun 2025 07:00:58 +0200 Subject: [PATCH 283/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index e4eae9449..dfeb6a006 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bcb92dd8789f9caeeba9404751f49580eca2b0e0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Jun 2025 07:00:59 +0200 Subject: [PATCH 284/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 8409cc0f2..9495d134d 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From de95917f26f6d822adef5a056c3c5c25a3a1e199 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Jun 2025 07:00:59 +0200 Subject: [PATCH 285/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 05d5fe3a9..d314dbe6d 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.68" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b1ee4fc5893a8ea3e3a3402f7b8d242ad45db254 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 11 Jun 2025 11:41:19 +0300 Subject: [PATCH 286/765] added websudo to locust jsm extensions --- app/extension/jsm/extension_locust_agents.py | 5 ++++- app/extension/jsm/extension_locust_customers.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/extension/jsm/extension_locust_agents.py b/app/extension/jsm/extension_locust_agents.py index bdd05c9c9..9655b8b6b 100644 --- a/app/extension/jsm/extension_locust_agents.py +++ b/app/extension/jsm/extension_locust_agents.py @@ -5,7 +5,10 @@ @jsm_agent_measure('locust_agent_app_specific_action') -# @run_as_specific_user(username='admin', password='admin') # run as specific user +# WebSudo is a feature that enhances security by requiring administrators to re-authenticate before +# accessing administrative functions within Atlassian applications. +# do_websudo=True requires user administrative rights, otherwise requests fail. +# @run_as_specific_user(username='admin', password='admin', do_websudo=False) # run as specific user def app_specific_action(locust): r = locust.get('/app/get_endpoint', catch_response=True) # call app-specific GET endpoint content = r.content.decode('utf-8') # decode response content diff --git a/app/extension/jsm/extension_locust_customers.py b/app/extension/jsm/extension_locust_customers.py index 4102a82cf..38bd2e72b 100644 --- a/app/extension/jsm/extension_locust_customers.py +++ b/app/extension/jsm/extension_locust_customers.py @@ -5,7 +5,10 @@ @jsm_customer_measure('locust_customer_app_specific_action') -# @run_as_specific_user(username='admin', password='admin') # run as specific user +# WebSudo is a feature that enhances security by requiring administrators to re-authenticate before +# accessing administrative functions within Atlassian applications. +# do_websudo=True requires user administrative rights, otherwise requests fail. +# @run_as_specific_user(username='admin', password='admin', do_websudo=False) # run as specific user def app_specific_action(locust): r = locust.get('/app/get_endpoint', catch_response=True) # call app-specific GET endpoint content = r.content.decode('utf-8') # decode response content From 7c08604fdf0582017ea536ab2f38ec92fc785cef Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 12 Jun 2025 10:44:53 +0200 Subject: [PATCH 287/765] Release 8.7.1 --- 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 ddd2b7e21..43e64724c 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for JMeter load executor view_all_builds: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index dfeb6a006..c2af90401 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/confluence.yml b/app/confluence.yml index 2893a6d83..788971262 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. extended_metrics: False # Action percentage for JMeter and Locust load executors diff --git a/app/crowd.yml b/app/crowd.yml index 8d90b55ff..ebb999f12 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index 9495d134d..3fd23c6f8 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors create_issue: 4 diff --git a/app/jsm.yml b/app/jsm.yml index d314dbe6d..cabefbbf2 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 diff --git a/app/util/conf.py b/app/util/conf.py index 9aee3369b..65e44fd3f 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 = '8.8.0' +TOOLKIT_VERSION = '8.7.1' UNSUPPORTED_VERSION = '8.4.0' From 2099815b7376e8c767cc8a54a7712e3d16c45a24 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 18 Jun 2025 07:00:57 +0200 Subject: [PATCH 288/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index ddd2b7e21..6952334a2 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f31e6dd8ab9ce68898f4b5f87af55becb79c747c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 18 Jun 2025 07:00:57 +0200 Subject: [PATCH 289/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 2893a6d83..c13d8c2df 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8881176b871bbbf7a0b3f95894b5d04e4313fd76 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 18 Jun 2025 07:00:58 +0200 Subject: [PATCH 290/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index dfeb6a006..1ec454239 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2727c4ab292e9af05328ea7091a66fc76bd59911 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 18 Jun 2025 07:00:58 +0200 Subject: [PATCH 291/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 9495d134d..c3e8bfc9f 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8374b15c163870803a15feac8ae972ab425eaa46 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 18 Jun 2025 07:00:59 +0200 Subject: [PATCH 292/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index d314dbe6d..40f2db754 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 80e43ed59466a51d2c8739797bd4bc4b6ab0093d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 25 Jun 2025 07:00:53 +0200 Subject: [PATCH 293/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 6952334a2..1d2873b9b 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a19f4d428781af31ec66b40bca18dc6322b54886 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 25 Jun 2025 07:00:54 +0200 Subject: [PATCH 294/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index c13d8c2df..cdcb5113a 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bca33a29cf155bc948f1743dbb19e4d7e7e36636 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 25 Jun 2025 07:00:55 +0200 Subject: [PATCH 295/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 1ec454239..0ba952eea 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c3c997450478453596b47a7f88bf8ff3f876de83 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 25 Jun 2025 07:00:55 +0200 Subject: [PATCH 296/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index c3e8bfc9f..d5310902c 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 3ecc34d72449d4f6991971bf27f60f04b8814695 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 25 Jun 2025 07:00:56 +0200 Subject: [PATCH 297/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 40f2db754..68febc0af 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "137.0.7151.119" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f26cd6167cf47bba06917b615cb304796f5b1ea8 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 25 Jun 2025 12:17:03 +0300 Subject: [PATCH 298/765] added apps count to analytics --- app/util/analytics/analytics.py | 2 ++ app/util/analytics/analytics_utils.py | 2 ++ app/util/analytics/application_info.py | 19 +++++++++++++++++++ app/util/api/jira_clients.py | 18 ++++++++++++++++++ .../data_preparation/jira_prepare_data.py | 10 ++++++++++ 5 files changed, 51 insertions(+) diff --git a/app/util/analytics/analytics.py b/app/util/analytics/analytics.py index 631727961..807618470 100644 --- a/app/util/analytics/analytics.py +++ b/app/util/analytics/analytics.py @@ -52,6 +52,8 @@ def __init__(self, application: BaseApplication): self.application_version = application.version self.nodes_count = application.nodes_count self.dataset_information = application.dataset_information + self.apps_count = application.apps_count + self.custom_apps_count = application.custom_app_count if self.app_type != CROWD: self.processors = application.processors self.deployment = application.deployment diff --git a/app/util/analytics/analytics_utils.py b/app/util/analytics/analytics_utils.py index a73b67030..8c2beff6d 100644 --- a/app/util/analytics/analytics_utils.py +++ b/app/util/analytics/analytics_utils.py @@ -106,6 +106,8 @@ def generate_report_summary(collector): summary_report.append(f'Compliant|{compliant}') summary_report.append(f'Success|{success}') summary_report.append(f'Has app-specific actions|{bool(collector.app_specific_rates)}') + summary_report.append(f'Applications count|{collector.apps_count}') + summary_report.append(f'Custom applications count|{collector.custom_apps_count}') if collector.app_type == JSM: insight = collector.insight diff --git a/app/util/analytics/application_info.py b/app/util/analytics/application_info.py index 6a1c4b405..e880da550 100644 --- a/app/util/analytics/application_info.py +++ b/app/util/analytics/application_info.py @@ -8,6 +8,7 @@ from util.api.bamboo_clients import BambooClient import json from lxml import html +from functools import cached_property JIRA = 'jira' CONFLUENCE = 'confluence' @@ -31,6 +32,8 @@ class BaseApplication: version = None nodes_count = None dataset_information = None + apps_count = None + custom_app_count = None def __init__(self, api_client, config_yml): self.client = api_client(host=config_yml.server_url, @@ -99,6 +102,22 @@ def __issues_count(self): def dataset_information(self): return f"{self.__issues_count()} issues" + @property + def apps_count(self): + return len(self.__get_apps) + + @cached_property + def __get_apps(self): + return self.client.get_installed_apps() + + @property + def custom_app_count(self): + all_apps = self.__get_apps + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + return len(non_atlassian_apps) + class Confluence(BaseApplication): type = CONFLUENCE diff --git a/app/util/api/jira_clients.py b/app/util/api/jira_clients.py index 874362c8d..b931b681c 100644 --- a/app/util/api/jira_clients.py +++ b/app/util/api/jira_clients.py @@ -300,3 +300,21 @@ def get_license_details(self): 'image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7' r = self.get(api_url, "Could not retrieve license details") return r.json() + + def get_installed_apps(self): + login_url = f'{self.host}/login.jsp' + auth_url = f'{self.host}/secure/admin/WebSudoAuthenticate.jspa' + auth_body = { + 'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa', + 'webSudoIsPost': False, + 'webSudoPassword': self.password + } + self.post(login_url, error_msg='Could not login in') + auth_body['atl_token'] = self.session.cookies.get_dict()['atlassian.xsrf.token'] + self._session.post(auth_url, data=auth_body) + self.headers['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,' \ + 'image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7' + + api_url = f'{self.host}/rest/plugins/1.0/' + r = self.get(api_url, error_msg="ERROR: Could not get the installed apps.") + return r.json()['plugins'] diff --git a/app/util/data_preparation/jira_prepare_data.py b/app/util/data_preparation/jira_prepare_data.py index 77867e7c8..ec43b0555 100644 --- a/app/util/data_preparation/jira_prepare_data.py +++ b/app/util/data_preparation/jira_prepare_data.py @@ -177,6 +177,15 @@ def __check_license(client): raise SystemExit(f'ERROR: Jira license is valid: {license_valid}, license has expired: {license_expired}.') +def __check_number_of_custom_app(client): + all_apps = client.get_installed_apps() + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + print(len(non_atlassian_apps)) + + + def main(): print("Started preparing data") @@ -188,6 +197,7 @@ def main(): __check_for_admin_permissions(client) __check_current_language(client) __check_license(client) + __check_number_of_custom_app(client) dataset = __create_data_set(client) write_test_data_to_files(dataset) From 833d79389d3c1af474e3b06a8d08483d5265975c Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Jun 2025 12:13:22 +0300 Subject: [PATCH 299/765] fix comments --- app/util/analytics/analytics.py | 1 + app/util/analytics/analytics_utils.py | 1 + app/util/analytics/application_info.py | 17 ++++++++++++++--- app/util/data_preparation/jira_prepare_data.py | 5 ++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/util/analytics/analytics.py b/app/util/analytics/analytics.py index 807618470..43e90f8af 100644 --- a/app/util/analytics/analytics.py +++ b/app/util/analytics/analytics.py @@ -54,6 +54,7 @@ def __init__(self, application: BaseApplication): self.dataset_information = application.dataset_information self.apps_count = application.apps_count self.custom_apps_count = application.custom_app_count + self.custom_apps_count_enabled = application.custom_app_count_enabled if self.app_type != CROWD: self.processors = application.processors self.deployment = application.deployment diff --git a/app/util/analytics/analytics_utils.py b/app/util/analytics/analytics_utils.py index 8c2beff6d..9390941b1 100644 --- a/app/util/analytics/analytics_utils.py +++ b/app/util/analytics/analytics_utils.py @@ -108,6 +108,7 @@ def generate_report_summary(collector): summary_report.append(f'Has app-specific actions|{bool(collector.app_specific_rates)}') summary_report.append(f'Applications count|{collector.apps_count}') summary_report.append(f'Custom applications count|{collector.custom_apps_count}') + summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}') if collector.app_type == JSM: insight = collector.insight diff --git a/app/util/analytics/application_info.py b/app/util/analytics/application_info.py index e880da550..242cbfc15 100644 --- a/app/util/analytics/application_info.py +++ b/app/util/analytics/application_info.py @@ -34,6 +34,7 @@ class BaseApplication: dataset_information = None apps_count = None custom_app_count = None + custom_app_count_enabled = None def __init__(self, api_client, config_yml): self.client = api_client(host=config_yml.server_url, @@ -110,13 +111,23 @@ def apps_count(self): def __get_apps(self): return self.client.get_installed_apps() - @property - def custom_app_count(self): + @cached_property + def __get_custom_apps(self): all_apps = self.__get_apps apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in app['vendor']['name'] and app['userInstalled'] == True] - return len(non_atlassian_apps) + return non_atlassian_apps + + @property + def custom_app_count(self): + return len(self.__get_custom_apps) + + @property + def custom_app_count_enabled(self): + non_atlassian_apps = self.__get_custom_apps + non_atlassian_apps_enabled = [app for app in non_atlassian_apps if app['enabled'] == True] + return len(non_atlassian_apps_enabled) class Confluence(BaseApplication): diff --git a/app/util/data_preparation/jira_prepare_data.py b/app/util/data_preparation/jira_prepare_data.py index ec43b0555..e58c9df93 100644 --- a/app/util/data_preparation/jira_prepare_data.py +++ b/app/util/data_preparation/jira_prepare_data.py @@ -182,7 +182,10 @@ def __check_number_of_custom_app(client): apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in app['vendor']['name'] and app['userInstalled'] == True] - print(len(non_atlassian_apps)) + non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps] + print(f"Custom application count: {len(non_atlassian_apps)}") + print(f'Custom app names:') + print(*non_atlassian_apps_names, sep='\n') From 75c1c04131fd14b42d5e6db2ad4a9f6a9f5b3be6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 1 Jul 2025 07:00:52 +0200 Subject: [PATCH 300/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 1d2873b9b..ef7e5c501 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 22883ed6e5de5ad35d6be2554f19d04652e1d9ff Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 1 Jul 2025 07:00:53 +0200 Subject: [PATCH 301/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index cdcb5113a..9d4f0f97d 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 715390c6f0fa67d502d91b94936321cbb5593608 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 1 Jul 2025 07:00:53 +0200 Subject: [PATCH 302/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 0ba952eea..6b2cee67f 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bdce5adb600c30f719cfd9dd4c4f5e12b205094e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 1 Jul 2025 07:00:54 +0200 Subject: [PATCH 303/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index d5310902c..2d38f85dd 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5d601360e3b53fbfc460f4ce4bc91d92b716616d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 1 Jul 2025 07:00:55 +0200 Subject: [PATCH 304/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 68febc0af..22eb1b6c0 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.49" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ce08f23ec172345fe466f5c8e1d8853935f30ac5 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 2 Jul 2025 12:02:36 +0300 Subject: [PATCH 305/765] added error handling --- app/util/analytics/application_info.py | 6 +++++- .../data_preparation/jira_prepare_data.py | 19 +++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/util/analytics/application_info.py b/app/util/analytics/application_info.py index 242cbfc15..3cceed9b6 100644 --- a/app/util/analytics/application_info.py +++ b/app/util/analytics/application_info.py @@ -109,7 +109,11 @@ def apps_count(self): @cached_property def __get_apps(self): - return self.client.get_installed_apps() + try: + return self.client.get_installed_apps() + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + return [] @cached_property def __get_custom_apps(self): diff --git a/app/util/data_preparation/jira_prepare_data.py b/app/util/data_preparation/jira_prepare_data.py index e58c9df93..ac961b2ef 100644 --- a/app/util/data_preparation/jira_prepare_data.py +++ b/app/util/data_preparation/jira_prepare_data.py @@ -178,14 +178,17 @@ def __check_license(client): def __check_number_of_custom_app(client): - all_apps = client.get_installed_apps() - apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] - non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in - app['vendor']['name'] and app['userInstalled'] == True] - non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps] - print(f"Custom application count: {len(non_atlassian_apps)}") - print(f'Custom app names:') - print(*non_atlassian_apps_names, sep='\n') + try: + all_apps = client.get_installed_apps() + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps] + print(f"Custom application count: {len(non_atlassian_apps)}") + print(f'Custom app names:') + print(*non_atlassian_apps_names, sep='\n') + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') From 98d10c574f48fd79da2ee49bb45c5fa65f00fc30 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 4 Jul 2025 12:45:31 +0300 Subject: [PATCH 306/765] added confluence apps count --- app/util/analytics/analytics_utils.py | 10 ++++--- app/util/analytics/application_info.py | 30 +++++++++++++++++++ app/util/api/confluence_clients.py | 7 +++++ .../confluence_prepare_data.py | 15 ++++++++++ .../data_preparation/jira_prepare_data.py | 5 ++-- 5 files changed, 61 insertions(+), 6 deletions(-) diff --git a/app/util/analytics/analytics_utils.py b/app/util/analytics/analytics_utils.py index 9390941b1..4f01d0c3a 100644 --- a/app/util/analytics/analytics_utils.py +++ b/app/util/analytics/analytics_utils.py @@ -7,7 +7,7 @@ from datetime import datetime, timezone from util.common_util import get_current_version, get_latest_version -from util.analytics.application_info import BITBUCKET, BAMBOO, CROWD, INSIGHT, JSM, CONFLUENCE +from util.analytics.application_info import BITBUCKET, BAMBOO, CROWD, INSIGHT, JSM, CONFLUENCE, JIRA latest_version = get_latest_version() current_version = get_current_version() @@ -106,9 +106,11 @@ def generate_report_summary(collector): summary_report.append(f'Compliant|{compliant}') summary_report.append(f'Success|{success}') summary_report.append(f'Has app-specific actions|{bool(collector.app_specific_rates)}') - summary_report.append(f'Applications count|{collector.apps_count}') - summary_report.append(f'Custom applications count|{collector.custom_apps_count}') - summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}') + + if collector.app_type in [JIRA, JSM, CONFLUENCE]: + summary_report.append(f'Applications count|{collector.apps_count}') + summary_report.append(f'Custom applications count|{collector.custom_apps_count}') + summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}') if collector.app_type == JSM: insight = collector.insight diff --git a/app/util/analytics/application_info.py b/app/util/analytics/application_info.py index 3cceed9b6..8e45358f2 100644 --- a/app/util/analytics/application_info.py +++ b/app/util/analytics/application_info.py @@ -159,6 +159,36 @@ def java_version(self): return java_versions_parsed[0].text return None + @property + def apps_count(self): + return len(self.__get_apps) + + @cached_property + def __get_apps(self): + try: + return self.client.get_installed_apps() + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + return [] + + @cached_property + def __get_custom_apps(self): + all_apps = self.__get_apps + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + return non_atlassian_apps + + @property + def custom_app_count(self): + return len(self.__get_custom_apps) + + @property + def custom_app_count_enabled(self): + non_atlassian_apps = self.__get_custom_apps + non_atlassian_apps_enabled = [app for app in non_atlassian_apps if app['enabled'] == True] + return len(non_atlassian_apps_enabled) + class Bitbucket(BaseApplication): type = BITBUCKET diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py index 987a7bbac..13bccdc20 100644 --- a/app/util/api/confluence_clients.py +++ b/app/util/api/confluence_clients.py @@ -222,6 +222,13 @@ def get_system_info_page(self): system_info_html = self.session.post(url=auth_url, data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, verify=self.verify) return system_info_html.content.decode("utf-8") + def get_installed_apps(self): + plugins_url = f'{self.host}/rest/plugins/1.0/' + r = self.get(plugins_url, error_msg="ERROR: Could not get installed plugins.", + headers={'X-Atlassian-Token': 'no-check'}) + return r.json()['plugins'] + + def get_deployment_type(self): html_pattern = 'deployment=terraform' confluence_system_page = self.get_system_info_page() diff --git a/app/util/data_preparation/confluence_prepare_data.py b/app/util/data_preparation/confluence_prepare_data.py index 5be5167ae..5ede2e234 100644 --- a/app/util/data_preparation/confluence_prepare_data.py +++ b/app/util/data_preparation/confluence_prepare_data.py @@ -247,6 +247,20 @@ def __check_license(rest_client): print(f"The license expiry date: {expiry_date_human}.\n" f"License available seats: {license_remaining_seats['count']}") +def __check_number_of_custom_app(rest_client): + try: + all_apps = rest_client.get_installed_apps() + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps] + print(f"Custom application count: {len(non_atlassian_apps)}") + if non_atlassian_apps: + print(f'Custom app names:') + print(*non_atlassian_apps_names, sep='\n') + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + @print_timing('Confluence data preparation') def main(): @@ -258,6 +272,7 @@ def main(): rest_client = ConfluenceRestClient(url, CONFLUENCE_SETTINGS.admin_login, CONFLUENCE_SETTINGS.admin_password, verify=CONFLUENCE_SETTINGS.secure) rpc_client = ConfluenceRpcClient(url, CONFLUENCE_SETTINGS.admin_login, CONFLUENCE_SETTINGS.admin_password) + __check_number_of_custom_app(rest_client) __is_remote_api_enabled(rest_client) __check_license(rest_client) __check_for_admin_permissions(rest_client) diff --git a/app/util/data_preparation/jira_prepare_data.py b/app/util/data_preparation/jira_prepare_data.py index ac961b2ef..d7b489769 100644 --- a/app/util/data_preparation/jira_prepare_data.py +++ b/app/util/data_preparation/jira_prepare_data.py @@ -185,8 +185,9 @@ def __check_number_of_custom_app(client): app['vendor']['name'] and app['userInstalled'] == True] non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps] print(f"Custom application count: {len(non_atlassian_apps)}") - print(f'Custom app names:') - print(*non_atlassian_apps_names, sep='\n') + if non_atlassian_apps: + print(f'Custom app names:') + print(*non_atlassian_apps_names, sep='\n') except Exception as e: print(f'ERROR: Could not get the installed applications. Error: {e}') From 7a73590a757b52d105ec1101a2d1a52bba787117 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 8 Jul 2025 11:21:20 +0300 Subject: [PATCH 307/765] added bitbucket apps count --- app/util/analytics/analytics_utils.py | 2 +- app/util/analytics/application_info.py | 62 +++++++++++++++++++ app/util/api/bitbucket_clients.py | 6 ++ app/util/api/jira_clients.py | 16 +---- .../bitbucket_prepare_data.py | 17 ++++- 5 files changed, 87 insertions(+), 16 deletions(-) diff --git a/app/util/analytics/analytics_utils.py b/app/util/analytics/analytics_utils.py index 4f01d0c3a..46020bfba 100644 --- a/app/util/analytics/analytics_utils.py +++ b/app/util/analytics/analytics_utils.py @@ -107,7 +107,7 @@ def generate_report_summary(collector): summary_report.append(f'Success|{success}') summary_report.append(f'Has app-specific actions|{bool(collector.app_specific_rates)}') - if collector.app_type in [JIRA, JSM, CONFLUENCE]: + if collector.app_type in [JIRA, JSM, CONFLUENCE, BITBUCKET]: summary_report.append(f'Applications count|{collector.apps_count}') summary_report.append(f'Custom applications count|{collector.custom_apps_count}') summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}') diff --git a/app/util/analytics/application_info.py b/app/util/analytics/application_info.py index 8e45358f2..c0b85a730 100644 --- a/app/util/analytics/application_info.py +++ b/app/util/analytics/application_info.py @@ -206,6 +206,37 @@ def nodes_count(self): def dataset_information(self): return f'{self.client.get_bitbucket_repo_count()} repositories' + @property + def apps_count(self): + return len(self.__get_apps) + + @cached_property + def __get_apps(self): + try: + return self.client.get_installed_apps() + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + return [] + + @cached_property + def __get_custom_apps(self): + all_apps = self.__get_apps + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + return non_atlassian_apps + + @property + def custom_app_count(self): + return len(self.__get_custom_apps) + + @property + def custom_app_count_enabled(self): + non_atlassian_apps = self.__get_custom_apps + non_atlassian_apps_enabled = [app for app in non_atlassian_apps if app['enabled'] == True] + return len(non_atlassian_apps_enabled) + + class Jsm(BaseApplication): type = JSM @@ -228,6 +259,37 @@ def __issues_count(self): def dataset_information(self): return f"{self.__issues_count()} issues" + @property + def apps_count(self): + return len(self.__get_apps) + + @cached_property + def __get_apps(self): + try: + return self.client.get_installed_apps() + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + return [] + + @cached_property + def __get_custom_apps(self): + all_apps = self.__get_apps + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + return non_atlassian_apps + + @property + def custom_app_count(self): + return len(self.__get_custom_apps) + + @property + def custom_app_count_enabled(self): + non_atlassian_apps = self.__get_custom_apps + non_atlassian_apps_enabled = [app for app in non_atlassian_apps if app['enabled'] == True] + return len(non_atlassian_apps_enabled) + + class Crowd(BaseApplication): type = CROWD diff --git a/app/util/api/bitbucket_clients.py b/app/util/api/bitbucket_clients.py index d29557102..3b932361b 100644 --- a/app/util/api/bitbucket_clients.py +++ b/app/util/api/bitbucket_clients.py @@ -200,3 +200,9 @@ def get_status(self): else: print(f"Warning: failed to get {api_url}: Error: {e}") return False + + def get_installed_apps(self): + plugins_url = f'{self.host}/rest/plugins/1.0/' + r = self.get(plugins_url, error_msg="ERROR: Could not get installed plugins.", + headers={'X-Atlassian-Token': 'no-check'}) + return r.json()['plugins'] diff --git a/app/util/api/jira_clients.py b/app/util/api/jira_clients.py index b931b681c..5a56ad2ad 100644 --- a/app/util/api/jira_clients.py +++ b/app/util/api/jira_clients.py @@ -302,19 +302,7 @@ def get_license_details(self): return r.json() def get_installed_apps(self): - login_url = f'{self.host}/login.jsp' - auth_url = f'{self.host}/secure/admin/WebSudoAuthenticate.jspa' - auth_body = { - 'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa', - 'webSudoIsPost': False, - 'webSudoPassword': self.password - } - self.post(login_url, error_msg='Could not login in') - auth_body['atl_token'] = self.session.cookies.get_dict()['atlassian.xsrf.token'] - self._session.post(auth_url, data=auth_body) - self.headers['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,' \ - 'image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7' - api_url = f'{self.host}/rest/plugins/1.0/' - r = self.get(api_url, error_msg="ERROR: Could not get the installed apps.") + r = self.get(api_url, error_msg="ERROR: Could not get installed plugins.", + headers={'X-Atlassian-Token': 'no-check'}) return r.json()['plugins'] diff --git a/app/util/data_preparation/bitbucket_prepare_data.py b/app/util/data_preparation/bitbucket_prepare_data.py index fc4fdf21c..09ee1a550 100644 --- a/app/util/data_preparation/bitbucket_prepare_data.py +++ b/app/util/data_preparation/bitbucket_prepare_data.py @@ -134,6 +134,21 @@ def __check_for_admin_permissions(bitbucket_api): bitbucket_api.get_user_global_permissions() +def __check_number_of_custom_app(bitbucket_api): + try: + all_apps = bitbucket_api.get_installed_apps() + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps] + print(f"Custom application count: {len(non_atlassian_apps)}") + if non_atlassian_apps: + print(f'Custom app names:') + print(*non_atlassian_apps_names, sep='\n') + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + + def main(): print("Started preparing data") @@ -142,7 +157,7 @@ def main(): client = BitbucketRestClient(url, BITBUCKET_SETTINGS.admin_login, BITBUCKET_SETTINGS.admin_password, verify=BITBUCKET_SETTINGS.secure) - + __check_number_of_custom_app(client) __check_current_language(client) __check_for_admin_permissions(client) From f7b8a381ffb234199bf75a21367c268d32dd10e3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Jul 2025 07:00:54 +0200 Subject: [PATCH 308/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index ef7e5c501..cb1e40acf 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e7bbb3f0bf900f969a1cf741698ca9720b0302e4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Jul 2025 07:00:54 +0200 Subject: [PATCH 309/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 9d4f0f97d..1cb6a3735 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ee5ad31e7cb33a481cfd0ab38263b7ee59527f18 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Jul 2025 07:00:55 +0200 Subject: [PATCH 310/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 6b2cee67f..1b717a023 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c5ee90bf8978895462fb374589ddee0719a8d6dd Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Jul 2025 07:00:55 +0200 Subject: [PATCH 311/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 2d38f85dd..89afd0db1 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4671038daf24a7b63c3a58e5258b44f86ac45829 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 9 Jul 2025 07:00:56 +0200 Subject: [PATCH 312/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 22eb1b6c0..00a99b63d 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.92" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 789c4ec5647a5a080c4498456575e808a51c1f81 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 14 Jul 2025 13:58:38 +0300 Subject: [PATCH 313/765] added crowd apps count calculation --- app/util/analytics/analytics_utils.py | 2 +- app/util/analytics/application_info.py | 30 +++++++++++++++++++ app/util/api/crowd_clients.py | 6 ++++ .../data_preparation/crowd_prepare_data.py | 19 +++++++++++- 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/app/util/analytics/analytics_utils.py b/app/util/analytics/analytics_utils.py index 46020bfba..be1f84051 100644 --- a/app/util/analytics/analytics_utils.py +++ b/app/util/analytics/analytics_utils.py @@ -107,7 +107,7 @@ def generate_report_summary(collector): summary_report.append(f'Success|{success}') summary_report.append(f'Has app-specific actions|{bool(collector.app_specific_rates)}') - if collector.app_type in [JIRA, JSM, CONFLUENCE, BITBUCKET]: + if collector.app_type in [JIRA, JSM, CONFLUENCE, BITBUCKET, CROWD]: summary_report.append(f'Applications count|{collector.apps_count}') summary_report.append(f'Custom applications count|{collector.custom_apps_count}') summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}') diff --git a/app/util/analytics/application_info.py b/app/util/analytics/application_info.py index c0b85a730..a88392281 100644 --- a/app/util/analytics/application_info.py +++ b/app/util/analytics/application_info.py @@ -315,6 +315,36 @@ def __users_count(self): def dataset_information(self): return f"{self.__users_count()} users" + @property + def apps_count(self): + return len(self.__get_apps) + + @cached_property + def __get_apps(self): + try: + return self.client.get_installed_apps() + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + return [] + + @cached_property + def __get_custom_apps(self): + all_apps = self.__get_apps + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + return non_atlassian_apps + + @property + def custom_app_count(self): + return len(self.__get_custom_apps) + + @property + def custom_app_count_enabled(self): + non_atlassian_apps = self.__get_custom_apps + non_atlassian_apps_enabled = [app for app in non_atlassian_apps if app['enabled'] == True] + return len(non_atlassian_apps_enabled) + class Bamboo(BaseApplication): type = BAMBOO diff --git a/app/util/api/crowd_clients.py b/app/util/api/crowd_clients.py index 9695249c6..5f51e6651 100644 --- a/app/util/api/crowd_clients.py +++ b/app/util/api/crowd_clients.py @@ -108,3 +108,9 @@ def get_status(self): else: print(f"Warning: failed to get {api_url}: Error: {e}") return False + + def get_installed_apps(self): + api_url = f'{self.host}/rest/plugins/1.0/' + r = self.get(api_url, error_msg="ERROR: Could not get installed plugins.", + headers={'X-Atlassian-Token': 'no-check'}) + return r.json()['plugins'] diff --git a/app/util/data_preparation/crowd_prepare_data.py b/app/util/data_preparation/crowd_prepare_data.py index 458e50ddd..177261b52 100644 --- a/app/util/data_preparation/crowd_prepare_data.py +++ b/app/util/data_preparation/crowd_prepare_data.py @@ -40,6 +40,21 @@ def write_test_data_to_files(dataset): __write_to_file(CROWD_USERS, users) +def __check_number_of_custom_app(client): + try: + all_apps = client.get_installed_apps() + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps] + print(f"Custom application count: {len(non_atlassian_apps)}") + if non_atlassian_apps: + print(f'Custom app names:') + print(*non_atlassian_apps_names, sep='\n') + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + + def main(): print("Started preparing data") @@ -48,9 +63,11 @@ def main(): client = CrowdRestClient(url, CROWD_SETTINGS.application_name, CROWD_SETTINGS.application_password, verify=CROWD_SETTINGS.secure) - + crowd_admin_client = CrowdRestClient(url, CROWD_SETTINGS.admin_login, + CROWD_SETTINGS.admin_password, verify=CROWD_SETTINGS.secure) dataset = __create_data_set(client) write_test_data_to_files(dataset) + __check_number_of_custom_app(crowd_admin_client) print("Finished preparing data") From ed3c555273ab1399b3bc71ac864b7dfcd6132368 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 15 Jul 2025 13:49:37 +0300 Subject: [PATCH 314/765] added apps count for bamboo --- app/util/analytics/analytics_utils.py | 8 ++--- app/util/analytics/application_info.py | 30 +++++++++++++++++++ app/util/api/bamboo_clients.py | 6 ++++ .../data_preparation/bamboo_prepare_data.py | 17 ++++++++++- 4 files changed, 56 insertions(+), 5 deletions(-) diff --git a/app/util/analytics/analytics_utils.py b/app/util/analytics/analytics_utils.py index 46020bfba..c6ccd6c67 100644 --- a/app/util/analytics/analytics_utils.py +++ b/app/util/analytics/analytics_utils.py @@ -107,10 +107,10 @@ def generate_report_summary(collector): summary_report.append(f'Success|{success}') summary_report.append(f'Has app-specific actions|{bool(collector.app_specific_rates)}') - if collector.app_type in [JIRA, JSM, CONFLUENCE, BITBUCKET]: - summary_report.append(f'Applications count|{collector.apps_count}') - summary_report.append(f'Custom applications count|{collector.custom_apps_count}') - summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}') + + summary_report.append(f'Applications count|{collector.apps_count}') + summary_report.append(f'Custom applications count|{collector.custom_apps_count}') + summary_report.append(f'Custom applications count enabled|{collector.custom_apps_count_enabled}') if collector.app_type == JSM: insight = collector.insight diff --git a/app/util/analytics/application_info.py b/app/util/analytics/application_info.py index c0b85a730..a3b5558dd 100644 --- a/app/util/analytics/application_info.py +++ b/app/util/analytics/application_info.py @@ -336,6 +336,36 @@ def __build_plans_count(self): def dataset_information(self): return f"{self.__build_plans_count()} build plans" + @property + def apps_count(self): + return len(self.__get_apps) + + @cached_property + def __get_apps(self): + try: + return self.client.get_installed_apps() + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + return [] + + @cached_property + def __get_custom_apps(self): + all_apps = self.__get_apps + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + return non_atlassian_apps + + @property + def custom_app_count(self): + return len(self.__get_custom_apps) + + @property + def custom_app_count_enabled(self): + non_atlassian_apps = self.__get_custom_apps + non_atlassian_apps_enabled = [app for app in non_atlassian_apps if app['enabled'] == True] + return len(non_atlassian_apps_enabled) + class Insight(Jsm): type = INSIGHT diff --git a/app/util/api/bamboo_clients.py b/app/util/api/bamboo_clients.py index 7d796950f..b46ea2f50 100644 --- a/app/util/api/bamboo_clients.py +++ b/app/util/api/bamboo_clients.py @@ -246,3 +246,9 @@ def get_status(self): else: print(f"Warning: failed to get {api_url}: Error: {e}") return False + + def get_installed_apps(self): + api_url = f'{self.host}/rest/plugins/1.0/' + r = self.get(api_url, error_msg="ERROR: Could not get installed plugins.", + headers={'X-Atlassian-Token': 'no-check'}) + return r.json()['plugins'] diff --git a/app/util/data_preparation/bamboo_prepare_data.py b/app/util/data_preparation/bamboo_prepare_data.py index 73cfad2b3..d8075fc8f 100644 --- a/app/util/data_preparation/bamboo_prepare_data.py +++ b/app/util/data_preparation/bamboo_prepare_data.py @@ -75,6 +75,21 @@ def write_test_data_to_files(dataset): __write_to_file(BAMBOO_USERS, users) +def __check_number_of_custom_app(client): + try: + all_apps = client.get_installed_apps() + apps_with_vendor_defined = [app for app in all_apps if 'vendor' in app] + non_atlassian_apps = [app for app in apps_with_vendor_defined if 'Atlassian' not in + app['vendor']['name'] and app['userInstalled'] == True] + non_atlassian_apps_names = [app['name'] for app in non_atlassian_apps] + print(f"Custom application count: {len(non_atlassian_apps)}") + if non_atlassian_apps: + print(f'Custom app names:') + print(*non_atlassian_apps_names, sep='\n') + except Exception as e: + print(f'ERROR: Could not get the installed applications. Error: {e}') + + def main(): print("Started preparing data") verify_agents_plans_setup() @@ -84,7 +99,7 @@ def main(): client = BambooClient(url, BAMBOO_SETTINGS.admin_login, BAMBOO_SETTINGS.admin_password, verify=BAMBOO_SETTINGS.secure) - + __check_number_of_custom_app(client) dataset = __create_dataset(client) write_test_data_to_files(dataset) assert_number_of_agents(client) From 7dd8c89de14dfefc772046cef1aa90e175ae1d17 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Jul 2025 07:01:19 +0200 Subject: [PATCH 315/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index cb1e40acf..741caf7fd 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1167e88bc313b2679afa78570fd7df7b69d0b93e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Jul 2025 07:01:19 +0200 Subject: [PATCH 316/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 1cb6a3735..92f05214a 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4c0dd4a03b599fd8e8890e3d84a7e52c9ef10f0e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Jul 2025 07:01:20 +0200 Subject: [PATCH 317/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 1b717a023..6c282d303 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 04bcb2d913f9348ca01bdefa3784a13c74a182d9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Jul 2025 07:01:20 +0200 Subject: [PATCH 318/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 89afd0db1..306d0541e 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2bdc3bbf53721e1ca3b251ef354c0082fadad365 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 16 Jul 2025 07:01:21 +0200 Subject: [PATCH 319/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 00a99b63d..d452b440f 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.94" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e8fe1e57c7b89b6282b24331b6179bb3cbc2e9e3 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 17 Jul 2025 16:59:47 +0200 Subject: [PATCH 320/765] Update community slack invitation link --- README.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 6 +++--- docs/dc-apps-performance-toolkit-user-guide-bitbucket.md | 6 +++--- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 6 +++--- docs/dc-apps-performance-toolkit-user-guide-crowd.md | 6 +++--- docs/dc-apps-performance-toolkit-user-guide-jira.md | 6 +++--- docs/dc-apps-performance-toolkit-user-guide-jsm.md | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index b37549fb2..145d6d22b 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.2` ## Support -In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. ## Installation and set up diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 3b95de52c..7caf7b65d 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: "2025-04-22" +date: "2025-07-17" --- # Data Center App Performance Toolkit User Guide For Bamboo @@ -414,8 +414,8 @@ Do not forget to attach performance testing results to your ECOHELP ticket. ## Support -If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. For instructions on how to collect detailed logs, see [Collect detailed k8s logs](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#collect-detailed-k8s-logs). For failed cluster uninstall use [Force terminate command](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#force-terminate-cluster). -In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 277cd2afa..a4182446b 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: "2025-04-22" +date: "2025-07-17" --- # Data Center App Performance Toolkit User Guide For Bitbucket @@ -587,8 +587,8 @@ Do not forget to attach performance testing results to your ECOHELP ticket. 2. Attach two reports folders to your ECOHELP ticket. ## Support -If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. For instructions on how to collect detailed logs, see [Collect detailed k8s logs](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#collect-detailed-k8s-logs). For failed cluster uninstall use [Force terminate command](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#force-terminate-cluster). -In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index b0e5ee3be..e4fa2a391 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: "2025-04-22" +date: "2025-07-17" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -677,8 +677,8 @@ Do not forget to attach performance testing results to your ECOHELP ticket. 2. Attach two reports folders to your ECOHELP ticket. ## Support -If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. For instructions on how to collect detailed logs, see [Collect detailed k8s logs](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#collect-detailed-k8s-logs). For failed cluster uninstall use [Force terminate command](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#force-terminate-cluster). -In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index ed82f9dd1..9d4672119 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: "2025-04-22" +date: "2025-07-17" --- # Data Center App Performance Toolkit User Guide For Crowd @@ -435,8 +435,8 @@ Do not forget to attach performance testing results to your ECOHELP ticket. 2. Attach two reports folders to your ECOHELP ticket. ## Support -If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. For instructions on how to collect detailed logs, see [Collect detailed k8s logs](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#collect-detailed-k8s-logs). For failed cluster uninstall use [Force terminate command](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#force-terminate-cluster). -In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index be7db2c10..843c2a0fb 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: "2025-04-22" +date: "2025-07-17" --- # Data Center App Performance Toolkit User Guide For Jira @@ -723,8 +723,8 @@ Do not forget to attach performance testing results to your ECOHELP ticket. 2. Attach two reports folders to your ECOHELP ticket. ## Support -If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. For instructions on how to collect detailed logs, see [Collect detailed k8s logs](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#collect-detailed-k8s-logs). For failed cluster uninstall use [Force terminate command](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#force-terminate-cluster). -In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index f933041f8..23ce967c9 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: "2025-04-22" +date: "2025-07-17" --- # Data Center App Performance Toolkit User Guide For Jira Service Management @@ -766,8 +766,8 @@ Do not forget to attach performance testing results to your ECOHELP ticket. 2. Attach two reports folders to your ECOHELP ticket. ## Support -If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +If the installation script fails on installing Helm release or any other reason, collect the logs, zip and share to [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. For instructions on how to collect detailed logs, see [Collect detailed k8s logs](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#collect-detailed-k8s-logs). For failed cluster uninstall use [Force terminate command](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/app/util/k8s/README.MD#force-terminate-cluster). -In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. +In case of any technical questions or issues with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. From cbbf71d3855356c5c03ba3fe0032b48298de3a29 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 21 Jul 2025 12:48:52 +0300 Subject: [PATCH 321/765] added retry to get system info page --- app/util/api/jira_clients.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/util/api/jira_clients.py b/app/util/api/jira_clients.py index 5a56ad2ad..32539b251 100644 --- a/app/util/api/jira_clients.py +++ b/app/util/api/jira_clients.py @@ -1,5 +1,7 @@ import json import string +import time + from selenium.common.exceptions import WebDriverException from util.api.abstract_clients import RestClient @@ -207,7 +209,7 @@ def get_system_info_page(self): 'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa', 'webSudoIsPost': False, 'webSudoPassword': self.password - } + } tsv_login_body = {"username": self.user, "password": self.password, "rememberMe": "True", @@ -224,8 +226,14 @@ def get_system_info_page(self): else: self.post(login_url, error_msg='Could not login in') auth_body['atl_token'] = self.session.cookies.get_dict()['atlassian.xsrf.token'] - system_info_html = self.session.post(auth_url, data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, verify=self.verify) - return system_info_html.content.decode("utf-8") + number_of_attempts = 5 + for _ in range(0, number_of_attempts): + system_info_html = self.session.post(auth_url, data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, verify=self.verify) + if system_info_html.status_code == 200: + return system_info_html.content.decode("utf-8") + time.sleep(1) + print(f"ERROR: Could not get the system information page.") + return "" def get_available_processors(self): try: From 8a6ef2ad946f3ea5f76d3a07c44ee8726db4421c Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 22 Jul 2025 10:41:52 +0300 Subject: [PATCH 322/765] remove typo --- app/util/api/jira_clients.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/api/jira_clients.py b/app/util/api/jira_clients.py index 32539b251..9ed026169 100644 --- a/app/util/api/jira_clients.py +++ b/app/util/api/jira_clients.py @@ -209,7 +209,7 @@ def get_system_info_page(self): 'webSudoDestination': '/secure/admin/ViewSystemInfo.jspa', 'webSudoIsPost': False, 'webSudoPassword': self.password - } + } tsv_login_body = {"username": self.user, "password": self.password, "rememberMe": "True", From a55acc194ae46554376b73d86d49619bbb9f88d6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Jul 2025 07:00:58 +0200 Subject: [PATCH 323/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 741caf7fd..051a39e0f 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0a987308d08c43ac5e8a5ba72a0c8d3d736decd5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Jul 2025 07:00:59 +0200 Subject: [PATCH 324/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 92f05214a..5425f8717 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From d0929df2c735ca08365bfdf0a3fe8aa5d796e6a6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Jul 2025 07:01:00 +0200 Subject: [PATCH 325/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 6c282d303..6a55aeb45 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9ff107e1d599fdf07873225bdda9f135dd0743a0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Jul 2025 07:01:00 +0200 Subject: [PATCH 326/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 306d0541e..8d25b2b63 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b7accf35aadf2e3923dc39a01f302c9f163872e5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 23 Jul 2025 07:01:01 +0200 Subject: [PATCH 327/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index d452b440f..2d83505aa 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.157" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 50cd1f702a74406c9a76b5dc4c3c158a6a5a774f Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Mon, 4 Aug 2025 15:57:52 +0200 Subject: [PATCH 328/765] Confluence: add retry and error handling locig for get java version --- app/util/analytics/application_info.py | 11 +++++++---- app/util/api/confluence_clients.py | 18 +++++++++++++----- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/util/analytics/application_info.py b/app/util/analytics/application_info.py index 389ced7fa..d6fc46928 100644 --- a/app/util/analytics/application_info.py +++ b/app/util/analytics/application_info.py @@ -153,10 +153,13 @@ def dataset_information(self): @property def java_version(self): - full_system_info = self.client.get_system_info_page() - java_versions_parsed = html.fromstring(full_system_info).xpath('//*[contains(@id, "java.version")]') - if java_versions_parsed: - return java_versions_parsed[0].text + try: + full_system_info = self.client.get_system_info_page() + java_versions_parsed = html.fromstring(full_system_info).xpath('//*[contains(@id, "java.version")]') + if java_versions_parsed: + return java_versions_parsed[0].text + except Exception as e: + print(f'ERROR: Could not get the Java version. Error: {e}') return None @property diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py index 13bccdc20..b6308191c 100644 --- a/app/util/api/confluence_clients.py +++ b/app/util/api/confluence_clients.py @@ -190,6 +190,7 @@ def get_groups_membership(self, username): groups = [group['name'] for group in response.json()['results']] return groups + @retry() def get_system_info_page(self): login_url = f'{self.host}/dologin.action' auth_url = f'{self.host}/doauthenticate.action' @@ -220,7 +221,11 @@ def get_system_info_page(self): self.session.post(url=tsv_auth_url, json=tsv_login_body) system_info_html = self.session.post(url=auth_url, data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, verify=self.verify) - return system_info_html.content.decode("utf-8") + page_decoded = system_info_html.content.decode("utf-8") + if page_decoded: + return page_decoded + else: + raise Exception(f"ERROR: System info page is empty. Content: {page_decoded}") def get_installed_apps(self): plugins_url = f'{self.host}/rest/plugins/1.0/' @@ -230,10 +235,13 @@ def get_installed_apps(self): def get_deployment_type(self): - html_pattern = 'deployment=terraform' - confluence_system_page = self.get_system_info_page() - if confluence_system_page.count(html_pattern): - return 'terraform' + try: + html_pattern = 'deployment=terraform' + confluence_system_page = self.get_system_info_page() + if confluence_system_page.count(html_pattern): + return 'terraform' + except Exception as e: + print(f"Warning: Could not get deployment type. Error: {e}") return 'other' def get_node_ip(self, node_id: str) -> str: From 41352f8578236cc869808c45e841f8033c52c32e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Aug 2025 07:01:05 +0200 Subject: [PATCH 329/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 051a39e0f..f262ce4bd 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bd90b5808631cafa611abe9e643513d96759123f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Aug 2025 07:01:06 +0200 Subject: [PATCH 330/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 5425f8717..a25581f35 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From df9ceea6f2277b715a732c49ac6ef4294ab4b3cb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Aug 2025 07:01:07 +0200 Subject: [PATCH 331/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 6a55aeb45..9e7ba08f6 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From feeb1884cc679daef5b9cd139576f44f308c4674 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Aug 2025 07:01:07 +0200 Subject: [PATCH 332/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 8d25b2b63..9830dab38 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c9ebabcde486a3bc22b3327327fda43fed615fe6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 6 Aug 2025 07:01:08 +0200 Subject: [PATCH 333/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 2d83505aa..3ea34b795 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "138.0.7204.168" # Supports Chrome version 138. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6f905ea8493cd30d0fd0a83d7bfb66386f32c65a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 11 Aug 2025 13:02:28 +0200 Subject: [PATCH 334/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index d4a238d63..2d206320b 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -110,6 +110,41 @@ ] } ] + }, + { + "version": "10.3.9", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-017509fc50eb04768", + "us-east-1": "snap-0ab4bdd491986fc89" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-9" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0f2bee7936a2ca5be", + "us-east-1": "snap-06b970d58c3c7fb84" + } + ] + } + ] } ] }, From 4a3738bc3008e050af0039ded174c32c0616c1f9 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Tue, 12 Aug 2025 18:06:42 +0200 Subject: [PATCH 335/765] Bump TF version tag to 2.9.9 --- app/util/k8s/README.MD | 24 +++++++++---------- ...s-performance-toolkit-user-guide-bamboo.md | 8 +++---- ...erformance-toolkit-user-guide-bitbucket.md | 16 ++++++------- ...rformance-toolkit-user-guide-confluence.md | 16 ++++++------- ...ps-performance-toolkit-user-guide-crowd.md | 14 +++++------ ...pps-performance-toolkit-user-guide-jira.md | 16 ++++++------- ...apps-performance-toolkit-user-guide-jsm.md | 16 ++++++------- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/app/util/k8s/README.MD b/app/util/k8s/README.MD index 77851ef5a..4ce563eff 100644 --- a/app/util/k8s/README.MD +++ b/app/util/k8s/README.MD @@ -32,7 +32,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` ### Terminate development environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -44,7 +44,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.8 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.9 ./uninstall.sh -c conf.tfvars ``` # Enterprise-scale environment @@ -61,7 +61,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` ### Terminate enterprise-scale environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -73,7 +73,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.8 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.9 ./uninstall.sh -c conf.tfvars ``` # Collect detailed k8s logs @@ -93,7 +93,7 @@ export REGION=us-east-2 docker run --pull=always --env-file aws_envs \ -v "/$PWD/k8s_logs:/data-center-terraform/k8s_logs" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.8 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs +-it atlassianlabs/terraform:2.9.9 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs ``` # Force terminate cluster @@ -126,7 +126,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.8 bash + -it atlassianlabs/terraform:2.9.9 bash ``` 5. Connect to the product pod. Example below for jira pod with number 0. For other product or pod number change `PRODUCT_POD` accordingly. @@ -150,7 +150,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ - -it atlassianlabs/terraform:2.9.8 bash + -it atlassianlabs/terraform:2.9.9 bash ``` 5. Copy code base and connect to the execution environment pod: ``` bash @@ -178,7 +178,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e REGION=$REGION \ -e PRODUCT=$PRODUCT \ -v "/$PWD/script-runner.yml:/data-center-terraform/script-runner.yml" \ - -it atlassianlabs/terraform:2.9.8 bash + -it atlassianlabs/terraform:2.9.9 bash ``` 5. Run following commands one by one inside docker container: ``` bash @@ -206,7 +206,7 @@ To enable detailed CPU/Memory monitoring and Grafana dashboards for visualisatio docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.8 bash + -it atlassianlabs/terraform:2.9.9 bash ``` ``` bash aws eks update-kubeconfig --name atlas-$ENVIRONMENT_NAME-cluster --region $REGION @@ -242,7 +242,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml ``` # Retry to copy run results from the execution environment pod to local @@ -259,7 +259,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/copy_run_results.sh:/data-center-terraform/copy_run_results.sh" \ - -it atlassianlabs/terraform:2.9.8 bash copy_run_results.sh + -it atlassianlabs/terraform:2.9.9 bash copy_run_results.sh ``` # Debug AWS required policies @@ -268,7 +268,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n 3. Start and ssh to `atlassianlabs/terraform` docker container: ``` bash docker run --pull=always --env-file aws_envs \ - -it atlassianlabs/terraform:2.9.8 bash + -it atlassianlabs/terraform:2.9.9 bash ``` 4. Make sure you have IAM policies with names `policy1`, `policy2`, created from [policy1.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy1.json) and [policy2.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy2.json). 5. Run following commands one by one inside docker container to get effective policies permissions: diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 7caf7b65d..f0ef1da56 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -102,7 +102,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. @@ -303,7 +303,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -334,7 +334,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -368,7 +368,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index a4182446b..99876d6b2 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -115,7 +115,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -319,7 +319,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -394,7 +394,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -425,7 +425,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -475,7 +475,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -500,7 +500,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -513,7 +513,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -542,7 +542,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index e4fa2a391..205f10a34 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -474,7 +474,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -504,7 +504,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 9d4672119..722f22e4c 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -97,7 +97,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -208,7 +208,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -237,7 +237,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -296,7 +296,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -320,7 +320,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -347,7 +347,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -390,7 +390,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 843c2a0fb..ef406ce15 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -122,7 +122,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -423,7 +423,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -498,7 +498,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -550,7 +550,7 @@ The re-index time for Jira is about ~50-70 minutes. -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -636,7 +636,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -649,7 +649,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -678,7 +678,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 23ce967c9..f176a4f34 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -124,7 +124,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -459,7 +459,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -539,7 +539,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -594,7 +594,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -679,7 +679,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.8 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -692,7 +692,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -721,7 +721,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.8 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From 67b6dc6f51352d64039cc091d2adf6195adabf01 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Aug 2025 07:00:57 +0200 Subject: [PATCH 336/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f262ce4bd..3ad6e04a1 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4a36225493673912142ffc5d5146ecbe34c09227 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Aug 2025 07:00:58 +0200 Subject: [PATCH 337/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index a25581f35..988c67058 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ac1d89c67d2a42986c4c5a4c1e363577f586b857 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Aug 2025 07:00:59 +0200 Subject: [PATCH 338/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 9e7ba08f6..c6d9587b6 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c5db954da6bc91f8425d480febbfbf0b4d514667 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Aug 2025 07:00:59 +0200 Subject: [PATCH 339/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 9830dab38..2feec2be5 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 03ce904a3b6d891c6e8b1cfae4a82723a03a38be Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Aug 2025 07:01:00 +0200 Subject: [PATCH 340/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 3ea34b795..335a37bcd 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.66" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1465fd9ed17189f00ec82502823ae299b42005cb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 13 Aug 2025 11:25:01 +0200 Subject: [PATCH 341/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 2d206320b..a9c2c3138 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -143,6 +143,26 @@ "us-east-1": "snap-06b970d58c3c7fb84" } ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0e5f3f4eb9af010a7", + "us-east-1": "snap-0122ce86b761b0da6" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-3-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-9" + } + ] } ] } From 880d34b2e1e7b1e51d5ac0ad8b364f5be62fbee4 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 13 Aug 2025 14:26:15 +0200 Subject: [PATCH 342/765] DCA-2517 Update bamboo version to 10.2.7 --- README.md | 2 +- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- app/util/k8s/dcapt.tfvars | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 145d6d22b..01624255a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.3.0` * Supported Bamboo versions: - * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.2` + * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.7` ## Support In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 441b05c5e..a8bb555ec 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 10.2.2 + 10.2.7 diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index e0f679dce..db69d153e 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -399,8 +399,8 @@ crowd_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] # By default, latest supported by DCAPT version is set. # https://hub.docker.com/r/atlassian/bamboo/tags # https://hub.docker.com/r/atlassian/bamboo-agent-base/tags -bamboo_version_tag = "10.2.2" -bamboo_agent_version_tag = "10.2.2" +bamboo_version_tag = "10.2.7" +bamboo_agent_version_tag = "10.2.7" # Helm chart version of Bamboo and Bamboo agent instances # bamboo_helm_chart_version = "" @@ -461,7 +461,7 @@ bamboo_nfs_limits_memory = "2Gi" # Documentation can be found via: # https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.DBInstanceClass.html # https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS -bamboo_db_major_engine_version = "14" +bamboo_db_major_engine_version = "16" bamboo_db_instance_class = "db.t3.medium" bamboo_db_allocated_storage = 100 bamboo_db_iops = 1000 From 17b1acd6b557acf8e7878b8987135d2e8076c60c Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 13 Aug 2025 15:08:55 +0200 Subject: [PATCH 343/765] Bump pom.xml dependencies for Bamboo dataset generator for version 10.2.7 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 441b05c5e..38dd167aa 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -18,7 +18,7 @@ org.codehaus.mojo exec-maven-plugin - 3.5.0 + 3.5.1 @@ -62,17 +62,17 @@ com.google.guava guava - 33.4.7-android + 33.4.8-jre com.fasterxml.jackson.core jackson-core - 2.18.3 + 2.19.2 com.fasterxml.jackson.core jackson-databind - 2.18.3 + 2.19.2 com.jayway.jsonpath @@ -124,4 +124,4 @@ https://packages.atlassian.com/mvn/maven-external/ - \ No newline at end of file + From 071e2fb91d8d86474fdece7e6b27f78f0d403fd9 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Thu, 14 Aug 2025 15:21:58 +0300 Subject: [PATCH 344/765] confluence/bitbucket/add-new-versions-support --- README.md | 4 +- app/util/k8s/dcapt-small.tfvars | 4 +- app/util/k8s/dcapt-snapshots.json | 124 ++++++++++++++++++++++-------- app/util/k8s/dcapt.tfvars | 4 +- 4 files changed, 96 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 01624255a..2ca5fbccf 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,10 @@ 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): `5.12.19` and `10.3.4` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.20` and `9.2.2` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.25`, `9.2.7` and `10.0.2` Platform release * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.16` and `9.4.4` + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21` and `9.4.9` * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.3.0` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index a68c14881..91cdf7eea 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -161,7 +161,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "9.2.2" +confluence_version_tag = "9.2.7" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "small" @@ -238,7 +238,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "9.4.4" +bitbucket_version_tag = "9.4.9" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a9c2c3138..116497c7b 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -285,7 +285,7 @@ "confluence": { "versions": [ { - "version": "8.5.20", + "version": "10.0.2", "data": [ { "type": "ebs", @@ -302,8 +302,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-20", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-20" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-0-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-2" } ] }, @@ -322,8 +322,64 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-20", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-20" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-0-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-0-2" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0fc33474a6932eef4", + "us-east-1": "snap-088774c9ef2b58e6a" + } + ] + } + ], + "build_number": "9304" + }, + { + "version": "8.5.25", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-09f3d45f0666c5113", + "us-east-1": "snap-0fcb8d0279ce0fdca" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-25", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-25" + } + ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0267a462e98ffdaec", + "us-east-1": "snap-0c7c80285157c1fe1" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-25", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-25" } ] }, @@ -341,15 +397,15 @@ "build_number": "9012" }, { - "version": "9.2.2", + "version": "9.2.7", "data": [ { "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "snap-0cd3a211ef6d9c1d4", - "us-east-1": "snap-08552ebe7c3185082" + "us-east-2": "snap-03e57c101b20ed9d3", + "us-east-1": "snap-06abd6daddb85ddda" } ] }, @@ -358,8 +414,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-2", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-2" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-7", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-7" } ] }, @@ -368,8 +424,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-03b8437f931e28c57", - "us-east-1": "snap-0fd19ad39c99d286f" + "us-east-2": "snap-0bc9a48fd61f74d3a", + "us-east-1": "snap-060fd8cc29bddccf3" } ] }, @@ -378,8 +434,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-2", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-2" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-7", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-7" } ] }, @@ -388,8 +444,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0af55f20a2333c8a9", - "us-east-1": "snap-074976ace4598a845" + "us-east-2": "snap-01bdd9c9fc5523492", + "us-east-1": "snap-0be4fdf8be3458f66" } ] } @@ -401,15 +457,15 @@ "bitbucket": { "versions": [ { - "version": "8.19.16", + "version": "8.19.21", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-0c998f2ea96338661", - "us-east-1": "snap-047820fee3a1294ff" + "us-east-2": "snap-0f580b0d5fd40147d", + "us-east-1": "snap-02cc4ee1bc0619cce" } ] }, @@ -418,8 +474,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-19-16", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-19-16" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-19-21", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-19-21" } ] }, @@ -428,8 +484,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-0cc8510ddf52843bc", - "us-east-1": "snap-005a89805387fa383" + "us-east-2": "snap-05e1f7ce5dd96366f", + "us-east-1": "snap-00459b2652e4b80a7" } ] }, @@ -438,23 +494,23 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-16", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-16" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-21", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-21" } ] } ] }, { - "version": "9.4.4", + "version": "9.4.9", "data": [ { "type": "ebs", "size": "large", "snapshots": [ { - "us-east-2": "snap-0112fed8bf6866bc0", - "us-east-1": "snap-0344ae06684ba0b37" + "us-east-2": "snap-0ee236de97b56c8d2", + "us-east-1": "snap-07f51188c754cd6a4" } ] }, @@ -463,8 +519,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-4-4", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-4-4" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-4-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-4-9" } ] }, @@ -473,8 +529,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-0530f70c6916d8329", - "us-east-1": "snap-0c4e784a1acf30043" + "us-east-2": "snap-07aff525deaffc951", + "us-east-1": "snap-077ad693ccb14d246" } ] }, @@ -483,8 +539,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-9-4-4", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-4-4" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-9-4-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-4-9" } ] } diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index db69d153e..db7e508da 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -172,7 +172,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "9.2.2" +confluence_version_tag = "9.2.7" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "large" @@ -247,7 +247,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "9.4.4" +bitbucket_version_tag = "9.4.9" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "large" From cdadd2aceddcdf856e999a6b27edc883a75de01b Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 14 Aug 2025 14:51:03 +0200 Subject: [PATCH 345/765] Add new codeowners --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index c4a79c422..1d40e0d8e 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ # Default code owners - Atlassian Data Center App Performance Toolkit -* @ometelytsia @SergeyMoroz0703 @OlehStefanyshyn \ No newline at end of file +* @vkavalenka80 @bgospodarek @ometelytsia @SergeyMoroz0703 @OlehStefanyshyn From 6a6522a571d159c924dca065e082aaa92e147d2d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Aug 2025 09:57:50 +0000 Subject: [PATCH 346/765] Update dependency net.minidev:json-smart to v2.6.0 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 21bea776b..84d8df586 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -82,7 +82,7 @@ net.minidev json-smart - 2.5.2 + 2.6.0 org.slf4j From 295e0a28e1990689ab2b5eaf3fd40af52677a5a9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 18 Aug 2025 13:00:17 +0200 Subject: [PATCH 347/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a9c2c3138..7899b3f03 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -165,6 +165,41 @@ ] } ] + }, + { + "version": "9.12.26", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0b99312d8354fc853", + "us-east-1": "snap-0d81511fb2c645f74" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-12-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-12-26" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-07f68bc00441fa20a", + "us-east-1": "snap-02a9d5de2688b445a" + } + ] + } + ] } ] }, From 0bbe5d81bb3383f1e304060cb4b83212f308b415 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 19 Aug 2025 11:33:56 +0200 Subject: [PATCH 348/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 7899b3f03..12db6a738 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -198,6 +198,26 @@ "us-east-1": "snap-02a9d5de2688b445a" } ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0eed11018011eb7cf", + "us-east-1": "snap-092a7493cb4f7d380" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-12-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-26" + } + ] } ] } From 1df93f4706851bf074e32f8b4e05007812caf142 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 19 Aug 2025 16:08:08 +0200 Subject: [PATCH 349/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 12db6a738..9f7669435 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -574,6 +574,32 @@ } ], "build_number": "2301" + }, + { + "version": "6.3.2", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0b760f603881646fd", + "us-east-1": "snap-02dcb0c3f5bbc74c8" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-6-3-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-6-3-2" + } + ] + } + ], + "build_number": "2303" } ] } From 19b2f96f9d26d433e0a4a656f8be832612a5507a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Aug 2025 07:00:55 +0200 Subject: [PATCH 350/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 3ad6e04a1..310b21b37 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 24b86b89eb3105d25fb2b7a2cf35eeb43fe389ef Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Aug 2025 07:00:55 +0200 Subject: [PATCH 351/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 988c67058..cba8157bd 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a58a1e13c87bbe137cba1abbfb5e64bb5ba46ebc Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Aug 2025 07:00:56 +0200 Subject: [PATCH 352/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index c6d9587b6..f19d77673 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 27e5d57d80d4ef3023acf02ac1896c388a1b34da Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Aug 2025 07:00:56 +0200 Subject: [PATCH 353/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 2feec2be5..a529ee1a8 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From efeb9226af72252d5e4eaa345204a595c0b75540 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Aug 2025 07:00:57 +0200 Subject: [PATCH 354/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 335a37bcd..03bab4c80 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.68" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 27536cc6f026f6fee00fa9cffb6c4230a3ce7f35 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Aug 2025 11:05:45 +0200 Subject: [PATCH 355/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 9f7669435..eef985b16 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -334,6 +334,41 @@ ] } ] + }, + { + "version": "10.3.9", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0fbc03b69327c51b4", + "us-east-1": "snap-0b9c78d0b9fb6c5fd" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-9" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0a9cb888a9aca87f4", + "us-east-1": "snap-082d1560579871677" + } + ] + } + ] } ] }, From 812f9ccce3bca686b8d3fb2d336b5cbc2c9bcece Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Aug 2025 11:43:25 +0200 Subject: [PATCH 356/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index eef985b16..210fad312 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -367,6 +367,26 @@ "us-east-1": "snap-082d1560579871677" } ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-05c6a9371e9bb9079", + "us-east-1": "snap-0b57dd1344a288bdf" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-9" + } + ] } ] } From 83c1c69b5bf0be66a8a6ba88032a5a98ff4ece7d Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 20 Aug 2025 12:55:19 +0200 Subject: [PATCH 357/765] Bump crowd version to 6.3.2 --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 26 -------------------------- app/util/k8s/dcapt.tfvars | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 01624255a..6b1b2cc48 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.16` and `9.4.4` * Supported Crowd versions: - * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.3.0` + * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.3.2` * Supported Bamboo versions: * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.7` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index eef985b16..3d50cdad5 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -584,32 +584,6 @@ }, "crowd": { "versions": [ - { - "version": "6.3.0", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0938248bec3bb51bb", - "us-east-1": "snap-057e8e2c67fc25793" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-6-3-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-6-3-0" - } - ] - } - ], - "build_number": "2301" - }, { "version": "6.3.2", "data": [ diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index db69d153e..88b46e8ef 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -335,7 +335,7 @@ bitbucket_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -crowd_version_tag = "6.3.0" +crowd_version_tag = "6.3.2" # Helm chart version of Crowd and Crowd agent instances. By default the latest version is installed. # crowd_helm_chart_version = "" From 5b957cc6d9db2441469d917f4f489572c5fa53ea Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 20 Aug 2025 17:02:39 +0200 Subject: [PATCH 358/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a3e19f84f..4a2c992a5 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -389,6 +389,41 @@ ] } ] + }, + { + "version": "5.12.26", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-05fd357062cce59d1", + "us-east-1": "snap-0bc2c6d39c0048735" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-12-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-12-26" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-00fab858d38d6f877", + "us-east-1": "snap-0647afe4f1b860e71" + } + ] + } + ] } ] }, From f70deb4bc4d90959a2871f6f774f959cd553f338 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 21 Aug 2025 12:35:23 +0200 Subject: [PATCH 359/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 4a2c992a5..87869ea3c 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -422,6 +422,26 @@ "us-east-1": "snap-0647afe4f1b860e71" } ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-01a774af37a46ffd1", + "us-east-1": "snap-0b3331407d7770056" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-12-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-26" + } + ] } ] } From 5578700a6dfb6f99f09e56b43e6bc9ff1c129093 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 21 Aug 2025 16:13:06 +0200 Subject: [PATCH 360/765] bump tf version tag 2.9.10 --- app/util/k8s/README.MD | 24 +++++++++---------- ...s-performance-toolkit-user-guide-bamboo.md | 8 +++---- ...erformance-toolkit-user-guide-bitbucket.md | 16 ++++++------- ...rformance-toolkit-user-guide-confluence.md | 16 ++++++------- ...ps-performance-toolkit-user-guide-crowd.md | 14 +++++------ ...pps-performance-toolkit-user-guide-jira.md | 16 ++++++------- ...apps-performance-toolkit-user-guide-jsm.md | 16 ++++++------- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/app/util/k8s/README.MD b/app/util/k8s/README.MD index 4ce563eff..791d3fa1a 100644 --- a/app/util/k8s/README.MD +++ b/app/util/k8s/README.MD @@ -32,7 +32,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` ### Terminate development environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -44,7 +44,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.9 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.10 ./uninstall.sh -c conf.tfvars ``` # Enterprise-scale environment @@ -61,7 +61,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` ### Terminate enterprise-scale environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -73,7 +73,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.9 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.10 ./uninstall.sh -c conf.tfvars ``` # Collect detailed k8s logs @@ -93,7 +93,7 @@ export REGION=us-east-2 docker run --pull=always --env-file aws_envs \ -v "/$PWD/k8s_logs:/data-center-terraform/k8s_logs" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.9.9 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs +-it atlassianlabs/terraform:2.9.10 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs ``` # Force terminate cluster @@ -126,7 +126,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.9 bash + -it atlassianlabs/terraform:2.9.10 bash ``` 5. Connect to the product pod. Example below for jira pod with number 0. For other product or pod number change `PRODUCT_POD` accordingly. @@ -150,7 +150,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ - -it atlassianlabs/terraform:2.9.9 bash + -it atlassianlabs/terraform:2.9.10 bash ``` 5. Copy code base and connect to the execution environment pod: ``` bash @@ -178,7 +178,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e REGION=$REGION \ -e PRODUCT=$PRODUCT \ -v "/$PWD/script-runner.yml:/data-center-terraform/script-runner.yml" \ - -it atlassianlabs/terraform:2.9.9 bash + -it atlassianlabs/terraform:2.9.10 bash ``` 5. Run following commands one by one inside docker container: ``` bash @@ -206,7 +206,7 @@ To enable detailed CPU/Memory monitoring and Grafana dashboards for visualisatio docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.9.9 bash + -it atlassianlabs/terraform:2.9.10 bash ``` ``` bash aws eks update-kubeconfig --name atlas-$ENVIRONMENT_NAME-cluster --region $REGION @@ -242,7 +242,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml ``` # Retry to copy run results from the execution environment pod to local @@ -259,7 +259,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/copy_run_results.sh:/data-center-terraform/copy_run_results.sh" \ - -it atlassianlabs/terraform:2.9.9 bash copy_run_results.sh + -it atlassianlabs/terraform:2.9.10 bash copy_run_results.sh ``` # Debug AWS required policies @@ -268,7 +268,7 @@ Note: this option is **not** suitable for full-scale performance runs as local n 3. Start and ssh to `atlassianlabs/terraform` docker container: ``` bash docker run --pull=always --env-file aws_envs \ - -it atlassianlabs/terraform:2.9.9 bash + -it atlassianlabs/terraform:2.9.10 bash ``` 4. Make sure you have IAM policies with names `policy1`, `policy2`, created from [policy1.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy1.json) and [policy2.json](https://github.com/atlassian-labs/data-center-terraform/blob/main/permissions/policy2.json). 5. Run following commands one by one inside docker container to get effective policies permissions: diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index f0ef1da56..c61f42ce6 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -102,7 +102,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. @@ -303,7 +303,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -334,7 +334,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -368,7 +368,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 99876d6b2..7e47bb4e8 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -115,7 +115,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -319,7 +319,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -394,7 +394,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -425,7 +425,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -475,7 +475,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -500,7 +500,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -513,7 +513,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -542,7 +542,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index 205f10a34..ba5583147 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -474,7 +474,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -504,7 +504,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 722f22e4c..c61b37127 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -97,7 +97,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -208,7 +208,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -237,7 +237,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -296,7 +296,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -320,7 +320,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -347,7 +347,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -390,7 +390,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index ef406ce15..fba0846c0 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -122,7 +122,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -423,7 +423,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -498,7 +498,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -550,7 +550,7 @@ The re-index time for Jira is about ~50-70 minutes. -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -636,7 +636,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -649,7 +649,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -678,7 +678,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index f176a4f34..4a9865269 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -124,7 +124,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -459,7 +459,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -539,7 +539,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -594,7 +594,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -679,7 +679,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -692,7 +692,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -721,7 +721,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From 366365862a7dd3fe82e243b4659e1455e2b61144 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 22 Aug 2025 10:40:44 +0300 Subject: [PATCH 361/765] update dependencies python 8-8-0 --- requirements.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 499433d30..455f93798 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -matplotlib==3.10.1 -pandas==2.2.3 -pytest==8.3.5 -locust==2.35.0 -selenium==4.31.0 -filelock==3.18.0 -packaging==24.2 +matplotlib==3.10.5 +pandas==2.3.2 +pytest==8.4.1 +locust==2.39.0 +selenium==4.35.0 +filelock==3.19.1 +packaging==25.0 prettytable==3.16.0 bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils -boto3==1.37.30 +boto3==1.40.15 retry==0.9.2 From 8480e22bf58215734f591dae6f8878817d96ca96 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 22 Aug 2025 11:26:48 +0300 Subject: [PATCH 362/765] bump selenium in .yml files --- 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 310b21b37..89dcf76f9 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -51,7 +51,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.31.0 + - selenium==4.35.0 execution: - scenario: jmeter executor: jmeter diff --git a/app/bitbucket.yml b/app/bitbucket.yml index f19d77673..830155c38 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -37,7 +37,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.31.0 + - selenium==4.35.0 execution: - scenario: ${load_executor} concurrency: ${concurrency} diff --git a/app/confluence.yml b/app/confluence.yml index cba8157bd..77f500639 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -52,7 +52,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.31.0 + - selenium==4.35.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jira.yml b/app/jira.yml index a529ee1a8..71aa3da1d 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -52,7 +52,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.31.0 + - selenium==4.35.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jsm.yml b/app/jsm.yml index 03bab4c80..fbdd48b87 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -68,7 +68,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.31.0 + - selenium==4.35.0 execution: - scenario: ${load_executor}_agents executor: ${load_executor} From a3b71a8bc1ad49c3f4f54872267939bf9c7cb42c Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 22 Aug 2025 15:49:06 +0300 Subject: [PATCH 363/765] bump selenium in .yml files --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 455f93798..2f651d30d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ selenium==4.35.0 filelock==3.19.1 packaging==25.0 prettytable==3.16.0 -bzt==1.16.32 # bzt 1.16.34 has pinned setuptools==65.5.0, which does not have distutils +bzt==1.16.45 boto3==1.40.15 retry==0.9.2 From bc7376567f29ba8cbf4e1a3a7d6a166d7301a7d1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 12:50:48 +0000 Subject: [PATCH 364/765] Update log4j2 monorepo to v2.25.1 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 84d8df586..0e877105a 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -97,17 +97,17 @@ org.apache.logging.log4j log4j-api - 2.24.3 + 2.25.1 org.apache.logging.log4j log4j-core - 2.24.3 + 2.25.1 org.apache.logging.log4j log4j-slf4j-impl - 2.24.3 + 2.25.1 From 249d5d08bb7761739bd795f4420901b6eaf667b4 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 22 Aug 2025 18:20:07 +0300 Subject: [PATCH 365/765] added jira-jsm versions to docs --- README.md | 4 ++-- app/util/k8s/dcapt-small.tfvars | 4 ++-- app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6b1b2cc48..d823425a2 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): `9.12.19` and `10.3.4` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.26` and `10.3.9` * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.19` and `10.3.4` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.26` and `10.3.9` * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.20` and `9.2.2` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index a68c14881..5f18cbc39 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -89,10 +89,10 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version. -jira_version_tag = "10.3.4" +jira_version_tag = "10.3.9" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "10.3.4" +# jira_version_tag = "10.3.9" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large jira_dataset_size = "small" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 88b46e8ef..726d8e602 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -110,11 +110,11 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version -jira_version_tag = "10.3.4" +jira_version_tag = "10.3.9" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "10.3.4" +# jira_version_tag = "10.3.9" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large. jira_dataset_size = "large" From bdf70bb8934e748601c5d4886d61f112f438b3bc Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 25 Aug 2025 02:14:46 +0300 Subject: [PATCH 366/765] upd conf 10 snapshots --- app/util/k8s/dcapt-snapshots.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 116497c7b..b70e26f63 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -292,8 +292,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-025ed06e325f3e993", - "us-east-1": "snap-0dc4fe5e05d41b342" + "us-east-2": "snap-0c6d4d8802c48f433", + "us-east-1": "snap-00287c6466d81be94" } ] }, @@ -312,8 +312,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0267a462e98ffdaec", - "us-east-1": "snap-0c7c80285157c1fe1" + "us-east-2": "snap-0af92e32632eb2500", + "us-east-1": "snap-0ac6fd59413cb71ed" } ] }, @@ -332,8 +332,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0fc33474a6932eef4", - "us-east-1": "snap-088774c9ef2b58e6a" + "us-east-2": "snap-08439439376d2afb1", + "us-east-1": "snap-09f9176f7485f9db2" } ] } @@ -450,7 +450,7 @@ ] } ], - "build_number": "9109" + "build_number": "9111" } ] }, From 123d8a7be36e28140f2ffe30b810fcafbb6ed37b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Aug 2025 08:52:08 +0000 Subject: [PATCH 367/765] Update dependency boto3 to v1.40.16 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2f651d30d..263f2777c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ filelock==3.19.1 packaging==25.0 prettytable==3.16.0 bzt==1.16.45 -boto3==1.40.15 +boto3==1.40.16 retry==0.9.2 From 528b36d5b51b7a93e9715cacd89b48a5758994c6 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 25 Aug 2025 11:53:59 +0300 Subject: [PATCH 368/765] remove previous jira-jsm versions --- app/util/k8s/dcapt-snapshots.json | 220 ------------------------------ 1 file changed, 220 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 59d3a4389..20853a33d 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -1,116 +1,6 @@ { "jira": { "versions": [ - { - "version": "10.3.4", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-084486021b02f0ef8", - "us-east-1": "snap-067a84324533ad5a2" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-4", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-4" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-09d056fb9ec6fb35b", - "us-east-1": "snap-0039fe4e0fa3461f9" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0a2e612a8f11232ef", - "us-east-1": "snap-061764b1ef2681388" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-3-4", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-4" - } - ] - } - ] - }, - { - "version": "9.12.19", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0fea6811c2f497082", - "us-east-1": "snap-0411cd2d1390040b4" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-12-19", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-12-19" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-05730c109aadccabf", - "us-east-1": "snap-076529679e89c43f4" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-02fc7b1de3e444d6e", - "us-east-1": "snap-0c4f2b2cc58e2ca64" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-12-19", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-19" - } - ] - } - ] - }, { "version": "10.3.9", "data": [ @@ -225,116 +115,6 @@ }, "jsm": { "versions": [ - { - "version": "10.3.4", - "data": [ - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0feb610e3f8837536", - "us-east-1": "snap-06b06c30c3f6d3fd5" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-017366c26d67a868e", - "us-east-1": "snap-0605f8d83017dee68" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-4", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-4" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-09d1a3aae5d18957b", - "us-east-1": "snap-04236bd26d6533992" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-4", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-4" - } - ] - } - ] - }, - { - "version": "5.12.19", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0e7a06bb82dd1d420", - "us-east-1": "snap-0b5e70a3d15389b83" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-12-19", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-12-19" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-063549033fee34aba", - "us-east-1": "snap-0b0d5e9364de611c5" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-027bac6ece3a628a9", - "us-east-1": "snap-0b73b2ff6800a1ca4" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-12-19", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-19" - } - ] - } - ] - }, { "version": "10.3.9", "data": [ From 1da378b6e5d096b408778045adab5803049f9384 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 26 Aug 2025 12:22:52 +0300 Subject: [PATCH 369/765] fix logic for downloading jmeter plugins on docker build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28210ab84..54fa11430 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt -RUN if [ "$INCLUDE_BZT" = "true" ]; then \ +RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \ tar -xzf /tmp/bzt.tar.gz -C /root && \ rm /tmp/bzt.tar.gz; \ From aa0b0e8cf26dac66b8c504c1127b6bee3bafd217 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 26 Aug 2025 15:05:48 +0300 Subject: [PATCH 370/765] use aws s3 cli instead of wget --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 54fa11430..beb32d18f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ - wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \ + aws s3 cp s3://blazemeter-tools/bzt.tar.gz /tmp/bzt.tar.gz && \ tar -xzf /tmp/bzt.tar.gz -C /root && \ rm /tmp/bzt.tar.gz; \ fi From c3c98349edea016f1434b4045937c94219ac2e19 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 26 Aug 2025 15:29:16 +0300 Subject: [PATCH 371/765] use aws s3 cli instead of wget --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index beb32d18f..402f328cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_c ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb" RUN apt-get -y update \ - && $APT_INSTALL vim git openssh-server wget \ + && $APT_INSTALL vim git openssh-server wget awscli\ && python -m pip install --upgrade pip \ && apt-get clean From fed6184af48c26ce2e13c0bf64276dc4bc6c6f5a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 27 Aug 2025 07:01:00 +0200 Subject: [PATCH 372/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 89dcf76f9..3565ed219 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a9573bc4f2fc1f5686ebbc5c9af9d8f46873edef Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 27 Aug 2025 07:01:01 +0200 Subject: [PATCH 373/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 77f500639..fef50be74 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8946d379b64838c0a932861b55f2f9e57e3e5cf0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 27 Aug 2025 07:01:01 +0200 Subject: [PATCH 374/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 830155c38..27479bd56 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1d400c68d01c73024aa454fe53af34cd4a5804d5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 27 Aug 2025 07:01:02 +0200 Subject: [PATCH 375/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 71aa3da1d..118d455e9 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a7e6d75c6bbd5cf3ca4a4f2b2540db94450fdbdf Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 27 Aug 2025 07:01:03 +0200 Subject: [PATCH 376/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index fbdd48b87..e532ca8b1 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.138" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 54d2b86f71168ecb7405af521e50889be39a74c6 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 10:27:43 +0300 Subject: [PATCH 377/765] use local download --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 402f328cf..080708c9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ - aws s3 cp s3://blazemeter-tools/bzt.tar.gz /tmp/bzt.tar.gz && \ + COPY bzt.tar.gz /tmp/bzt.tar.gz \ tar -xzf /tmp/bzt.tar.gz -C /root && \ rm /tmp/bzt.tar.gz; \ fi From 659f6cdb9d67a073105782ae57304e19776c8705 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 10:33:13 +0300 Subject: [PATCH 378/765] use local download --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 080708c9b..7b2617697 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ - COPY bzt.tar.gz /tmp/bzt.tar.gz \ + COPY ./bzt.tar.gz /tmp/bzt.tar.gz \ tar -xzf /tmp/bzt.tar.gz -C /root && \ rm /tmp/bzt.tar.gz; \ fi From 5fbea08e15428f35fc31262ab78a4fc6aab601a7 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 11:13:55 +0300 Subject: [PATCH 379/765] use local download --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b2617697..b8e20bb4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,8 +30,9 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt +COPY bzt.tar.* /tmp/bzt.tar.gz + RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ - COPY ./bzt.tar.gz /tmp/bzt.tar.gz \ tar -xzf /tmp/bzt.tar.gz -C /root && \ rm /tmp/bzt.tar.gz; \ fi From 2365d4d68fc66255d38df70b7c222bc3e32f2a26 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 11:18:44 +0300 Subject: [PATCH 380/765] use local download --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b8e20bb4f..77b553a34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt -COPY bzt.tar.* /tmp/bzt.tar.gz +COPY bzt.tar.gz* /tmp/bzt.tar.gz RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ tar -xzf /tmp/bzt.tar.gz -C /root && \ From a874d86f7b1407875cf1f59948a1697d25380ef2 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 11:19:50 +0300 Subject: [PATCH 381/765] use local download --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 77b553a34..76619f2e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt -COPY bzt.tar.gz* /tmp/bzt.tar.gz +COPY bzt.tar.gz* /tmp/ RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ tar -xzf /tmp/bzt.tar.gz -C /root && \ From cb688a9b2ed982fd4d3578b44b549548842ef449 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 11:37:59 +0300 Subject: [PATCH 382/765] use local download --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 76619f2e6..2fc1cdf9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,10 +30,11 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt -COPY bzt.tar.gz* /tmp/ +#COPY bzt.tar.gz* /tmp/ +ADD . /tmp/ RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ - tar -xzf /tmp/bzt.tar.gz -C /root && \ + tar -xzf /tmp/context/bzt.tar.gz -C /root && \ rm /tmp/bzt.tar.gz; \ fi From fe57af1c82e13ce2610e6cd253f81e96ed0393fc Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 11:38:46 +0300 Subject: [PATCH 383/765] use local download --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2fc1cdf9d..d51362ab4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN pip install --no-cache-dir -r /tmp/requirements.txt ADD . /tmp/ RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ - tar -xzf /tmp/context/bzt.tar.gz -C /root && \ + tar -xzf /tmp/bzt.tar.gz -C /root && \ rm /tmp/bzt.tar.gz; \ fi From e52a36e1ca2a76109fc8ab6e568a74c87e3f07c2 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 11:53:23 +0300 Subject: [PATCH 384/765] use local download --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 57e3f8b6f..f2da8af0e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ * !requirements.txt !Dockerfile +!bzt.tar.gz \ No newline at end of file From bc91cf46964a31ded5763fc7c37c720ab5555032 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 12:04:03 +0300 Subject: [PATCH 385/765] replace for ADD --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d51362ab4..1ca33417e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,6 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_ COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt -#COPY bzt.tar.gz* /tmp/ ADD . /tmp/ RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \ From 493a3db3e144c21bdcc1f71a0418556d419e9dff Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 12:04:46 +0300 Subject: [PATCH 386/765] replace for ADD --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1ca33417e..8d3053ca9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_c ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb" RUN apt-get -y update \ - && $APT_INSTALL vim git openssh-server wget awscli\ + && $APT_INSTALL vim git openssh-server wget \ && python -m pip install --upgrade pip \ && apt-get clean From ccdfc76b86456e74f821f7c2e318dbb477764f65 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Wed, 27 Aug 2025 12:14:49 +0300 Subject: [PATCH 387/765] confluence/fix-small-indexes --- app/util/k8s/dcapt-snapshots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 20853a33d..d737ec8da 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -237,8 +237,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-0c6d4d8802c48f433", - "us-east-1": "snap-00287c6466d81be94" + "us-east-2": "snap-017dab74a941fbbeb", + "us-east-1": "snap-00f799d439f333af2" } ] }, From f7213525959e2500249bbe18d88b0afde4728615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Wed, 27 Aug 2025 12:32:13 +0200 Subject: [PATCH 388/765] Added error handling if S3 bucket is missing tags --- app/util/k8s/terminate_cluster.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/terminate_cluster.py b/app/util/k8s/terminate_cluster.py index f5522ee18..c281c6535 100644 --- a/app/util/k8s/terminate_cluster.py +++ b/app/util/k8s/terminate_cluster.py @@ -981,7 +981,11 @@ def delete_expired_tf_state_s3_buckets(): for bucket in response["Buckets"]: if bucket_name_template in bucket["Name"]: created_date = bucket["CreationDate"] - tags = s3_client.get_bucket_tagging(Bucket=bucket["Name"])["TagSet"] + try: + tags = s3_client.get_bucket_tagging(Bucket=bucket["Name"])["TagSet"] + except s3_client.exceptions.NoSuchTagSet: + logging.warning(f"S3 bucket {bucket['Name']} does not have any tags.") + continue persist_days = next((tag["Value"] for tag in tags if tag["Key"] == "persist_days"), None) if persist_days: if not is_float(persist_days): @@ -995,7 +999,7 @@ def delete_expired_tf_state_s3_buckets(): logging.info(f"S3 bucket {bucket['Name']} is EOL and should be deleted.") delete_bucket_by_name(s3_client, bucket['Name']) else: - logging.warning(f"S3 bucket {bucket['Name']} does not have tags.") + logging.warning(f"S3 bucket {bucket['Name']} is missing persis_days tag.") def is_policy_attached(policy_arn): From 97e86ff300242298c556ea9f3900e433f0bd80b6 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Aug 2025 16:18:08 +0300 Subject: [PATCH 389/765] added missing bzt pytest packages --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index 263f2777c..61356cd8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,3 +9,5 @@ prettytable==3.16.0 bzt==1.16.45 boto3==1.40.16 retry==0.9.2 +apiritif==1.1.3 +pytest-xdist==3.8.0 \ No newline at end of file From a1d41c8ce5ae3da1ed0c65ab93ce4ef6bc3fe316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Wed, 27 Aug 2025 17:42:12 +0200 Subject: [PATCH 390/765] Changed so that pipeline breaks in case of error. --- app/util/k8s/terminate_cluster.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/util/k8s/terminate_cluster.py b/app/util/k8s/terminate_cluster.py index c281c6535..d3ae7097f 100644 --- a/app/util/k8s/terminate_cluster.py +++ b/app/util/k8s/terminate_cluster.py @@ -984,8 +984,7 @@ def delete_expired_tf_state_s3_buckets(): try: tags = s3_client.get_bucket_tagging(Bucket=bucket["Name"])["TagSet"] except s3_client.exceptions.NoSuchTagSet: - logging.warning(f"S3 bucket {bucket['Name']} does not have any tags.") - continue + raise RuntimeError(f"S3 bucket {bucket['Name']} does not have any tags.") persist_days = next((tag["Value"] for tag in tags if tag["Key"] == "persist_days"), None) if persist_days: if not is_float(persist_days): From 0c92aee1650923660cdb5a4e03b099bae0c33865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Wed, 27 Aug 2025 17:46:02 +0200 Subject: [PATCH 391/765] Added botocore exception to catch --- app/util/k8s/terminate_cluster.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/terminate_cluster.py b/app/util/k8s/terminate_cluster.py index d3ae7097f..98cba885a 100644 --- a/app/util/k8s/terminate_cluster.py +++ b/app/util/k8s/terminate_cluster.py @@ -983,7 +983,7 @@ def delete_expired_tf_state_s3_buckets(): created_date = bucket["CreationDate"] try: tags = s3_client.get_bucket_tagging(Bucket=bucket["Name"])["TagSet"] - except s3_client.exceptions.NoSuchTagSet: + except (s3_client.exceptions.NoSuchTagSet, botocore.exceptions.ClientError): raise RuntimeError(f"S3 bucket {bucket['Name']} does not have any tags.") persist_days = next((tag["Value"] for tag in tags if tag["Key"] == "persist_days"), None) if persist_days: From 77d3d0f949d37d5e1fbf22f8625744e9969f629a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 28 Aug 2025 12:23:22 +0200 Subject: [PATCH 392/765] Removed s3_client.exceptions from except if tag is missing to only catch botocore error --- app/util/k8s/terminate_cluster.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/terminate_cluster.py b/app/util/k8s/terminate_cluster.py index 98cba885a..80f2fef07 100644 --- a/app/util/k8s/terminate_cluster.py +++ b/app/util/k8s/terminate_cluster.py @@ -983,7 +983,7 @@ def delete_expired_tf_state_s3_buckets(): created_date = bucket["CreationDate"] try: tags = s3_client.get_bucket_tagging(Bucket=bucket["Name"])["TagSet"] - except (s3_client.exceptions.NoSuchTagSet, botocore.exceptions.ClientError): + except botocore.exceptions.ClientError: raise RuntimeError(f"S3 bucket {bucket['Name']} does not have any tags.") persist_days = next((tag["Value"] for tag in tags if tag["Key"] == "persist_days"), None) if persist_days: From 24a53efca987e5bc88eeb5732012d4916d2a0d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 28 Aug 2025 13:28:11 +0200 Subject: [PATCH 393/765] Added better error handling to specify NoSuchTagSet error --- app/util/k8s/terminate_cluster.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/terminate_cluster.py b/app/util/k8s/terminate_cluster.py index 80f2fef07..13b30f19f 100644 --- a/app/util/k8s/terminate_cluster.py +++ b/app/util/k8s/terminate_cluster.py @@ -983,8 +983,12 @@ def delete_expired_tf_state_s3_buckets(): created_date = bucket["CreationDate"] try: tags = s3_client.get_bucket_tagging(Bucket=bucket["Name"])["TagSet"] - except botocore.exceptions.ClientError: - raise RuntimeError(f"S3 bucket {bucket['Name']} does not have any tags.") + except botocore.exceptions.ClientError as e: + if e.response['Error']['Code'] == 'NoSuchTagSet': + raise RuntimeError(f"S3 bucket {bucket['Name']} does not have any tags.") + else: + logging.error(f"Unexpected error for bucket: {bucket['Name']}") + raise e persist_days = next((tag["Value"] for tag in tags if tag["Key"] == "persist_days"), None) if persist_days: if not is_float(persist_days): From d09a7725865dfe26fd0ebe0774b4cab565105934 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Sep 2025 07:01:39 +0200 Subject: [PATCH 394/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 3565ed219..44c724ec5 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4fa19af8ca3dc254a00e7df488dab1a2bcf11d20 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Sep 2025 07:01:40 +0200 Subject: [PATCH 395/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index fef50be74..0b8891ecd 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7ffcea25f924bcbaf1817825d31a8879de956dc5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Sep 2025 07:01:41 +0200 Subject: [PATCH 396/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 27479bd56..bc13fdbb8 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2e72a5f18cee2a931c928bdbad29535efa098396 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Sep 2025 07:01:41 +0200 Subject: [PATCH 397/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 118d455e9..64efba00f 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 09100f6c98e2088dcb8210d72f3f37450cf60bd6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Sep 2025 07:01:42 +0200 Subject: [PATCH 398/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index e532ca8b1..fd864f8c6 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "139.0.7258.154" # Supports Chrome version 139. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 763b1379a16a254fc74110b309426c71e4ff50a4 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 4 Sep 2025 12:03:46 +0300 Subject: [PATCH 399/765] added jira 11 us-east-2 large --- app/util/k8s/dcapt-snapshots.json | 55 +++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index d737ec8da..55f4d9c3c 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -1,6 +1,61 @@ { "jira": { "versions": [ + { + "version": "11.0.0", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0606351bf5d2006f8", + "us-east-1": "snap-" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-11-0-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0d0e130f79bb6d8ab", + "us-east-1": "snap-" + } + ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-", + "us-east-1": "snap-" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-" + } + ] + } + ] + }, { "version": "10.3.9", "data": [ From 73786eaca19282e7e2a291aac03deb97beccee31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 4 Sep 2025 13:51:33 +0200 Subject: [PATCH 400/765] Added variable in yml files to point local chrome binary path in selenium tests --- app/bamboo.yml | 2 ++ app/bitbucket.yml | 2 ++ app/confluence.yml | 2 ++ app/jira.yml | 2 ++ app/jsm.yml | 2 ++ app/util/conf.py | 5 +++++ app/util/pre_run/environment_compliance_check.py | 6 ++++++ 7 files changed, 21 insertions(+) diff --git a/app/bamboo.yml b/app/bamboo.yml index 3565ed219..9ed0b2eae 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -37,6 +37,8 @@ settings: parallel_plans_count: 40 # number of parallel plans execution start_plan_timeout: 60 # maximum timeout of plan to start default_dataset_plan_duration: 60 # expected plan execution duration + local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + services: - module: shellexec prepare: diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 27479bd56..4a5ef1cea 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -22,6 +22,8 @@ settings: 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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. + local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + services: - module: shellexec prepare: diff --git a/app/confluence.yml b/app/confluence.yml index fef50be74..040b77428 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -38,6 +38,8 @@ settings: standalone_extension: 0 # By default disabled # Custom dataset section. custom_dataset_query: # Write CQL query to add CQL output to the app/datasets/confluence/custom_pages.csv, e.g. "title ~ 'AppPage*'" + local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + services: - module: shellexec prepare: diff --git a/app/jira.yml b/app/jira.yml index 118d455e9..ac3c553bd 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -38,6 +38,8 @@ settings: standalone_extension: 0 # By default disabled # Custom dataset section. custom_dataset_query: # Write JQL query to add JQL output to the app/datasets/jira/custom-issues.csv, e.g. "summary ~ 'AppIssue*'" + local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + services: - module: shellexec prepare: diff --git a/app/jsm.yml b/app/jsm.yml index e532ca8b1..1752e377a 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -54,6 +54,8 @@ settings: customer_standalone_extension: 0 custom_dataset_query: "" # Write JQL query to add JQL output to the app/datasets/jsm/custom-issues.csv, e.g. "summary ~ 'AppRequests*'" + local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + services: - module: shellexec prepare: diff --git a/app/util/conf.py b/app/util/conf.py index 9aee3369b..9c5a9000d 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -50,6 +50,7 @@ def __init__(self, config_yml): self.custom_dataset_query = self.get_property('custom_dataset_query') or "" self.verbose = self.settings['verbose'] self.total_actions_per_hour = self.get_property('total_actions_per_hour') + self.local_chrome_binary_path = self.get_property('local_chrome_binary_path') class ConfluenceSettings(BaseAppSettings): @@ -62,6 +63,7 @@ def __init__(self, config_yml): self.verbose = self.settings['verbose'] self.total_actions_per_hour = self.get_property('total_actions_per_hour') self.extended_metrics = self.get_property('extended_metrics') + self.local_chrome_binary_path = self.get_property('local_chrome_binary_path') class BitbucketSettings(BaseAppSettings): @@ -72,6 +74,7 @@ def __init__(self, config_yml): self.concurrency = self.get_property('concurrency') self.verbose = self.settings['verbose'] self.total_actions_per_hour = self.get_property('total_actions_per_hour') + self.local_chrome_binary_path = self.get_property('local_chrome_binary_path') class JsmSettings(BaseAppSettings): @@ -87,6 +90,7 @@ def __init__(self, config_yml): self.custom_dataset_query = self.get_property('custom_dataset_query') or "" self.verbose = self.settings['verbose'] self.insight = self.get_property('insight') + self.local_chrome_binary_path = self.get_property('local_chrome_binary_path') class CrowdSettings(BaseAppSettings): @@ -112,6 +116,7 @@ def __init__(self, config_yml): self.start_plan_timeout = self.env_settings['start_plan_timeout'] self.default_dataset_plan_duration = self.env_settings['default_dataset_plan_duration'] self.total_actions_per_hour = self.get_property('total_actions_per_hour') + self.local_chrome_binary_path = self.get_property('local_chrome_binary_path') JIRA_SETTINGS = JiraSettings(config_yml=JIRA_YML) diff --git a/app/util/pre_run/environment_compliance_check.py b/app/util/pre_run/environment_compliance_check.py index 5b5504a62..fdcb6acd1 100644 --- a/app/util/pre_run/environment_compliance_check.py +++ b/app/util/pre_run/environment_compliance_check.py @@ -1,5 +1,6 @@ import subprocess import sys +import os from packaging import version from selenium import webdriver @@ -87,6 +88,11 @@ def validate_chromedriver_version(app_name, app_settings): else: print(f"WARNING: Chromedriver version was not found in the {app_name}.yml. Skipping Chrome/chromedriver check.") return + if app_settings.local_chrome_binary_path is not None: + if not os.path.exists(app_settings.local_chrome_binary_path): + raise FileNotFoundError(f"WARNING: Chrome binary not found at {app_settings.local_chrome_binary_path}") + options.binary_location = app_settings.local_chrome_binary_path + print(f"INFO: Using local chrome binary path: {options.binary_location}") if current_chromedriver_version.major == current_chrome_version.major: print(f"INFO: Chrome version: {current_chrome_version}") print(f"INFO: Chromedriver version in {app_name}.yml: {current_chromedriver_version}") From 5c5957c764ef06a69767f06402eae7a27e60a26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 4 Sep 2025 20:01:41 +0200 Subject: [PATCH 401/765] Removed "" in yml files in local chrome binary path env --- app/bamboo.yml | 2 +- app/bitbucket.yml | 4 ++-- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 5 ++--- app/util/pre_run/environment_compliance_check.py | 1 + 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 9ed0b2eae..21d02afa7 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -37,7 +37,7 @@ settings: parallel_plans_count: 40 # number of parallel plans execution start_plan_timeout: 60 # maximum timeout of plan to start default_dataset_plan_duration: 60 # expected plan execution duration - local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. services: - module: shellexec diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 4a5ef1cea..114cc8b09 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,9 +20,9 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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: 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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. - local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. services: - module: shellexec diff --git a/app/confluence.yml b/app/confluence.yml index 040b77428..2cb25392a 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -38,7 +38,7 @@ settings: standalone_extension: 0 # By default disabled # Custom dataset section. custom_dataset_query: # Write CQL query to add CQL output to the app/datasets/confluence/custom_pages.csv, e.g. "title ~ 'AppPage*'" - local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index ac3c553bd..d48d0b147 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -38,7 +38,7 @@ settings: standalone_extension: 0 # By default disabled # Custom dataset section. custom_dataset_query: # Write JQL query to add JQL output to the app/datasets/jira/custom-issues.csv, e.g. "summary ~ 'AppIssue*'" - local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. services: - module: shellexec diff --git a/app/jsm.yml b/app/jsm.yml index 1752e377a..3fdc62fb4 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -52,9 +52,8 @@ settings: customer_create_request: 16 customer_insight_view_request: 6 customer_standalone_extension: 0 - - custom_dataset_query: "" # Write JQL query to add JQL output to the app/datasets/jsm/custom-issues.csv, e.g. "summary ~ 'AppRequests*'" - local_chrome_binary_path: '' # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + custom_dataset_query: # Write JQL query to add JQL output to the app/datasets/jsm/custom-issues.csv, e.g. "summary ~ 'AppRequests*'" + local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. services: - module: shellexec diff --git a/app/util/pre_run/environment_compliance_check.py b/app/util/pre_run/environment_compliance_check.py index fdcb6acd1..cf2ac01fb 100644 --- a/app/util/pre_run/environment_compliance_check.py +++ b/app/util/pre_run/environment_compliance_check.py @@ -129,6 +129,7 @@ def analyze_application_configuration(app_name, app_settings): print(f"INFO: application_postfix: {app_settings.postfix}") url = f"{app_settings.protocol}://{app_settings.hostname}:{app_settings.port}{app_settings.postfix}" print(f"INFO: Product URL: {url}") + print(f"INFO: Local chrome binary path: {app_settings.local_chrome_binary_path}") try: status = app.status From d1d9cea254f558930a5e8a2548b42caeffa94eca Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Fri, 5 Sep 2025 16:37:53 +0300 Subject: [PATCH 402/765] confluence-10/dismiss-new-popup-and-fix-snapshots --- app/selenium_ui/confluence/pages/selectors.py | 3 ++- app/util/k8s/dcapt-snapshots.json | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/selenium_ui/confluence/pages/selectors.py b/app/selenium_ui/confluence/pages/selectors.py index 66f0ec020..608198216 100644 --- a/app/selenium_ui/confluence/pages/selectors.py +++ b/app/selenium_ui/confluence/pages/selectors.py @@ -39,7 +39,8 @@ class PopupLocators: (By.CSS_SELECTOR, ".aui-button.aui-button-link.skip-onboarding"), (By.CSS_SELECTOR, "#closeDisDialog"), (By.CSS_SELECTOR, ".aui-button.aui-button-primary.show-onboarding"), - (By.CSS_SELECTOR, 'button[aria-label="Close this modal"]') + (By.CSS_SELECTOR, 'button[aria-label="Close this modal"]'), + (By.XPATH, "//button[.//span[text()='Close']]") ] diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index d737ec8da..1721091b6 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -238,7 +238,7 @@ "snapshots": [ { "us-east-2": "snap-017dab74a941fbbeb", - "us-east-1": "snap-00f799d439f333af2" + "us-east-1": "snap-094ed2d0367fb59a7" } ] }, @@ -257,8 +257,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0af92e32632eb2500", - "us-east-1": "snap-0ac6fd59413cb71ed" + "us-east-2": "snap-0bcc0788c941674f9", + "us-east-1": "snap-091e65ed2d988152e" } ] }, @@ -277,8 +277,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-08439439376d2afb1", - "us-east-1": "snap-09f9176f7485f9db2" + "us-east-2": "snap-07381978e5107d22b", + "us-east-1": "snap-0478bb092072029fc" } ] } From 6bb1cece372e94d4a27116e81cc24e92721d80e5 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 6 Sep 2025 10:55:28 +0300 Subject: [PATCH 403/765] change snapshots ids --- app/util/k8s/dcapt-snapshots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 55f4d9c3c..d2885d70e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -9,7 +9,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0606351bf5d2006f8", + "us-east-2": "snap-08e3207a378903af9", "us-east-1": "snap-" } ] @@ -29,7 +29,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0d0e130f79bb6d8ab", + "us-east-2": "snap-02b3467b4ef62d1de", "us-east-1": "snap-" } ] From 975ee5e5e708ded7cdc9b2254b4cca30f2d4cf42 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 7 Sep 2025 20:39:35 +0300 Subject: [PATCH 404/765] added all region jira 11 --- app/util/k8s/dcapt-snapshots.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index d2885d70e..54d7b0d5d 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -10,7 +10,7 @@ "snapshots": [ { "us-east-2": "snap-08e3207a378903af9", - "us-east-1": "snap-" + "us-east-1": "snap-011dc45746e1b031f" } ] }, @@ -20,7 +20,7 @@ "snapshots": [ { "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-11-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-" + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-11-0-0" } ] }, @@ -30,7 +30,7 @@ "snapshots": [ { "us-east-2": "snap-02b3467b4ef62d1de", - "us-east-1": "snap-" + "us-east-1": "snap-0f8f606dfa0e1d64c" } ] }, @@ -39,8 +39,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-", - "us-east-1": "snap-" + "us-east-2": "snap-0c89728f1f06f468b", + "us-east-1": "snap-0e4557f9eb8eaa028" } ] }, @@ -49,8 +49,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-11-0-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-11-0-0" } ] } From 539685addf641ebb8cec9aa61f98d55e470d1d77 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 8 Sep 2025 11:42:39 +0300 Subject: [PATCH 405/765] added 11 to readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b9492a41..c36097d40 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): `9.12.26` and `10.3.9` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.26`, `10.3.9` and `11.0.0` Platform release * Supported Jira Service Management versions: * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.26` and `10.3.9` From 0bf23b006ea7065ebfff0170901b5ca48d785110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Tue, 9 Sep 2025 09:34:33 +0200 Subject: [PATCH 406/765] Moved local chrome binary path setup to conftest.py --- app/selenium_ui/conftest.py | 6 ++++++ app/util/pre_run/environment_compliance_check.py | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index 4006b9e85..881d0dda5 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -213,6 +213,12 @@ def driver_init(): chrome_options.add_argument("--headless") if not app_settings.secure: chrome_options.add_argument('--ignore-certificate-errors') + if app_settings.local_chrome_binary_path is not None: + print("Setting up local chrome binary path") + if not os.path.exists(app_settings.local_chrome_binary_path): + raise FileNotFoundError(f"Chrome binary not found at {app_settings.local_chrome_binary_path}") + chrome_options.binary_location = app_settings.local_chrome_binary_path + print(f"Using custom local chrome binary path: {chrome_options.binary_location}") chrome_options.add_argument( "--window-size={},{}".format(SCREEN_WIDTH, SCREEN_HEIGHT)) chrome_options.add_argument("--no-sandbox") diff --git a/app/util/pre_run/environment_compliance_check.py b/app/util/pre_run/environment_compliance_check.py index cf2ac01fb..4882f8c8d 100644 --- a/app/util/pre_run/environment_compliance_check.py +++ b/app/util/pre_run/environment_compliance_check.py @@ -88,11 +88,6 @@ def validate_chromedriver_version(app_name, app_settings): else: print(f"WARNING: Chromedriver version was not found in the {app_name}.yml. Skipping Chrome/chromedriver check.") return - if app_settings.local_chrome_binary_path is not None: - if not os.path.exists(app_settings.local_chrome_binary_path): - raise FileNotFoundError(f"WARNING: Chrome binary not found at {app_settings.local_chrome_binary_path}") - options.binary_location = app_settings.local_chrome_binary_path - print(f"INFO: Using local chrome binary path: {options.binary_location}") if current_chromedriver_version.major == current_chrome_version.major: print(f"INFO: Chrome version: {current_chrome_version}") print(f"INFO: Chromedriver version in {app_name}.yml: {current_chromedriver_version}") From 95c2024d97ad9ff501b4742a648334b23caddd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Tue, 9 Sep 2025 13:04:49 +0200 Subject: [PATCH 407/765] Moved local chrome binary setup before driver check in environment_compliance_check.py --- app/selenium_ui/conftest.py | 3 --- app/util/pre_run/environment_compliance_check.py | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index 881d0dda5..a52243165 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -214,9 +214,6 @@ def driver_init(): if not app_settings.secure: chrome_options.add_argument('--ignore-certificate-errors') if app_settings.local_chrome_binary_path is not None: - print("Setting up local chrome binary path") - if not os.path.exists(app_settings.local_chrome_binary_path): - raise FileNotFoundError(f"Chrome binary not found at {app_settings.local_chrome_binary_path}") chrome_options.binary_location = app_settings.local_chrome_binary_path print(f"Using custom local chrome binary path: {chrome_options.binary_location}") chrome_options.add_argument( diff --git a/app/util/pre_run/environment_compliance_check.py b/app/util/pre_run/environment_compliance_check.py index 4882f8c8d..29128af6a 100644 --- a/app/util/pre_run/environment_compliance_check.py +++ b/app/util/pre_run/environment_compliance_check.py @@ -81,6 +81,11 @@ def validate_chromedriver_version(app_name, app_settings): options = webdriver.ChromeOptions() options.add_argument("--headless") options.add_argument("--no-sandbox") + if app_settings.local_chrome_binary_path is not None: + print("Setting up local chrome binary path") + if not os.path.exists(app_settings.local_chrome_binary_path): + raise FileNotFoundError(f"Chrome binary not found at {app_settings.local_chrome_binary_path}") + options.binary_location = app_settings.local_chrome_binary_path driver = webdriver.Chrome(options=options) current_chrome_version = version.parse(driver.capabilities['browserVersion']) if app_settings.chromedriver_version: From 5c53a583d402385fc9f4482c877ba21eace9edce Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 9 Sep 2025 15:37:31 +0300 Subject: [PATCH 408/765] confluence/cleanup-locust-helptips-request --- app/locustio/confluence/http_actions.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/app/locustio/confluence/http_actions.py b/app/locustio/confluence/http_actions.py index 3457fba78..065fa131b 100644 --- a/app/locustio/confluence/http_actions.py +++ b/app/locustio/confluence/http_actions.py @@ -129,9 +129,6 @@ def view_page(locust): headers=RESOURCE_HEADERS, catch_response=True) - # 120 rest/helptips/1.0/tips - locust.get('/rest/helptips/1.0/tips', catch_response=True) - # 130 rest/inlinecomments/1.0/comments r = locust.get(f'/rest/inlinecomments/1.0/comments' f'?containerId={parsed_page_id}' @@ -313,9 +310,6 @@ def view_blog(locust): headers=RESOURCE_HEADERS, catch_response=True) - # 360 rest/helptips/1.0/tips - locust.get('/rest/helptips/1.0/tips', catch_response=True) - # 370 rest/inlinecomments/1.0/comments r = locust.get(f'/rest/inlinecomments/1.0/comments' f'?containerId={blog_id}' @@ -691,9 +685,6 @@ def create_blog(): locust.get(f'/s/en_GB/{build_number}/{keyboard_hash}/_/images/icons/profilepics/add_profile_pic.svg', catch_response=True) - # 810 rest/helptips/1.0/tips - locust.get('/rest/helptips/1.0/tips', catch_response=True) - # 820 rest/mywork/latest/status/notification/count locust.get(f'/rest/mywork/latest/status/notification/count' f'?pageid={content_id}' @@ -975,9 +966,6 @@ def create_page(): headers=RESOURCE_HEADERS, catch_response=True) - # 1190 rest/helptips/1.0/tips - locust.get('/rest/helptips/1.0/tips', catch_response=True) - # 1200 rest/inlinecomments/1.0/comments locust.get(f'/rest/inlinecomments/1.0/comments' f'?containerId={locust.session_data_storage["content_id"]}' @@ -1234,9 +1222,6 @@ def edit_page(): headers=RESOURCE_HEADERS, catch_response=True) - # 1510 rest/helptips/1.0/tips - locust.get('/rest/helptips/1.0/tips', catch_response=True) - locust.get(f'/rest/inlinecomments/1.0/comments' f'?containerId={locust.session_data_storage["content_id"]}' f'&_={timestamp_int()}', From 5f72b1acc60fbfd5fdda62746f356b28be89140a Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 9 Sep 2025 17:58:00 +0300 Subject: [PATCH 409/765] added snapshots large jsm 11 --- app/util/k8s/dcapt-snapshots.json | 55 +++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 0fd5905fb..3a28c9a0e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -279,6 +279,61 @@ ] } ] + }, + { + "version": "11.0.0", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0dab31c3d6037487e", + "us-east-1": "snap-00a2693d189271ad6" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-11-0-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-11-0-0" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0d5216f4a62a16dc4", + "us-east-1": "snap-027bfaddbdc47f092" + } + ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-", + "us-east-1": "snap-" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-11-0-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-0-0" + } + ] + } + ] } ] }, From c9ee674df2c64f21bb940765c89d5bd7efba7e60 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 10 Sep 2025 07:00:55 +0200 Subject: [PATCH 410/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 44c724ec5..bfb8d4c96 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -121,7 +121,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 81becd756fd114621e16b6f9509077068e3e91e4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 10 Sep 2025 07:00:56 +0200 Subject: [PATCH 411/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 0b8891ecd..086e179e0 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -114,7 +114,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From cc8fe76da3c43914024485c63ab18868a696cbe4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 10 Sep 2025 07:00:56 +0200 Subject: [PATCH 412/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index bc13fdbb8..d190731cb 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -87,7 +87,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ff5290f18316e0e8b68c6c51a60a6dbd5c8336f4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 10 Sep 2025 07:00:57 +0200 Subject: [PATCH 413/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 64efba00f..5890841c2 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -115,7 +115,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a23924904ce7cf174b744bb6c6597fbbbfa239b2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 10 Sep 2025 07:00:58 +0200 Subject: [PATCH 414/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index fd864f8c6..973b2839d 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -167,7 +167,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.80" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8afbdabc945c9625f1afe5052790ba72840b58f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Wed, 10 Sep 2025 12:57:41 +0200 Subject: [PATCH 415/765] Added INFO and ERROR prefix in print statements --- app/util/pre_run/environment_compliance_check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/pre_run/environment_compliance_check.py b/app/util/pre_run/environment_compliance_check.py index 29128af6a..5217a1bf2 100644 --- a/app/util/pre_run/environment_compliance_check.py +++ b/app/util/pre_run/environment_compliance_check.py @@ -82,9 +82,9 @@ def validate_chromedriver_version(app_name, app_settings): options.add_argument("--headless") options.add_argument("--no-sandbox") if app_settings.local_chrome_binary_path is not None: - print("Setting up local chrome binary path") + print("INFO: Setting up local chrome binary path") if not os.path.exists(app_settings.local_chrome_binary_path): - raise FileNotFoundError(f"Chrome binary not found at {app_settings.local_chrome_binary_path}") + raise FileNotFoundError(f"ERROR: Chrome binary not found at {app_settings.local_chrome_binary_path}") options.binary_location = app_settings.local_chrome_binary_path driver = webdriver.Chrome(options=options) current_chrome_version = version.parse(driver.capabilities['browserVersion']) From a1c321040ec0e0735b1155fe6fa6999da1f96ad3 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 11 Sep 2025 10:59:11 +0300 Subject: [PATCH 416/765] added snapshots for jsm small 11 --- app/util/k8s/dcapt-snapshots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 3a28c9a0e..3f3734ba2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -318,8 +318,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-", - "us-east-1": "snap-" + "us-east-2": "snap-033d2033ff1a18568", + "us-east-1": "snap-0522bd67f65f3358c" } ] }, From d3ffc8c164be454ab42adbab78e5bdbf3e9e6692 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 11 Sep 2025 11:00:45 +0300 Subject: [PATCH 417/765] added readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c36097d40..55995d71e 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): `9.12.26`, `10.3.9` and `11.0.0` Platform release * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.26` and `10.3.9` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.26` and `10.3.9` and `11.0.0` Platform release * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.25`, `9.2.7` and `10.0.2` Platform release From c5ebf35529d3d416e37563deccffc5a4b7a15bca Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 11 Sep 2025 11:02:06 +0300 Subject: [PATCH 418/765] added readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 55995d71e..7deb993b2 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): `9.12.26`, `10.3.9` and `11.0.0` Platform release * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.26` and `10.3.9` and `11.0.0` Platform release + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.26`, `10.3.9` and `11.0.0` Platform release * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.25`, `9.2.7` and `10.0.2` Platform release From a97991956befd6dc06325039ca7ef06119e3d726 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 11 Sep 2025 14:44:37 +0200 Subject: [PATCH 419/765] fix check for crowd --- app/util/pre_run/environment_compliance_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/pre_run/environment_compliance_check.py b/app/util/pre_run/environment_compliance_check.py index 5217a1bf2..5138c6559 100644 --- a/app/util/pre_run/environment_compliance_check.py +++ b/app/util/pre_run/environment_compliance_check.py @@ -129,7 +129,6 @@ def analyze_application_configuration(app_name, app_settings): print(f"INFO: application_postfix: {app_settings.postfix}") url = f"{app_settings.protocol}://{app_settings.hostname}:{app_settings.port}{app_settings.postfix}" print(f"INFO: Product URL: {url}") - print(f"INFO: Local chrome binary path: {app_settings.local_chrome_binary_path}") try: status = app.status @@ -169,6 +168,7 @@ def analyze_application_configuration(app_name, app_settings): if app_name.upper() == "CROWD": print("INFO: Skipping Chromedriver check for Crowd.") else: + print(f"INFO: Local chrome binary path: {app_settings.local_chrome_binary_path}") validate_chromedriver_version(app_name, app_settings) validate_java_version() From d6a1a8236e9a77cfee474428c62e6229ec1b0708 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 11 Sep 2025 15:02:56 +0200 Subject: [PATCH 420/765] Update docs date --- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-bitbucket.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 2 +- 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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index c61f42ce6..c85b0b041 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: "2025-07-17" +date: "2025-09-11" --- # 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 7e47bb4e8..f3e59d230 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: "2025-07-17" +date: "2025-09-11" --- # 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 ba5583147..01b6aa8d3 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: "2025-07-17" +date: "2025-09-11" --- # Data Center App Performance Toolkit User Guide For Confluence diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index c61b37127..df6862e96 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: "2025-07-17" +date: "2025-09-11" --- # 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 fba0846c0..c0585543f 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: "2025-07-17" +date: "2025-09-11" --- # 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 4a9865269..96e842b40 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: "2025-07-17" +date: "2025-09-11" --- # Data Center App Performance Toolkit User Guide For Jira Service Management From c381b572274e0b43ec92640f5bd17b671e1d9023 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 11 Sep 2025 15:14:27 +0200 Subject: [PATCH 421/765] Release 8.0.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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index e20bc642a..c2ffd2d86 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for JMeter load executor view_all_builds: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 7c1095cc7..9b9a9e597 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. diff --git a/app/confluence.yml b/app/confluence.yml index 92b61ee30..41df12344 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. extended_metrics: False # Action percentage for JMeter and Locust load executors diff --git a/app/crowd.yml b/app/crowd.yml index 8d90b55ff..ebb999f12 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index 8cfc220d0..65516c446 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors create_issue: 4 diff --git a/app/jsm.yml b/app/jsm.yml index 91a0dd228..6b6efe35b 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 From e95b5d65968ca2b720f42577ab3dc96921b8dd1f Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 11 Sep 2025 15:20:46 +0200 Subject: [PATCH 422/765] Fix indent bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 9b9a9e597..ae2ff8498 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.3 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: 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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. From 0db1bbb9117ea95a3ffb97dcee9167d02f790958 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 11 Sep 2025 15:55:26 +0200 Subject: [PATCH 423/765] Release 8.8.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 84e7b5350..adbbe1860 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 = '8.7.1' +TOOLKIT_VERSION = '8.8.1' UNSUPPORTED_VERSION = '8.4.0' From 66aa86b67e6f0e6ed9e5726eb51111b2199fda38 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 11 Sep 2025 16:47:31 +0200 Subject: [PATCH 424/765] Fix snapshots ids for 8.8.1 --- app/util/k8s/dcapt-snapshots.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 3f3734ba2..466f03c0e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -423,8 +423,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0267a462e98ffdaec", - "us-east-1": "snap-0c7c80285157c1fe1" + "us-east-2": "snap-0b3fe55198bfc4f25", + "us-east-1": "snap-0eaf3be3c40ffb386" } ] }, @@ -443,8 +443,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0fc33474a6932eef4", - "us-east-1": "snap-088774c9ef2b58e6a" + "us-east-2": "snap-008cba8bcec435740", + "us-east-1": "snap-0d4cd0bf9032b67cc" } ] } From f30cba0b7f05a5b3ebcf8cb4d9601852d47dbff5 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 11 Sep 2025 17:00:58 +0200 Subject: [PATCH 425/765] Bump toolit 8.9.0 --- app/util/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/conf.py b/app/util/conf.py index 9c5a9000d..ff5686bff 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -2,8 +2,8 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML -TOOLKIT_VERSION = '8.8.0' -UNSUPPORTED_VERSION = '8.4.0' +TOOLKIT_VERSION = '8.9.0' +UNSUPPORTED_VERSION = '8.5.0' def read_yml_file(file): From 30853a2152cec0b6be4c0dfe45bd0225152e8323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Tue, 16 Sep 2025 20:29:40 +0200 Subject: [PATCH 426/765] Added functionality to hide secrets in yml files while zipping results. --- .../scripts/results_archivator.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/reports_generation/scripts/results_archivator.py b/app/reports_generation/scripts/results_archivator.py index 290fefb92..f23565d41 100644 --- a/app/reports_generation/scripts/results_archivator.py +++ b/app/reports_generation/scripts/results_archivator.py @@ -1,14 +1,33 @@ from pathlib import Path from shutil import make_archive +import yaml from scripts.utils import validate_config, clean_str, resolve_relative_path def __zip_folder(folder_path: Path, destination_path: Path) -> Path: + yml_files = list(folder_path.glob("*.yml")) + if len(yml_files) == 0: + raise FileNotFoundError(f'No .yml file found in the {destination_path} folder') + __hide_sensitive_info(yml_files) archive_path = make_archive(destination_path, 'zip', folder_path) return Path(archive_path) +def __hide_sensitive_info(files: list[Path]) -> None: + for file in files: + with file.open('r') as f: + data = yaml.safe_load(f) + if "settings" not in data or "env" not in data["settings"]: + continue + if "admin_login" in data["settings"]["env"]: + data["settings"]["env"]["admin_login"] = "****" + if "admin_password" in data["settings"]["env"]: + data["settings"]["env"]["admin_password"] = "****" + with file.open('w') as f: + yaml.safe_dump(data, f) + + def archive_results(config: dict, results_dir: Path): validate_config(config) for run in config['runs']: From e1b7d6f79c07f8998804c034038a6aeb1e2def02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Wed, 17 Sep 2025 12:52:03 +0200 Subject: [PATCH 427/765] Removed FileNotFoundError and added file_edited bool to save only if file is changed --- .../scripts/results_archivator.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/reports_generation/scripts/results_archivator.py b/app/reports_generation/scripts/results_archivator.py index f23565d41..0ccb70dda 100644 --- a/app/reports_generation/scripts/results_archivator.py +++ b/app/reports_generation/scripts/results_archivator.py @@ -7,9 +7,8 @@ def __zip_folder(folder_path: Path, destination_path: Path) -> Path: yml_files = list(folder_path.glob("*.yml")) - if len(yml_files) == 0: - raise FileNotFoundError(f'No .yml file found in the {destination_path} folder') - __hide_sensitive_info(yml_files) + if len(yml_files) > 0: + __hide_sensitive_info(yml_files) archive_path = make_archive(destination_path, 'zip', folder_path) return Path(archive_path) @@ -18,14 +17,18 @@ def __hide_sensitive_info(files: list[Path]) -> None: for file in files: with file.open('r') as f: data = yaml.safe_load(f) + file_edited = False if "settings" not in data or "env" not in data["settings"]: continue if "admin_login" in data["settings"]["env"]: data["settings"]["env"]["admin_login"] = "****" + file_edited = True if "admin_password" in data["settings"]["env"]: data["settings"]["env"]["admin_password"] = "****" - with file.open('w') as f: - yaml.safe_dump(data, f) + file_edited = True + if file_edited: + with file.open('w') as f: + yaml.safe_dump(data, f) def archive_results(config: dict, results_dir: Path): From bb5fe8150393b8e797bb886aac2fd2d4926e59bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Wed, 17 Sep 2025 14:16:47 +0200 Subject: [PATCH 428/765] yaml file stay the same now ofter zipping and admin_password value is changed to ****. --- .../scripts/results_archivator.py | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/reports_generation/scripts/results_archivator.py b/app/reports_generation/scripts/results_archivator.py index 0ccb70dda..4a5a0ac13 100644 --- a/app/reports_generation/scripts/results_archivator.py +++ b/app/reports_generation/scripts/results_archivator.py @@ -1,6 +1,6 @@ from pathlib import Path from shutil import make_archive -import yaml +import re from scripts.utils import validate_config, clean_str, resolve_relative_path @@ -16,19 +16,17 @@ def __zip_folder(folder_path: Path, destination_path: Path) -> Path: def __hide_sensitive_info(files: list[Path]) -> None: for file in files: with file.open('r') as f: - data = yaml.safe_load(f) + lines = f.readlines() + new_lines = [] file_edited = False - if "settings" not in data or "env" not in data["settings"]: - continue - if "admin_login" in data["settings"]["env"]: - data["settings"]["env"]["admin_login"] = "****" - file_edited = True - if "admin_password" in data["settings"]["env"]: - data["settings"]["env"]["admin_password"] = "****" - file_edited = True + for line in lines: + if re.match(r'\s*admin_password\s*:', line): + line = re.sub(r'(:\s*).+', r'\1****', line) + file_edited = True + new_lines.append(line) if file_edited: with file.open('w') as f: - yaml.safe_dump(data, f) + f.writelines(new_lines) def archive_results(config: dict, results_dir: Path): From cc7f86d4d9e11acfdb08824804fab7661f4fd75a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 18 Sep 2025 07:00:59 +0200 Subject: [PATCH 429/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index e20bc642a..59752523d 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1561d68126b052aaf2018907b215fd632ed9f928 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 18 Sep 2025 07:01:00 +0200 Subject: [PATCH 430/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 92b61ee30..755f0b8c5 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 77052fd51c25207786646a13fc07727c45cb0e62 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 18 Sep 2025 07:01:01 +0200 Subject: [PATCH 431/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 7c1095cc7..bd402a211 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ab46f95b2db528d5a7dcea83228c064bac024121 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 18 Sep 2025 07:01:02 +0200 Subject: [PATCH 432/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 8cfc220d0..c58b9849d 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 136a1b4389f719a1a4f97b5753d967b85d3f485e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 18 Sep 2025 07:01:03 +0200 Subject: [PATCH 433/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 91a0dd228..46314e6a9 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b14c1a9b13dcd76a0f7455a643d540fcd88f3b1a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 18 Sep 2025 10:23:25 +0200 Subject: [PATCH 434/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 3f3734ba2..86360d1fb 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -630,6 +630,32 @@ } ], "build_number": "2303" + }, + { + "version": "7.0.1", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0ee4c05ba890fb379", + "us-east-1": "snap-021f3b69d9e2e1160" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-7-0-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-7-0-1" + } + ] + } + ], + "build_number": "2407" } ] } From 30a111bde56b336151af9105accc06b8fcedb0d5 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 23 Sep 2025 08:39:33 +0200 Subject: [PATCH 435/765] Cword 7 support --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 26 -------------------------- app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 7deb993b2..8686c60ce 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21` and `9.4.9` * Supported Crowd versions: - * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.3.2` + * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.0.1` * Supported Bamboo versions: * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.7` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 86360d1fb..3249c0b91 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -605,32 +605,6 @@ }, "crowd": { "versions": [ - { - "version": "6.3.2", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0b760f603881646fd", - "us-east-1": "snap-02dcb0c3f5bbc74c8" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-6-3-2", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-6-3-2" - } - ] - } - ], - "build_number": "2303" - }, { "version": "7.0.1", "data": [ diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 43af081bf..e616ff0df 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -335,7 +335,7 @@ bitbucket_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -crowd_version_tag = "6.3.2" +crowd_version_tag = "7.0.1" # Helm chart version of Crowd and Crowd agent instances. By default the latest version is installed. # crowd_helm_chart_version = "" @@ -366,7 +366,7 @@ crowd_nfs_limits_memory = "2Gi" # Documentation can be found via: # https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.DBInstanceClass.html # https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS -crowd_db_major_engine_version = "14" +crowd_db_major_engine_version = "17" crowd_db_instance_class = "db.m5.large" crowd_db_allocated_storage = 200 crowd_db_iops = 1000 From e0fa151bffd1d5acf1180bf9842f623848496a93 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 23 Sep 2025 11:45:52 +0200 Subject: [PATCH 436/765] Updated bzt_on_pod.sh to run inside tmux sessions to recover from network issues. Updated EBS snapshot for bitbucket 9.4.9 with increased number of threads and events queue in bitbucket.properties --- app/util/k8s/bzt_on_pod.sh | 134 +++++++++++++++++++++++++----- app/util/k8s/dcapt-snapshots.json | 2 +- 2 files changed, 116 insertions(+), 20 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index ef43234e0..2d78e1009 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -43,27 +43,123 @@ fi echo "INFO: Execution environment pod name: $exec_pod_name" -echo "INFO: Cleanup dc-app-performance-toolkit folder on the exec env pod" -kubectl exec -it "$exec_pod_name" -n atlassian -- rm -rf /dc-app-performance-toolkit - -echo "INFO: Copy latest dc-app-performance-toolkit folder to the exec env pod" -start=$(date +%s) -# tar only app folder, exclude results and util/k8s folder -tar -czf dcapt.tar.gz -C dc-app-performance-toolkit --exclude results --exclude util/k8s app Dockerfile requirements.txt -kubectl exec -it "$exec_pod_name" -n atlassian -- mkdir /dc-app-performance-toolkit -cat dcapt.tar.gz | kubectl exec -i -n atlassian "$exec_pod_name" -- tar xzf - -C /dc-app-performance-toolkit -rm -rf dcapt.tar.gz -end=$(date +%s) -runtime=$((end-start)) -echo "INFO: Copy finished in $runtime seconds" - -if [[ $2 == "--docker_image_rebuild" ]]; then - echo "INFO: Rebuild docker image" - kubectl exec -it "$exec_pod_name" -n atlassian -- docker build -t $DCAPT_DOCKER_IMAGE dc-app-performance-toolkit +# Ensure tmux is installed in the pod (using apk for Alpine) +echo "INFO: Ensuring tmux is available in the pod" +kubectl exec -it "$exec_pod_name" -n atlassian -- sh -c "command -v tmux || apk add --no-cache tmux" + +# Check if tmux session already exists and contains our setup +session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?") + +if [[ "$session_exists" == "0" ]]; then + echo "INFO: Found existing tmux session 'bzt_session', attaching to it..." +else + echo "INFO: Creating new tmux session and running setup inside it" + + # Prepare the dcapt archive locally first + echo "INFO: Preparing dc-app-performance-toolkit archive" + start=$(date +%s) + tar -czf dcapt.tar.gz -C dc-app-performance-toolkit --exclude results --exclude util/k8s app Dockerfile requirements.txt + + # Copy the archive to the pod + echo "INFO: Copying archive to pod" + kubectl cp dcapt.tar.gz atlassian/"$exec_pod_name":/tmp/dcapt.tar.gz + rm -rf dcapt.tar.gz + end=$(date +%s) + runtime=$((end-start)) + echo "INFO: Archive preparation and copy finished in $runtime seconds" + + # Create the setup script that will run inside tmux + setup_script=" + echo 'INFO: Starting setup inside tmux session' + + # Cleanup and recreate directory + echo 'INFO: Cleanup dc-app-performance-toolkit folder' + rm -rf /dc-app-performance-toolkit + mkdir -p /dc-app-performance-toolkit + + # Extract the archive + echo 'INFO: Extracting dc-app-performance-toolkit' + tar xzf /tmp/dcapt.tar.gz -C /dc-app-performance-toolkit + rm -f /tmp/dcapt.tar.gz + + # Docker image rebuild if requested + if [ '$2' = '--docker_image_rebuild' ]; then + echo 'INFO: Rebuilding docker image' + docker build -t $DCAPT_DOCKER_IMAGE dc-app-performance-toolkit + fi + + # Create a marker file to indicate setup is complete + touch /tmp/dcapt_setup_complete + + echo 'INFO: Setup complete, starting bzt execution' + # Run bzt + docker run --shm-size=4g -v /dc-app-performance-toolkit:/dc-app-performance-toolkit $DCAPT_DOCKER_IMAGE '$1' + " + + # Start tmux session with the complete setup and execution + kubectl exec -it "$exec_pod_name" -n atlassian -- sh -c " + tmux new-session -d -s bzt_session \"$setup_script\" + " + + echo "INFO: Tmux session 'bzt_session' created with setup and execution" fi -echo "INFO: Run bzt on the exec env pod" -kubectl exec -it "$exec_pod_name" -n atlassian -- docker run --shm-size=4g -v "/dc-app-performance-toolkit:/dc-app-performance-toolkit" $DCAPT_DOCKER_IMAGE "$1" +attempt=1 +max_attempts=5 +echo "INFO: Attaching to tmux session 'bzt_session'..." + +while [ $attempt -le $max_attempts ]; do + echo "INFO: Attempt $attempt to attach to tmux session 'bzt_session'..." + + # Check if session still exists before attempting to attach + session_check=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) + + if [[ "$session_check" != "0" ]]; then + echo "INFO: bzt session has finished or does not exist." + break + fi + + + kubectl exec -it "$exec_pod_name" -n atlassian -- tmux attach-session -t bzt_session 2>/dev/null + exit_code=$? + + # Handle different exit scenarios + if [[ $exit_code -eq 0 ]]; then + echo "INFO: Successfully detached from tmux session." + # Double-check if session still exists after clean detachment + session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) + if [[ "$session_exists" != "0" ]]; then + echo "INFO: bzt session has completed." + break + fi + # Clean detachment but session still exists, continue monitoring + echo "INFO: Session still active, continuing to monitor..." + elif [[ $exit_code -ne 0 ]]; then + # Handle network errors or other failures + echo "WARNING: Connection error detected (exit code: $exit_code)" + + # Verify session still exists before retrying + session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) + + if [[ "$session_exists" != "0" ]]; then + echo "INFO: bzt session has finished during disconnection." + break + fi + + if [ $attempt -eq $max_attempts ]; then + echo "ERROR: Reached maximum number of attempts ($max_attempts). Session may still be running." + echo "ERROR: You can manually reconnect using: kubectl exec -it $exec_pod_name -n atlassian -- tmux attach-session -t bzt_session" + break + fi + + # Exponential backoff for retries + sleep_time=$((2 + attempt)) + echo "INFO: Network error or disconnect detected, reconnecting to tmux session in $sleep_time seconds (attempt $((attempt+1)))..." + sleep $sleep_time + attempt=$((attempt+1)) + fi +done + sleep 10 echo "INFO: Copy results folder from the exec env pod to local" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 86360d1fb..755ef29c3 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -564,7 +564,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0ee236de97b56c8d2", + "us-east-2": "snap-094a2798a0b2611ce", "us-east-1": "snap-07f51188c754cd6a4" } ] From 41b12315f1e8eef6d795d7c9b02ce5b0037123f6 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 23 Sep 2025 15:19:52 +0200 Subject: [PATCH 437/765] Fixed temp EBS snapshot --- app/util/k8s/dcapt-snapshots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 755ef29c3..61574338b 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -564,7 +564,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-094a2798a0b2611ce", + "us-east-2": "snap-05e54e841209554ad", "us-east-1": "snap-07f51188c754cd6a4" } ] From 6717d068431834625126ea72e73c05da20df15b0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 24 Sep 2025 07:00:53 +0200 Subject: [PATCH 438/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 59752523d..4bf3e1beb 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 3f4076a5a48e147d58aa82602ce151c45c643c78 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 24 Sep 2025 07:00:53 +0200 Subject: [PATCH 439/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 755f0b8c5..47333070a 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1c74fe77f30e0b984e49d172dcc0a186573a8c6e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 24 Sep 2025 07:00:54 +0200 Subject: [PATCH 440/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index bd402a211..c926879cc 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 39f438a170021a124d157f695258ababb5193707 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 24 Sep 2025 07:00:55 +0200 Subject: [PATCH 441/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index c58b9849d..10aac1d00 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ffab268fd996b62689855d0c000abad93043b791 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 24 Sep 2025 07:00:56 +0200 Subject: [PATCH 442/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 46314e6a9..c5a9fa927 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.185" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1a74ded25dade1fcd2cb72b95ae9da7aa84fc2af Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 24 Sep 2025 14:30:07 +0200 Subject: [PATCH 443/765] Rollback snapshot change for Bitbucket 9.4.9 --- app/util/k8s/dcapt-snapshots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 61574338b..86360d1fb 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -564,7 +564,7 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-05e54e841209554ad", + "us-east-2": "snap-0ee236de97b56c8d2", "us-east-1": "snap-07f51188c754cd6a4" } ] From 76a2958205ce8f0c131e5358d5220c2f49b70fa7 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 24 Sep 2025 16:51:30 +0200 Subject: [PATCH 444/765] bzt_on_pod.sh to support 2 modes: 1. Interactive (default one) - tests are running tmux session and user can interact with that 2. Non-interactive (requires --ci command line argument) - tests are still running in tmux session, but user cant interact and only see streamed tmux logs --- app/util/k8s/bzt_on_pod.sh | 41 ++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index 2d78e1009..7e7daeb27 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -28,6 +28,14 @@ else exit 1 fi +# Parse arguments for --ci flag (starting from 2nd argument) +ci=false +for ((i=2; i<=$#; i++)); do + if [[ "${!i}" == "--ci" ]]; then + ci=true + break + fi +done echo "INFO: Update kubeconfig" aws eks update-kubeconfig --name atlas-"$ENVIRONMENT_NAME"-cluster --region "$REGION" @@ -45,7 +53,7 @@ echo "INFO: Execution environment pod name: $exec_pod_name" # Ensure tmux is installed in the pod (using apk for Alpine) echo "INFO: Ensuring tmux is available in the pod" -kubectl exec -it "$exec_pod_name" -n atlassian -- sh -c "command -v tmux || apk add --no-cache tmux" +kubectl exec -i "$exec_pod_name" -n atlassian -- sh -c "command -v tmux || apk add --no-cache tmux" # Check if tmux session already exists and contains our setup session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?") @@ -97,8 +105,10 @@ else " # Start tmux session with the complete setup and execution - kubectl exec -it "$exec_pod_name" -n atlassian -- sh -c " + kubectl exec -i "$exec_pod_name" -n atlassian -- sh -c " + rm -f /tmp/bzt_session.log tmux new-session -d -s bzt_session \"$setup_script\" + tmux pipe-pane -t bzt_session \"cat > /tmp/bzt_session.log\" " echo "INFO: Tmux session 'bzt_session' created with setup and execution" @@ -119,9 +129,28 @@ while [ $attempt -le $max_attempts ]; do break fi - - kubectl exec -it "$exec_pod_name" -n atlassian -- tmux attach-session -t bzt_session 2>/dev/null - exit_code=$? + # Different behavior based on ci flag + if [[ "$ci" == "true" ]]; then + # CI mode: stream logs from /tmp/bzt_session.log (non-interactive) + kubectl exec "$exec_pod_name" -n atlassian -- sh -c " + tail -f /tmp/bzt_session.log & + tail_pid=\$! + + while true; do + sleep 5 + if ! tmux has-session -t bzt_session 2>/dev/null; then + break + fi + done + + kill \$tail_pid 2>/dev/null || true + " 2>/dev/null + exit_code=$? + else + # Interactive mode: attach to tmux session + kubectl exec -it "$exec_pod_name" -n atlassian -- tmux attach-session -t bzt_session 2>/dev/null + exit_code=$? + fi # Handle different exit scenarios if [[ $exit_code -eq 0 ]]; then @@ -136,7 +165,7 @@ while [ $attempt -le $max_attempts ]; do echo "INFO: Session still active, continuing to monitor..." elif [[ $exit_code -ne 0 ]]; then # Handle network errors or other failures - echo "WARNING: Connection error detected (exit code: $exit_code)" + echo "WARNING: Connection lost (exit code: $exit_code)" # Verify session still exists before retrying session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) From ab8f6ac8d4930fb377ff52093d03c1b7a05a371d Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 25 Sep 2025 17:30:01 +0200 Subject: [PATCH 445/765] Update codeowners --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 1d40e0d8e..5166b983c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ # Default code owners - Atlassian Data Center App Performance Toolkit -* @vkavalenka80 @bgospodarek @ometelytsia @SergeyMoroz0703 @OlehStefanyshyn +* @vkavalenka80 @bgospodarek From 6dc6bf636ab998a6bff9c0a80e3ae37e41d10c71 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 25 Sep 2025 17:32:47 +0200 Subject: [PATCH 446/765] Fix request session verify --- app/util/api/abstract_clients.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/util/api/abstract_clients.py b/app/util/api/abstract_clients.py index 6fa0bedd2..f975dcf38 100644 --- a/app/util/api/abstract_clients.py +++ b/app/util/api/abstract_clients.py @@ -50,6 +50,7 @@ def __init__(self, host, user, password, verify=False, headers=None, session=Non self._requests_timeout = timeout self._session = session or requests.Session() + self._session.verify = verify self.headers = headers if headers else JSON_HEADERS self.verify = verify From 2a5d30e45df2631ed5794f3235a7f8db5cb89d16 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 1 Oct 2025 07:10:36 +0200 Subject: [PATCH 447/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 4bf3e1beb..bbb774732 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9f72f68cefabe94b4cf5ee377ce79d9473117125 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 1 Oct 2025 07:10:37 +0200 Subject: [PATCH 448/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 47333070a..b97ca95ec 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 27f2e9579893199ca800d1e4285a6053698b22f2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 1 Oct 2025 07:10:38 +0200 Subject: [PATCH 449/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index c926879cc..1108c87e0 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4ca167b6cddf09143cfdc64c4f0d253ab81852e6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 1 Oct 2025 07:10:39 +0200 Subject: [PATCH 450/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 10aac1d00..05fa22d0d 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9984125c5e43b8b4df715b45b3627ef10bc1de2d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 1 Oct 2025 07:10:40 +0200 Subject: [PATCH 451/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index c5a9fa927..e4ed9aa16 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "140.0.7339.207" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 94c3922c4745b0e278859ac6e580666219e0d7d8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Oct 2025 07:01:27 +0200 Subject: [PATCH 452/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index bbb774732..0e202e2dd 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 182ac03d5bc1e6e2cbb47e099a496af78af574eb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Oct 2025 07:01:28 +0200 Subject: [PATCH 453/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index b97ca95ec..882c39477 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2f2a2b03afaa73c05d150eb10ce561022d1d09be Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Oct 2025 07:01:29 +0200 Subject: [PATCH 454/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 1108c87e0..5ad4c6f7d 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1b7249b6c26b2b1fa77a6839950056aa7dd82449 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Oct 2025 07:01:30 +0200 Subject: [PATCH 455/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 05fa22d0d..b148c4b8e 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8790f5f8967e668fe4fa3c5ee6dc5cb751e70556 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 8 Oct 2025 07:01:30 +0200 Subject: [PATCH 456/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index e4ed9aa16..634df1db8 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.54" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0055b65575b7cf625e8971b609d4e7fb634ee437 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 10 Oct 2025 07:01:07 +0200 Subject: [PATCH 457/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 0e202e2dd..4b022f81f 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e647b3fbcc9a583c8f537f384c4cb268665e26a2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 10 Oct 2025 07:01:08 +0200 Subject: [PATCH 458/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 882c39477..ee4b9c926 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 279bc6b95acda51fa5c03ca9a40fe5d8488630d1 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 10 Oct 2025 07:01:09 +0200 Subject: [PATCH 459/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 5ad4c6f7d..a175ca063 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 03aa699a2711bb2669875b591bc1a58c71ef480a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 10 Oct 2025 07:01:10 +0200 Subject: [PATCH 460/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index b148c4b8e..af793f549 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5c6761fe6216b38e2bc100f9a75a90ba91adb275 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 10 Oct 2025 07:01:11 +0200 Subject: [PATCH 461/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 634df1db8..7580226c2 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.65" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 35a3a1a5a3559cec2be55e2d5a7ff83369873355 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Fri, 10 Oct 2025 16:11:48 +0200 Subject: [PATCH 462/765] Make selenium test working with Bitbucket 10.0.0 --- app/selenium_ui/bitbucket/pages/pages.py | 14 ++++++++------ app/selenium_ui/bitbucket/pages/selectors.py | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index 0a3d365c9..68a147bc0 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -3,7 +3,7 @@ from selenium_ui.base_page import BasePage from selenium_ui.bitbucket.pages.selectors import LoginPageLocators, GetStartedLocators, \ DashboardLocators, ProjectsLocators, ProjectLocators, RepoLocators, RepoNavigationPanelLocators, PopupLocators, \ - PullRequestLocator, BranchesLocator, RepoCommitsLocator, LogoutPageLocators, UrlManager, AdminLocators + PullRequestLocator, BranchesLocator, RepoCommitsLocator, LogoutPageLocators, UrlManager, AdminLocators, CommonLocators class LoginPage(BasePage): @@ -231,8 +231,8 @@ def open_base_branch(self, base_branch_name): self.wait_until_visible(BranchesLocator.branches_name) def create_branch_fork_rnd_name(self, base_branch_name): - self.wait_until_visible(BranchesLocator.branches_action).click() - self.get_element(BranchesLocator.branches_action_create_branch).click() + self.wait_until_visible(self.get_selector(BranchesLocator.branches_action)).click() + self.wait_until_visible(self.get_selector(BranchesLocator.branches_action_create_branch)).click() self.wait_until_visible(BranchesLocator.new_branch_name_textfield) branch_name = f"{base_branch_name}-{self.generate_random_string(5)}".replace(' ', '-') self.get_element(BranchesLocator.new_branch_name_textfield).send_keys(branch_name) @@ -241,10 +241,12 @@ def create_branch_fork_rnd_name(self, base_branch_name): def delete_branch(self, branch_name): self.wait_until_visible(BranchesLocator.search_branch_textfield).send_keys(branch_name) + if self.app_version >= version.parse("10.0.0"): + self.wait_until_visible(CommonLocators.spinner) self.wait_until_visible(BranchesLocator.branches_name) - self.wait_until_visible(BranchesLocator.search_branch_action).click() - self.execute_js("document.querySelector('li>a.delete-branch').click()") - self.wait_until_clickable(BranchesLocator.delete_branch_dialog_submit).click() + self.wait_until_clickable(BranchesLocator.search_branch_action).click() + self.wait_until_clickable(self.get_selector(BranchesLocator.delete_branch_action)).click() + self.wait_until_clickable(self.get_selector(BranchesLocator.delete_branch_dialog_submit)).click() class RepositoryCommits(BasePage): diff --git a/app/selenium_ui/bitbucket/pages/selectors.py b/app/selenium_ui/bitbucket/pages/selectors.py index e26a7bf23..4e4422afe 100644 --- a/app/selenium_ui/bitbucket/pages/selectors.py +++ b/app/selenium_ui/bitbucket/pages/selectors.py @@ -91,6 +91,9 @@ class PopupLocators: ] +class CommonLocators: + spinner = (By.CSS_SELECTOR, '.centered-spinner') + class LoginPageLocators: submit_button = (By.ID, "submit") footer_panel = (By.ID, "footer") @@ -174,13 +177,19 @@ class PullRequestLocator: class BranchesLocator: branches_name = (By.ID, "branch-name-column") - branches_action = (By.ID, "branch-actions") - branches_action_create_branch = (By.CSS_SELECTOR, "a.create-branch") + branches_action = OrderedDict({"7.0.0": (By.ID, "branch-actions"), + "10.0.0": (By.CSS_SELECTOR, ".ref-selector-more-actions > button")}) + branches_action_create_branch = OrderedDict({"7.0.0": (By.CSS_SELECTOR, "a.create-branch"), + "10.0.0": (By.XPATH, "//span[contains(text(), 'Create branch from here')]")}) + + delete_branch_action = OrderedDict({"7.0.0": (By.CSS_SELECTOR, "li>a.delete-branch"), + "10.0.0": (By.XPATH, "//button[contains(@data-testid, 'delete-branch-action')]")}) new_branch_name_textfield = (By.CSS_SELECTOR, "input.text.branch-name") new_branch_submit_button = (By.ID, "create-branch-submit") search_branch_textfield = (By.ID, 'paged-table-input-for-branch-list') search_branch_action = (By.CSS_SELECTOR, '.branch-actions-column>button') - delete_branch_dialog_submit = (By.ID, 'delete-branch-dialog-submit') + delete_branch_dialog_submit = OrderedDict({"7.0.0": (By.ID, 'delete-branch-dialog-submit'), + "10.0.0": (By.XPATH, "//button[contains(@data-testid, 'delete-branch-modal-confirm-button')]")}) class RepoCommitsLocator: From 794d01181365e9bd3d75f1e27ea9a1b6c15c76d9 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Fri, 10 Oct 2025 17:38:05 +0200 Subject: [PATCH 463/765] Fix delete_branch test for previous Bitbucket versions --- app/selenium_ui/base_page.py | 10 +++++++++- app/selenium_ui/bitbucket/pages/pages.py | 3 +-- app/selenium_ui/bitbucket/pages/selectors.py | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index 6fafbbf79..cff6e289e 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -4,7 +4,7 @@ import time from packaging import version -from selenium.common.exceptions import WebDriverException +from selenium.common.exceptions import WebDriverException, TimeoutException from selenium.webdriver.common.action_chains import ActionChains from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as ec @@ -79,6 +79,14 @@ def wait_until_visible(self, selector, timeout=timeout): return self.__wait_until(expected_condition=ec.visibility_of_element_located(selector), locator=selector, time_out=timeout) + def became_visible_in_time(self, selector, timeout): + try: + self.__wait_until(expected_condition=ec.visibility_of_element_located(selector), locator=selector, + time_out=timeout) + return True + except TimeoutException: + return False + def wait_until_available_to_switch(self, selector): return self.__wait_until(expected_condition=ec.frame_to_be_available_and_switch_to_it(selector), locator=selector, diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index 68a147bc0..2c421a78a 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -241,8 +241,7 @@ def create_branch_fork_rnd_name(self, base_branch_name): def delete_branch(self, branch_name): self.wait_until_visible(BranchesLocator.search_branch_textfield).send_keys(branch_name) - if self.app_version >= version.parse("10.0.0"): - self.wait_until_visible(CommonLocators.spinner) + self.became_visible_in_time(self.get_selector(CommonLocators.spinner), 3) self.wait_until_visible(BranchesLocator.branches_name) self.wait_until_clickable(BranchesLocator.search_branch_action).click() self.wait_until_clickable(self.get_selector(BranchesLocator.delete_branch_action)).click() diff --git a/app/selenium_ui/bitbucket/pages/selectors.py b/app/selenium_ui/bitbucket/pages/selectors.py index 4e4422afe..bccd818ee 100644 --- a/app/selenium_ui/bitbucket/pages/selectors.py +++ b/app/selenium_ui/bitbucket/pages/selectors.py @@ -92,7 +92,9 @@ class PopupLocators: class CommonLocators: - spinner = (By.CSS_SELECTOR, '.centered-spinner') + spinner = OrderedDict({"7.0.0": (By.CSS_SELECTOR, ".spinner-wrapper"), + "10.0.0": (By.CSS_SELECTOR, ".centered-spinner")}) + class LoginPageLocators: submit_button = (By.ID, "submit") From 23a9e668a3f64efe409d71c5adb021335baed1ff Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 13 Oct 2025 09:19:07 +0200 Subject: [PATCH 464/765] Fix flaky tests for Bitbucket 8.19.21 --- app/selenium_ui/bitbucket/modules.py | 4 ++++ app/selenium_ui/bitbucket/pages/pages.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/selenium_ui/bitbucket/modules.py b/app/selenium_ui/bitbucket/modules.py index 41e08b19d..2354669b1 100644 --- a/app/selenium_ui/bitbucket/modules.py +++ b/app/selenium_ui/bitbucket/modules.py @@ -186,6 +186,7 @@ def measure(): PopupManager(webdriver).dismiss_default_popup() pull_request_page.dismiss_updates_info_popup() pull_request_page.click_inline_comment_button_js() + PopupManager(webdriver).dismiss_default_popup() pull_request_page.dismiss_updates_info_popup() pull_request_page.add_code_comment() measure() @@ -239,12 +240,15 @@ def sub_measure(): branch_from = datasets['current_session']['pull_request_branch_from'] branch_to = datasets['current_session']['pull_request_branch_to'] repository_branches_page.open_base_branch(base_branch_name=branch_from) + PopupManager(webdriver).dismiss_default_popup() fork_branch_from = repository_branches_page.create_branch_fork_rnd_name(base_branch_name=branch_from) navigation_panel.wait_for_navigation_panel() + PopupManager(webdriver).dismiss_default_popup() repository_branches_page.open_base_branch(base_branch_name=branch_to) fork_branch_to = repository_branches_page.create_branch_fork_rnd_name(base_branch_name=branch_to) datasets['pull_request_fork_branch_to'] = fork_branch_to navigation_panel.wait_for_navigation_panel() + PopupManager(webdriver).dismiss_default_popup() repo_pull_requests_page.create_new_pull_request(from_branch=fork_branch_from, to_branch=fork_branch_to) pull_request_page.dismiss_updates_info_popup() PopupManager(webdriver).dismiss_default_popup() diff --git a/app/selenium_ui/bitbucket/pages/pages.py b/app/selenium_ui/bitbucket/pages/pages.py index 2c421a78a..700cde946 100644 --- a/app/selenium_ui/bitbucket/pages/pages.py +++ b/app/selenium_ui/bitbucket/pages/pages.py @@ -51,7 +51,8 @@ def set_credentials(self, username, password): def get_node_id(self): text = self.get_element(LoginPageLocators.node_id).text - return text.split('\n')[2] + lines = text.split('\n') + return lines[2] if len(lines) > 2 else None def is_logged_in(self): elements = self.get_elements(GetStartedLocators.user_profile_icon) From 149669158bdecd833c85cbd0cd22b695743ceb13 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 13 Oct 2025 17:59:19 +0200 Subject: [PATCH 465/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 3249c0b91..a1b141ee3 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -600,6 +600,31 @@ ] } ] + }, + { + "version": "10.0.0", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0a3d7df78866f0395", + "us-east-1": "snap-09009c3b2ff880868" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-10-0-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-10-0-0" + } + ] + } + ] } ] }, From 2d45a63e8c239ef874220e77c61638050e5ba682 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 13 Oct 2025 22:04:08 +0200 Subject: [PATCH 466/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a1b141ee3..fe564400b 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -623,6 +623,26 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-10-0-0" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0829c531bb2b36e62", + "us-east-1": "snap-01624c96e7a946c92" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-10-0-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-10-0-0" + } + ] } ] } From 10f92ba686120dac1fb8eb467be890dc30b269fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Tue, 14 Oct 2025 13:10:40 +0200 Subject: [PATCH 467/765] Added Bitbucket 10.0.0 support information in readme and .tfvars files --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt.tfvars | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8686c60ce..0ad8f983d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.25`, `9.2.7` and `10.0.2` Platform release * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21` and `9.4.9` + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21`, `9.4.9` and `10.0.0` * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.0.1` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 3cfdf3159..c4aaf87ef 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -238,7 +238,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "9.4.9" +bitbucket_version_tag = "10.0.0" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "small" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index e616ff0df..3046cad7d 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -247,7 +247,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "9.4.9" +bitbucket_version_tag = "10.0.0" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "large" From 27783b615fbc9201fb9ee6b1ae2d053e9f23f4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Tue, 14 Oct 2025 15:42:52 +0200 Subject: [PATCH 468/765] Added `platform release` sufix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ad8f983d..3b873b5e9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.25`, `9.2.7` and `10.0.2` Platform release * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21`, `9.4.9` and `10.0.0` + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21`, `9.4.9` and `10.0.0` Platform release * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.0.1` From 67fd3ea4e124a9221bded08fa5d6878deafa4211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Tue, 14 Oct 2025 15:49:47 +0200 Subject: [PATCH 469/765] Reverted to LTS version of bitbucket in tfvars files --- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt.tfvars | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index c4aaf87ef..3cfdf3159 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -238,7 +238,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "10.0.0" +bitbucket_version_tag = "9.4.9" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "small" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 3046cad7d..e616ff0df 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -247,7 +247,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "10.0.0" +bitbucket_version_tag = "9.4.9" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "large" From 922a235dfed7b9a3e2ba061a25aa98a3adae293a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 07:01:28 +0200 Subject: [PATCH 470/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 4b022f81f..4ff4bb0ef 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 02a9235b6edda5aa1d360c8d4c15e42ed441f202 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 07:01:29 +0200 Subject: [PATCH 471/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index ee4b9c926..81dcc2267 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 96f3abee186595840b6fc4123b957db9100c334c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 07:01:30 +0200 Subject: [PATCH 472/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index a175ca063..655120036 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 30416747b35e4e5741584d44e12e1c26dc809e47 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 07:01:30 +0200 Subject: [PATCH 473/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index af793f549..368081a69 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 656e0293c78c8dc8fe8aefbf8cdd4a0a7387a77a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 07:01:31 +0200 Subject: [PATCH 474/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 7580226c2..c28dbf019 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.76" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fb4616337bfbaae55e1d86c7a5004b9d951e4396 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 12:38:11 +0200 Subject: [PATCH 475/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index fe564400b..83b07c029 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -165,6 +165,31 @@ ] } ] + }, + { + "version": "10.3.12", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0ed31cf24b9eef7bb", + "us-east-1": "snap-0fef1e9ba11e5acc4" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-3-12", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-12" + } + ] + } + ] } ] }, From 57bac81cedfe2de890de2f6d66f2291589be2045 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 15 Oct 2025 13:07:17 +0200 Subject: [PATCH 476/765] Dismiss popups only using find_element --- app/selenium_ui/base_page.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index cff6e289e..91811e7da 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -142,14 +142,10 @@ def __wait_until(self, expected_condition, locator, time_out=timeout): def dismiss_popup(self, popup_selectors): for selector_type, selector_value in popup_selectors: - if self.driver.find_elements(by=selector_type, value=selector_value): - try: - if selector_type == By.CSS_SELECTOR: - self.driver.execute_script(f"document.querySelector('{selector_value}').click()") - elif selector_type == By.XPATH: - self.driver.find_element(by=selector_type, value=selector_value).click() - except (WebDriverException, Exception): - pass + try: + self.driver.find_element(by=selector_type, value=selector_value).click() + except (WebDriverException, Exception): + pass def return_to_parent_frame(self): return self.driver.switch_to.parent_frame() From 4ceda93afbfb37f93e4802779d57707a7c61eee7 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 14:00:48 +0200 Subject: [PATCH 477/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 83b07c029..40849882a 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -188,6 +188,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-12" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-00fcc042a2a279cec", + "us-east-1": "snap-0468ef7ca249c13e3" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-12", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-12" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-064a6d96b09bd9d89", + "us-east-1": "snap-0607cc3ea10d8f744" + } + ] } ] } From 458048a0a84075b700b059200faaf8d540d137c8 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 15 Oct 2025 14:43:51 +0200 Subject: [PATCH 478/765] Dismiss what's new popup to be selected using xpath --- app/selenium_ui/base_page.py | 12 ++++++++---- app/selenium_ui/bitbucket/pages/selectors.py | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index 91811e7da..cff6e289e 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -142,10 +142,14 @@ def __wait_until(self, expected_condition, locator, time_out=timeout): def dismiss_popup(self, popup_selectors): for selector_type, selector_value in popup_selectors: - try: - self.driver.find_element(by=selector_type, value=selector_value).click() - except (WebDriverException, Exception): - pass + if self.driver.find_elements(by=selector_type, value=selector_value): + try: + if selector_type == By.CSS_SELECTOR: + self.driver.execute_script(f"document.querySelector('{selector_value}').click()") + elif selector_type == By.XPATH: + self.driver.find_element(by=selector_type, value=selector_value).click() + except (WebDriverException, Exception): + pass def return_to_parent_frame(self): return self.driver.switch_to.parent_frame() diff --git a/app/selenium_ui/bitbucket/pages/selectors.py b/app/selenium_ui/bitbucket/pages/selectors.py index bccd818ee..a023be017 100644 --- a/app/selenium_ui/bitbucket/pages/selectors.py +++ b/app/selenium_ui/bitbucket/pages/selectors.py @@ -87,7 +87,7 @@ class PopupLocators: (By.CSS_SELECTOR, ".css-1dqf51u"), (By.CSS_SELECTOR, ".css-1kflcxk"), (By.CSS_SELECTOR, ".css-1gh2dqy"), - (By.CSS_SELECTOR, "[data-testid='whats-new-modal'] button[aria-label='Close modal'] > span > span[aria-hidden='true']") + (By.XPATH, "//*[@data-testid='whats-new-modal']//button[@aria-label='Close modal']//span//span[@aria-hidden='true']") ] From 09e0bf82c064d3ad8f819784542804fd9f4f3ee0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 17:09:07 +0200 Subject: [PATCH 479/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 40849882a..95d632244 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -220,6 +220,31 @@ ] } ] + }, + { + "version": "11.0.1", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-00e4506605a9816f7", + "us-east-1": "snap-080d57b47b6f792be" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-11-0-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-11-0-1" + } + ] + } + ] } ] }, From 776ae24e4cb91fbefda87fd5a696e27b46382790 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 18:38:43 +0200 Subject: [PATCH 480/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 95d632244..6ac4dc211 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -243,6 +243,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-11-0-1" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-08b58d86b66c56e62", + "us-east-1": "snap-087c54ff2be1e3dec" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-11-0-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-11-0-1" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-049a5d6741dfce7ec", + "us-east-1": "snap-0513dbf6bb5bf162d" + } + ] } ] } From 9b95111cb6c777bd3aadf97fb99ef2010e01127f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 15 Oct 2025 20:04:26 +0200 Subject: [PATCH 481/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 6ac4dc211..a49528ebb 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -444,6 +444,31 @@ ] } ] + }, + { + "version": "10.3.12", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-085ee08f797710aa5", + "us-east-1": "snap-0663eb7e4f79e76ef" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-12", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-12" + } + ] + } + ] } ] }, From ee229bd7faa19611d29892a1ada644fb13ec1a31 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 16 Oct 2025 17:34:21 +0200 Subject: [PATCH 482/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a49528ebb..a9dedbe27 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -469,6 +469,31 @@ ] } ] + }, + { + "version": "11.0.1", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-05dc0bb94cd2ec1eb", + "us-east-1": "snap-04385c9cc2dbd753f" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-11-0-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-0-1" + } + ] + } + ] } ] }, From 428fd86f2a3717c4d855dd23de9c4763ec3d9a9a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 16 Oct 2025 21:53:44 +0200 Subject: [PATCH 483/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a9dedbe27..eb610864e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -492,6 +492,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-0-1" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0faa27f921b703cc1", + "us-east-1": "snap-00a7e983f03758d8f" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-11-0-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-11-0-1" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0ff64ea89c341050b", + "us-east-1": "snap-0f7cc06e81c642bef" + } + ] } ] } From c93859dd4972c2bfb28fa52c717a432858b8351d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 21 Oct 2025 11:17:57 +0200 Subject: [PATCH 484/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index eb610864e..3b35f1ff6 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -275,6 +275,31 @@ ] } ] + }, + { + "version": "9.12.28", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-01b34946a0c382028", + "us-east-1": "snap-02829ae02bc59d70e" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-12-28", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-28" + } + ] + } + ] } ] }, From 101c71b3465f2cb18c229d9249addbb869c0331f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 21 Oct 2025 14:18:35 +0200 Subject: [PATCH 485/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 3b35f1ff6..17b4a1bcd 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -298,6 +298,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-28" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-07a542154b712feb5", + "us-east-1": "snap-07fd1e4b12e5a71ba" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-12-28", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-12-28" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-04d5f07e4711dce9d", + "us-east-1": "snap-0fe73c9a61e6b8fe0" + } + ] } ] } From 06d19041afc2efacb628a2a5ea39cbd7ba1e0e2d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 21 Oct 2025 16:07:04 +0200 Subject: [PATCH 486/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 17b4a1bcd..98421e06c 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -579,6 +579,31 @@ ] } ] + }, + { + "version": "5.12.28", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0de35b536983cb6a0", + "us-east-1": "snap-05bc13add8392d287" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-12-28", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-28" + } + ] + } + ] } ] }, From 8429a56e30e024c7935873743dfe77ce4d25f6e3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 21 Oct 2025 20:44:14 +0200 Subject: [PATCH 487/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 98421e06c..b276ae255 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -602,6 +602,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-28" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-031b461ed66ce4072", + "us-east-1": "snap-05d14db5535435790" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-12-28", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-12-28" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-074b2b42e6bc32eff", + "us-east-1": "snap-032fe17b5668daae3" + } + ] } ] } From 3d3e362c779691e58c5912b3b0f51fd0e76a73a1 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 22 Oct 2025 07:00:55 +0200 Subject: [PATCH 488/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 4ff4bb0ef..e24e19bd8 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2a272b2b3844dd1c6cd7d281fae2ed5c1706eb59 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 22 Oct 2025 07:00:56 +0200 Subject: [PATCH 489/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 81dcc2267..1954e8566 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7c0abe68c6db814c1982d8cc6ed632c89cc87099 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 22 Oct 2025 07:00:57 +0200 Subject: [PATCH 490/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 655120036..881025cd4 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 331bea0dcc17e326778c61520345b56a98ca6bb7 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 22 Oct 2025 07:00:57 +0200 Subject: [PATCH 491/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 368081a69..aa5b17dbc 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c1d14a2907829ea7ba01ca52e0ae43c0ff28c6fa Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 22 Oct 2025 07:00:58 +0200 Subject: [PATCH 492/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index c28dbf019..2f9b198df 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.78" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2c70511fdcd3e07c19bca59790eed811cb64c5e3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 22 Oct 2025 12:30:03 +0200 Subject: [PATCH 493/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index b276ae255..e9538b06b 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -522,6 +522,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-12" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0f0acc5b92501d3f2", + "us-east-1": "snap-0e4a2ee1a253c16cf" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-12", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-12" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0880ab71d6fb059ff", + "us-east-1": "snap-0b5e8b65398ea8835" + } + ] } ] }, From b57a8f37471633657d6c04350615b945b3859ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 23 Oct 2025 10:15:14 +0200 Subject: [PATCH 494/765] Bumped jira and jsm versions in readme and tfvars files --- README.md | 4 ++-- app/util/k8s/dcapt-small.tfvars | 4 ++-- app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3b873b5e9..fbf0998dd 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): `9.12.26`, `10.3.9` and `11.0.0` Platform release + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.28`, `10.3.12` and `11.0.1` Platform release * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.26`, `10.3.9` and `11.0.0` Platform release + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.28`, `10.3.12` and `11.0.1` Platform release * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.25`, `9.2.7` and `10.0.2` Platform release diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 3cfdf3159..b594da7ae 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -89,10 +89,10 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version. -jira_version_tag = "10.3.9" +jira_version_tag = "10.3.12" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "10.3.9" +# jira_version_tag = "10.3.12" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large jira_dataset_size = "small" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index e616ff0df..198725aca 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -110,11 +110,11 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version -jira_version_tag = "10.3.9" +jira_version_tag = "10.3.12" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "10.3.9" +# jira_version_tag = "10.3.12" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large. jira_dataset_size = "large" From 687a6ea62e9616ea55fffecf7e4f4428a89016c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 23 Oct 2025 11:09:35 +0200 Subject: [PATCH 495/765] Removed old snapshots from dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 330 ------------------------------ 1 file changed, 330 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index e9538b06b..45f0ab677 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -1,171 +1,6 @@ { "jira": { "versions": [ - { - "version": "11.0.0", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-08e3207a378903af9", - "us-east-1": "snap-011dc45746e1b031f" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-11-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-11-0-0" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-02b3467b4ef62d1de", - "us-east-1": "snap-0f8f606dfa0e1d64c" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0c89728f1f06f468b", - "us-east-1": "snap-0e4557f9eb8eaa028" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-11-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-11-0-0" - } - ] - } - ] - }, - { - "version": "10.3.9", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-017509fc50eb04768", - "us-east-1": "snap-0ab4bdd491986fc89" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-9" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0f2bee7936a2ca5be", - "us-east-1": "snap-06b970d58c3c7fb84" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0e5f3f4eb9af010a7", - "us-east-1": "snap-0122ce86b761b0da6" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-3-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-9" - } - ] - } - ] - }, - { - "version": "9.12.26", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0b99312d8354fc853", - "us-east-1": "snap-0d81511fb2c645f74" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-12-26", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-12-26" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-07f68bc00441fa20a", - "us-east-1": "snap-02a9d5de2688b445a" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0eed11018011eb7cf", - "us-east-1": "snap-092a7493cb4f7d380" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-12-26", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-26" - } - ] - } - ] - }, { "version": "10.3.12", "data": [ @@ -335,171 +170,6 @@ }, "jsm": { "versions": [ - { - "version": "10.3.9", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0fbc03b69327c51b4", - "us-east-1": "snap-0b9c78d0b9fb6c5fd" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-9" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0a9cb888a9aca87f4", - "us-east-1": "snap-082d1560579871677" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-05c6a9371e9bb9079", - "us-east-1": "snap-0b57dd1344a288bdf" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-9" - } - ] - } - ] - }, - { - "version": "5.12.26", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-05fd357062cce59d1", - "us-east-1": "snap-0bc2c6d39c0048735" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-12-26", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-12-26" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-00fab858d38d6f877", - "us-east-1": "snap-0647afe4f1b860e71" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-01a774af37a46ffd1", - "us-east-1": "snap-0b3331407d7770056" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-12-26", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-26" - } - ] - } - ] - }, - { - "version": "11.0.0", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0dab31c3d6037487e", - "us-east-1": "snap-00a2693d189271ad6" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-11-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-11-0-0" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0d5216f4a62a16dc4", - "us-east-1": "snap-027bfaddbdc47f092" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-033d2033ff1a18568", - "us-east-1": "snap-0522bd67f65f3358c" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-11-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-0-0" - } - ] - } - ] - }, { "version": "10.3.12", "data": [ From f3e33239d6ce94abf26eb8d994eb3c49a546fe81 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 27 Oct 2025 14:25:34 +0100 Subject: [PATCH 496/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 45f0ab677..a2ed164e2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -506,6 +506,32 @@ } ], "build_number": "9111" + }, + { + "version": "8.5.27", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0c5dad155cdd41b16", + "us-east-1": "snap-04da4b0c67e90b8ff" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-27", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-27" + } + ] + } + ], + "build_number": "19288" } ] }, From bf7fdb747ff92cd519c25a57050bf61f964d04e6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 28 Oct 2025 14:36:26 +0100 Subject: [PATCH 497/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a2ed164e2..50d29d816 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -671,6 +671,31 @@ ] } ] + }, + { + "version": "10.0.1", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-03d8b3154a0e9e556", + "us-east-1": "snap-004df1ae00ed2c18a" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-10-0-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-10-0-1" + } + ] + } + ] } ] }, From d35ff3a743d3e0294bec5a0a9aa2a04564bc5e7e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 28 Oct 2025 15:51:40 +0100 Subject: [PATCH 498/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 50d29d816..ec51bec5a 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -529,6 +529,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-27" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0abfa0bbf979caaf5", + "us-east-1": "snap-0dcb31cdbc1e314c9" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-27", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-27" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0c27220649852b62f", + "us-east-1": "snap-0d9beabf3b6e1ee48" + } + ] } ], "build_number": "19288" From 688112af84ee11651ec6a9c424870fe3cf3d3b52 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 28 Oct 2025 16:02:40 +0100 Subject: [PATCH 499/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ec51bec5a..70ec01ece 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -724,6 +724,26 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-10-0-1" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0760e512fac94a904", + "us-east-1": "snap-060ecf1efa68d59ea" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-10-0-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-10-0-1" + } + ] } ] } From 1f71bfe926ee396365a03f85bb9e8ffa9b997239 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 28 Oct 2025 16:46:17 +0100 Subject: [PATCH 500/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 70ec01ece..cfd80c14b 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -562,6 +562,32 @@ } ], "build_number": "19288" + }, + { + "version": "9.2.9", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-02b1a8167293c43c0", + "us-east-1": "snap-000a5935271a812ae" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-9" + } + ] + } + ], + "build_number": "21745" } ] }, From b41a642d05c69dc71f757f8aa09e5bd6a75cd648 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 28 Oct 2025 23:16:20 +0100 Subject: [PATCH 501/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index cfd80c14b..e36b91893 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -585,6 +585,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-9" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-07c1b9e605542dfbc", + "us-east-1": "snap-0b2c4e56ad010fa2b" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-9" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0a2d80f165cddaaef", + "us-east-1": "snap-076df216e104fc6dd" + } + ] } ], "build_number": "21745" From 53a9d92c35ce9a66bb15c83a47d85bdf961f1f20 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Oct 2025 06:01:01 +0100 Subject: [PATCH 502/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index e24e19bd8..1c1146cac 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From de45bf7683404c55a9f63de7ae0ca394ded825eb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Oct 2025 06:01:02 +0100 Subject: [PATCH 503/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 1954e8566..460ef9889 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 64f07b94d877af47fdec3de4a81796a4b6c370d5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Oct 2025 06:01:03 +0100 Subject: [PATCH 504/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 881025cd4..41fd80f02 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 3286b79461526a2ef8ec88def79519430cf1c48f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Oct 2025 06:01:04 +0100 Subject: [PATCH 505/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index aa5b17dbc..1132b53b1 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2c12d39590d49310636117419b1e8cf67b14400b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Oct 2025 06:01:05 +0100 Subject: [PATCH 506/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 2f9b198df..9ce7a9b76 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "141.0.7390.122" # Supports Chrome version 141. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 37d7f4bd431b1509b64c7a81c9413e98bc039f9a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Oct 2025 09:01:03 +0100 Subject: [PATCH 507/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index e36b91893..201ac884a 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -618,6 +618,32 @@ } ], "build_number": "21745" + }, + { + "version": "10.0.3", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0a08f33696cd4bef8", + "us-east-1": "snap-00fc2a9ce135c3858" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-0-3", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-3" + } + ] + } + ], + "build_number": "22975" } ] }, From 10d6759d6404d23e1f13d61e735a013ba43f3a45 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 29 Oct 2025 15:08:47 +0100 Subject: [PATCH 508/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 201ac884a..88ad98373 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -641,6 +641,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-3" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-02b2b5412a61709ab", + "us-east-1": "snap-0d19cd2b4845ad031" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-0-3", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-0-3" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0cdcdf0aa6d185d35", + "us-east-1": "snap-0f5d796dbd8a9bb18" + } + ] } ], "build_number": "22975" From 938d0725f732ab9b30929e43d79d0cb147fff0d7 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 29 Oct 2025 15:42:11 +0100 Subject: [PATCH 509/765] Bump confluence versions --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 168 ------------------------------ app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 3 insertions(+), 171 deletions(-) diff --git a/README.md b/README.md index fbf0998dd..666ee4bdd 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): `5.12.28`, `10.3.12` and `11.0.1` Platform release * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.25`, `9.2.7` and `10.0.2` Platform release + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.27`, `9.2.9` and `10.0.3` Platform release * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21`, `9.4.9` and `10.0.0` Platform release diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index b594da7ae..84c92326d 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -161,7 +161,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "9.2.7" +confluence_version_tag = "9.2.9" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 88ad98373..7f70fee3e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -339,174 +339,6 @@ }, "confluence": { "versions": [ - { - "version": "10.0.2", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-017dab74a941fbbeb", - "us-east-1": "snap-094ed2d0367fb59a7" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-0-2", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-2" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0bcc0788c941674f9", - "us-east-1": "snap-091e65ed2d988152e" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-0-2", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-0-2" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-07381978e5107d22b", - "us-east-1": "snap-0478bb092072029fc" - } - ] - } - ], - "build_number": "9304" - }, - { - "version": "8.5.25", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-09f3d45f0666c5113", - "us-east-1": "snap-0fcb8d0279ce0fdca" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-25", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-25" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0267a462e98ffdaec", - "us-east-1": "snap-0c7c80285157c1fe1" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-25", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-25" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0fc33474a6932eef4", - "us-east-1": "snap-088774c9ef2b58e6a" - } - ] - } - ], - "build_number": "9012" - }, - { - "version": "9.2.7", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-03e57c101b20ed9d3", - "us-east-1": "snap-06abd6daddb85ddda" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-7", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-7" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0bc9a48fd61f74d3a", - "us-east-1": "snap-060fd8cc29bddccf3" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-7", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-7" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-01bdd9c9fc5523492", - "us-east-1": "snap-0be4fdf8be3458f66" - } - ] - } - ], - "build_number": "9111" - }, { "version": "8.5.27", "data": [ diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 198725aca..484669624 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -172,7 +172,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "9.2.7" +confluence_version_tag = "9.2.9" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "large" From c5e7d780214b9160f62870add79ae038f4dd2e10 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 30 Oct 2025 13:30:26 +0100 Subject: [PATCH 510/765] Use same number of threads as number of cores for data preparation --- app/util/api/crowd_clients.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/api/crowd_clients.py b/app/util/api/crowd_clients.py index 5f51e6651..9be32e6f6 100644 --- a/app/util/api/crowd_clients.py +++ b/app/util/api/crowd_clients.py @@ -71,7 +71,7 @@ def search_users(i): return loop_users num_cores = cpu_count() - pool = ThreadPool(processes=num_cores*2) + pool = ThreadPool(processes=num_cores) loop_users_list = pool.map(search_users, [i for i in range(loop_count)]) print("") # new line users = [user for loop_users in loop_users_list for user in loop_users] From 93a3b8c8da3baa795b0cc372cf6b18d56144a249 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 Oct 2025 12:41:33 +0000 Subject: [PATCH 511/765] Update dependency commons-codec:commons-codec to v1.19.0 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 0e877105a..86fb271f6 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -92,7 +92,7 @@ commons-codec commons-codec - 1.18.0 + 1.19.0 org.apache.logging.log4j From 113bc82657e202efd99fb3bb8378fcdefbe508e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 30 Oct 2025 16:48:46 +0100 Subject: [PATCH 512/765] Bump bamboo versions --- README.md | 2 +- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 666ee4bdd..cfcd963c8 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.0.1` * Supported Bamboo versions: - * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.7` + * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.9` ## Support In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 0e877105a..c03988415 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 10.2.7 + 10.2.9 diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 484669624..805a4775c 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -399,8 +399,8 @@ crowd_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] # By default, latest supported by DCAPT version is set. # https://hub.docker.com/r/atlassian/bamboo/tags # https://hub.docker.com/r/atlassian/bamboo-agent-base/tags -bamboo_version_tag = "10.2.7" -bamboo_agent_version_tag = "10.2.7" +bamboo_version_tag = "10.2.9" +bamboo_agent_version_tag = "10.2.9" # Helm chart version of Bamboo and Bamboo agent instances # bamboo_helm_chart_version = "" From f0a909d8182862d7dc898d551b70aee6abec132a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 Oct 2025 15:54:37 +0000 Subject: [PATCH 513/765] Update dependency com.atlassian.bamboo:bamboo-specs-parent to v10.2.9 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 86fb271f6..fe44352ad 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 10.2.7 + 10.2.9 From 377b01881f5f1099f41b2c936ec02bd7cb672437 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 Oct 2025 15:54:53 +0000 Subject: [PATCH 514/765] Update dependency com.google.guava:guava to v33.5.0-jre --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 86fb271f6..8d0720952 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -62,7 +62,7 @@ com.google.guava guava - 33.4.8-jre + 33.5.0-jre com.fasterxml.jackson.core From 451526c5f12547c4fba422c9f6b61a71e5112fa5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 Oct 2025 15:59:34 +0000 Subject: [PATCH 515/765] Update jackson monorepo to v2.20.0 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index edb63c12d..98c7bc83b 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -67,12 +67,12 @@ com.fasterxml.jackson.core jackson-core - 2.19.2 + 2.20.0 com.fasterxml.jackson.core jackson-databind - 2.19.2 + 2.20.0 com.jayway.jsonpath From f15428cd3bf9f03a2f0f513a32bd0498ab03f28c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 30 Oct 2025 17:52:37 +0100 Subject: [PATCH 516/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 7f70fee3e..68c6608fb 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -720,6 +720,32 @@ } ], "build_number": "2407" + }, + { + "version": "7.1.0", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0fce9e4ed6ed58794", + "us-east-1": "snap-0f2122473e0455894" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-7-1-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-7-1-0" + } + ] + } + ], + "build_number": "2500" } ] } From 9508958c8ea72d649aaf146f7ad2ca7e289c074e Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 30 Oct 2025 17:58:06 +0100 Subject: [PATCH 517/765] Bump crowd version --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 26 -------------------------- app/util/k8s/dcapt.tfvars | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 666ee4bdd..5bd9a1ab2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21`, `9.4.9` and `10.0.0` Platform release * Supported Crowd versions: - * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.0.1` + * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.1.0` * Supported Bamboo versions: * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.7` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 68c6608fb..28e183607 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -695,32 +695,6 @@ }, "crowd": { "versions": [ - { - "version": "7.0.1", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0ee4c05ba890fb379", - "us-east-1": "snap-021f3b69d9e2e1160" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-7-0-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-7-0-1" - } - ] - } - ], - "build_number": "2407" - }, { "version": "7.1.0", "data": [ diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 484669624..71c0673ee 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -335,7 +335,7 @@ bitbucket_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -crowd_version_tag = "7.0.1" +crowd_version_tag = "7.1.0" # Helm chart version of Crowd and Crowd agent instances. By default the latest version is installed. # crowd_helm_chart_version = "" From 05d671c0e12631a2772e6a5b58a35dbd7c6985ad Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 31 Oct 2025 11:24:44 +0100 Subject: [PATCH 518/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 28e183607..e84c84f27 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -690,6 +690,31 @@ ] } ] + }, + { + "version": "8.19.24", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0ce99f571499433ba", + "us-east-1": "snap-03da486f36a53f108" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-24", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-24" + } + ] + } + ] } ] }, From ee65dc3571055e2f2636cb2865c5a895c199b56a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 31 Oct 2025 12:49:21 +0100 Subject: [PATCH 519/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index e84c84f27..ef442d926 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -713,6 +713,26 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-24" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-09d75beb905d1da6f", + "us-east-1": "snap-02cd4b6b42ee5cd89" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-19-24", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-19-24" + } + ] } ] } From 9c3a049fbea5911506d56f2e8df687e501c02283 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 31 Oct 2025 14:20:51 +0100 Subject: [PATCH 520/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef442d926..6f8bec8ae 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -735,6 +735,31 @@ ] } ] + }, + { + "version": "9.4.12", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0dc86ba7060d61b7d", + "us-east-1": "snap-0abdf3cec6e151b12" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-9-4-12", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-4-12" + } + ] + } + ] } ] }, From 73fb1232f912e3582a7cea41f676fc5d387f32e9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 31 Oct 2025 16:51:59 +0100 Subject: [PATCH 521/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 6f8bec8ae..15ef11570 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -758,6 +758,26 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-4-12" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-033d7ed424cd6d6d5", + "us-east-1": "snap-005a067ddf7bebcc2" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-4-12", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-4-12" + } + ] } ] } From 79183546bb0a4cb1f4b6ea22f24d204c50a44d77 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 Oct 2025 16:07:38 +0000 Subject: [PATCH 522/765] Update log4j2 monorepo to v2.25.2 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 98c7bc83b..cb3e02117 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -97,17 +97,17 @@ org.apache.logging.log4j log4j-api - 2.25.1 + 2.25.2 org.apache.logging.log4j log4j-core - 2.25.1 + 2.25.2 org.apache.logging.log4j log4j-slf4j-impl - 2.25.1 + 2.25.2 From ed3ceeebaa51d7f3629796337d8097d2022c48a9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 Oct 2025 16:07:48 +0000 Subject: [PATCH 523/765] Update dependency org.codehaus.mojo:exec-maven-plugin to v3.6.2 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 98c7bc83b..3d5053c9b 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -18,7 +18,7 @@ org.codehaus.mojo exec-maven-plugin - 3.5.1 + 3.6.2 From 3416e8c427948366e27d21be31029d43b7a6e140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Mon, 3 Nov 2025 08:53:10 +0100 Subject: [PATCH 524/765] Bump bitbucket versions --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 135 ------------------------------ app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 3 insertions(+), 138 deletions(-) diff --git a/README.md b/README.md index 5bd9a1ab2..153ef0c3e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.27`, `9.2.9` and `10.0.3` Platform release * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21`, `9.4.9` and `10.0.0` Platform release + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.24`, `9.4.12` and `10.0.1` Platform release * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.1.0` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 84c92326d..8eae43f07 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -238,7 +238,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "9.4.9" +bitbucket_version_tag = "9.4.12" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 15ef11570..a82781e84 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -511,141 +511,6 @@ }, "bitbucket": { "versions": [ - { - "version": "8.19.21", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0f580b0d5fd40147d", - "us-east-1": "snap-02cc4ee1bc0619cce" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-19-21", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-19-21" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-05e1f7ce5dd96366f", - "us-east-1": "snap-00459b2652e4b80a7" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-21", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-21" - } - ] - } - ] - }, - { - "version": "9.4.9", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0ee236de97b56c8d2", - "us-east-1": "snap-07f51188c754cd6a4" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-4-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-4-9" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-07aff525deaffc951", - "us-east-1": "snap-077ad693ccb14d246" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-9-4-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-4-9" - } - ] - } - ] - }, - { - "version": "10.0.0", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0a3d7df78866f0395", - "us-east-1": "snap-09009c3b2ff880868" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-10-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-10-0-0" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0829c531bb2b36e62", - "us-east-1": "snap-01624c96e7a946c92" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-10-0-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-10-0-0" - } - ] - } - ] - }, { "version": "10.0.1", "data": [ diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 71c0673ee..379672199 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -247,7 +247,7 @@ confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "9.4.9" +bitbucket_version_tag = "9.4.12" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large bitbucket_dataset_size = "large" From 5b207df30bbcc874943dae73b34d0338bb15c757 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 3 Nov 2025 13:29:42 +0100 Subject: [PATCH 525/765] Restore previous Confluence snapshots --- app/util/k8s/dcapt-snapshots.json | 72 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a82781e84..48110d8c2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -340,15 +340,15 @@ "confluence": { "versions": [ { - "version": "8.5.27", + "version": "10.0.2", "data": [ { "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "snap-0c5dad155cdd41b16", - "us-east-1": "snap-04da4b0c67e90b8ff" + "us-east-2": "snap-017dab74a941fbbeb", + "us-east-1": "snap-094ed2d0367fb59a7" } ] }, @@ -357,8 +357,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-27", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-27" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-0-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-2" } ] }, @@ -367,8 +367,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0abfa0bbf979caaf5", - "us-east-1": "snap-0dcb31cdbc1e314c9" + "us-east-2": "snap-0bcc0788c941674f9", + "us-east-1": "snap-091e65ed2d988152e" } ] }, @@ -377,8 +377,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-27", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-27" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-0-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-0-2" } ] }, @@ -387,24 +387,24 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0c27220649852b62f", - "us-east-1": "snap-0d9beabf3b6e1ee48" + "us-east-2": "snap-07381978e5107d22b", + "us-east-1": "snap-0478bb092072029fc" } ] } ], - "build_number": "19288" + "build_number": "9304" }, { - "version": "9.2.9", + "version": "8.5.25", "data": [ { "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "snap-02b1a8167293c43c0", - "us-east-1": "snap-000a5935271a812ae" + "us-east-2": "snap-09f3d45f0666c5113", + "us-east-1": "snap-0fcb8d0279ce0fdca" } ] }, @@ -413,8 +413,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-9" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-25", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-25" } ] }, @@ -423,8 +423,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-07c1b9e605542dfbc", - "us-east-1": "snap-0b2c4e56ad010fa2b" + "us-east-2": "snap-0b3fe55198bfc4f25", + "us-east-1": "snap-0eaf3be3c40ffb386" } ] }, @@ -433,8 +433,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-9" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-25", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-25" } ] }, @@ -443,24 +443,24 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0a2d80f165cddaaef", - "us-east-1": "snap-076df216e104fc6dd" + "us-east-2": "snap-008cba8bcec435740", + "us-east-1": "snap-0d4cd0bf9032b67cc" } ] } ], - "build_number": "21745" + "build_number": "9012" }, { - "version": "10.0.3", + "version": "9.2.7", "data": [ { "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "snap-0a08f33696cd4bef8", - "us-east-1": "snap-00fc2a9ce135c3858" + "us-east-2": "snap-03e57c101b20ed9d3", + "us-east-1": "snap-06abd6daddb85ddda" } ] }, @@ -469,8 +469,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-0-3", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-3" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-7", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-7" } ] }, @@ -479,8 +479,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-02b2b5412a61709ab", - "us-east-1": "snap-0d19cd2b4845ad031" + "us-east-2": "snap-0bc9a48fd61f74d3a", + "us-east-1": "snap-060fd8cc29bddccf3" } ] }, @@ -489,8 +489,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-0-3", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-0-3" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-7", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-7" } ] }, @@ -499,13 +499,13 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0cdcdf0aa6d185d35", - "us-east-1": "snap-0f5d796dbd8a9bb18" + "us-east-2": "snap-01bdd9c9fc5523492", + "us-east-1": "snap-0be4fdf8be3458f66" } ] } ], - "build_number": "22975" + "build_number": "9111" } ] }, From 1905dd837ef28530df83d12b4ce528d557b1637c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 12:33:15 +0000 Subject: [PATCH 526/765] Update jackson monorepo to v2.20.1 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 14d31ea8f..df0ae2d3e 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -67,12 +67,12 @@ com.fasterxml.jackson.core jackson-core - 2.20.0 + 2.20.1 com.fasterxml.jackson.core jackson-databind - 2.20.0 + 2.20.1 com.jayway.jsonpath From 8f0ba23eb06268289decbdc5d7ff6343145049a9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 12:33:19 +0000 Subject: [PATCH 527/765] Update dependency com.jayway.jsonpath:json-path to v2.10.0 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 14d31ea8f..316bd2838 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -77,7 +77,7 @@ com.jayway.jsonpath json-path - 2.9.0 + 2.10.0 net.minidev From d9b8cc3fcc0dcfa9ba57d8263cc29f26d11d7187 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 3 Nov 2025 16:28:54 +0100 Subject: [PATCH 528/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 48110d8c2..90fc385e9 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -506,6 +506,32 @@ } ], "build_number": "9111" + }, + { + "version": "10.0.3", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-07e33cfa23eff9943", + "us-east-1": "snap-01a79a0f5a6368e83" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-0-3", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-3" + } + ] + } + ], + "build_number": "9304" } ] }, From 51f891e219d2ab54affb70fa6f2edf57106a1758 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 3 Nov 2025 17:20:03 +0100 Subject: [PATCH 529/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 90fc385e9..0b5e44b70 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -532,6 +532,32 @@ } ], "build_number": "9304" + }, + { + "version": "8.5.27", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-00ca731968c64e1e2", + "us-east-1": "snap-077a8e89862171dbc" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-27", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-27" + } + ] + } + ], + "build_number": "9012" } ] }, From 0b70624ac048b1e0f2a9f39ee32586f9de3aaf31 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 3 Nov 2025 17:22:24 +0100 Subject: [PATCH 530/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 0b5e44b70..2735c996a 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -558,6 +558,32 @@ } ], "build_number": "9012" + }, + { + "version": "9.2.9", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-076742658a22f1dbd", + "us-east-1": "snap-03472b3f05e7f5bfc" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-9" + } + ] + } + ], + "build_number": "9111" } ] }, From 60b80464849293bbccc5dbf00c9c8fda64f4c279 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 3 Nov 2025 17:35:20 +0100 Subject: [PATCH 531/765] Restore previous Confluence 8.5.25 snapshots --- app/util/k8s/dcapt-snapshots.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 2735c996a..a66065693 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -423,8 +423,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-0b3fe55198bfc4f25", - "us-east-1": "snap-0eaf3be3c40ffb386" + "us-east-2": "snap-0267a462e98ffdaec", + "us-east-1": "snap-0c7c80285157c1fe1" } ] }, @@ -443,8 +443,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-008cba8bcec435740", - "us-east-1": "snap-0d4cd0bf9032b67cc" + "us-east-2": "snap-0fc33474a6932eef4", + "us-east-1": "snap-088774c9ef2b58e6a" } ] } From c5eca611369dea58d01f2e8a02ed454e145b7662 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 4 Nov 2025 08:48:41 +0100 Subject: [PATCH 532/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a66065693..e339079ce 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -529,6 +529,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-3" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-02334c2ccfc49a306", + "us-east-1": "snap-0f9f1510ae5c335bc" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-0-3", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-0-3" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-02e8158dcedd57722", + "us-east-1": "snap-04a5fcd6fd282e183" + } + ] } ], "build_number": "9304" From d8dd54a0a1264175f123b5fcd9a4fced8bf08a54 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 4 Nov 2025 15:17:47 +0100 Subject: [PATCH 533/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index e339079ce..db5e4e438 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -611,6 +611,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-9" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0c05810642150a381", + "us-east-1": "snap-0813a01df87065be2" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-9", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-9" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0571f817c05b4097d", + "us-east-1": "snap-067e27a8a1df50e42" + } + ] } ], "build_number": "9111" From ae5882731053d2a24c7eb41005b9cd7114d3823d Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 4 Nov 2025 19:16:42 +0100 Subject: [PATCH 534/765] Created shared-home snapshots with app signing disabled for Confluence 10 --- app/util/k8s/dcapt-snapshots.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index db5e4e438..1e07bd2b2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -515,8 +515,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-07e33cfa23eff9943", - "us-east-1": "snap-01a79a0f5a6368e83" + "us-east-2": "snap-0ce01eb9097aa636c", + "us-east-1": "snap-07108e7230c9688f8" } ] }, @@ -535,8 +535,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-02334c2ccfc49a306", - "us-east-1": "snap-0f9f1510ae5c335bc" + "us-east-2": "snap-097a3bbe8f68e13ee", + "us-east-1": "snap-006d84c546c0e8677" } ] }, From bf7749f520c4e83fd5e7245643900a99db910c6e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 5 Nov 2025 00:10:56 +0100 Subject: [PATCH 535/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 1e07bd2b2..011d71d65 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -585,6 +585,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-27" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-077829db18893ab66", + "us-east-1": "snap-038266b2049f9b3eb" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-27", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-27" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0665d86d443de97e3", + "us-east-1": "snap-089afbfd299a0aac4" + } + ] } ], "build_number": "9012" From c5c933115cf93af0f0154abc3e9714ef4a2f3ff8 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 5 Nov 2025 08:14:11 +0100 Subject: [PATCH 536/765] Remove old Confluence snapshots --- app/util/k8s/dcapt-snapshots.json | 168 ------------------------------ 1 file changed, 168 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 011d71d65..2ae8c29a2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -339,174 +339,6 @@ }, "confluence": { "versions": [ - { - "version": "10.0.2", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-017dab74a941fbbeb", - "us-east-1": "snap-094ed2d0367fb59a7" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-0-2", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-2" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0bcc0788c941674f9", - "us-east-1": "snap-091e65ed2d988152e" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-0-2", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-0-2" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-07381978e5107d22b", - "us-east-1": "snap-0478bb092072029fc" - } - ] - } - ], - "build_number": "9304" - }, - { - "version": "8.5.25", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-09f3d45f0666c5113", - "us-east-1": "snap-0fcb8d0279ce0fdca" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-25", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-25" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0267a462e98ffdaec", - "us-east-1": "snap-0c7c80285157c1fe1" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-25", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-25" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0fc33474a6932eef4", - "us-east-1": "snap-088774c9ef2b58e6a" - } - ] - } - ], - "build_number": "9012" - }, - { - "version": "9.2.7", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-03e57c101b20ed9d3", - "us-east-1": "snap-06abd6daddb85ddda" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-7", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-7" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0bc9a48fd61f74d3a", - "us-east-1": "snap-060fd8cc29bddccf3" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-7", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-7" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-01bdd9c9fc5523492", - "us-east-1": "snap-0be4fdf8be3458f66" - } - ] - } - ], - "build_number": "9111" - }, { "version": "10.0.3", "data": [ From 2c4c4fb78f9040b9e0c0de638aa44d63f100d897 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 6 Nov 2025 06:01:31 +0100 Subject: [PATCH 537/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 1c1146cac..bb8bc9ca2 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a3cab0b110bf2e5dfbc1ebf3f79abcf35ef010da Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 6 Nov 2025 06:01:32 +0100 Subject: [PATCH 538/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 460ef9889..60fad8edd 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 117ed16e1e4d63472bb7bf872af3d260ba30d72f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 6 Nov 2025 06:01:33 +0100 Subject: [PATCH 539/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 41fd80f02..1b8eebc11 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 88c559ad4a875cc72330d5b9dedb44556fdbee29 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 6 Nov 2025 06:01:34 +0100 Subject: [PATCH 540/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 1132b53b1..91a62e1d6 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From de8118d4272fd484eda2b7079412615505d62a8c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 6 Nov 2025 06:01:35 +0100 Subject: [PATCH 541/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 9ce7a9b76..2726a7645 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.59" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7a7027030d9fcc7068309474d316d64109a3a4db Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 6 Nov 2025 09:36:18 +0100 Subject: [PATCH 542/765] New Jira 11 small snapshots with app signing disabled --- app/util/k8s/dcapt-snapshots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 2ae8c29a2..e150526d3 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -64,8 +64,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-00e4506605a9816f7", - "us-east-1": "snap-080d57b47b6f792be" + "us-east-2": "snap-024621e28f539ea71", + "us-east-1": "snap-03d4930514bda5fa1" } ] }, From a0c1eb858024f839f4895d4f493b69ec0b39dcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 6 Nov 2025 09:50:59 +0100 Subject: [PATCH 543/765] added jvm arg to prevent app signing error --- app/util/k8s/dcapt.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 3749e9df0..3c75f9a8f 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -479,7 +479,7 @@ bamboo_dataset_url = "https://centaurus-datasets.s3.amazonaws.com/bamboo/dcapt-b # A list of JVM arguments to be passed to the server. Defaults to an empty list. # Example: ["-Dproperty=value", "-Dproperty1=value1"] -bamboo_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] +bamboo_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true", "-Datlassian.upm.signature.check.disabled=true", "-Datlassian.upm.config.loosecheck.allowed=true"] ################################################################################ # Monitoring settings From bb6c7623a8213070920f0efaccc246531ffeefb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 6 Nov 2025 10:54:36 +0100 Subject: [PATCH 544/765] Removed redundant jvm argument --- app/util/k8s/dcapt.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 3c75f9a8f..0917d911d 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -479,7 +479,7 @@ bamboo_dataset_url = "https://centaurus-datasets.s3.amazonaws.com/bamboo/dcapt-b # A list of JVM arguments to be passed to the server. Defaults to an empty list. # Example: ["-Dproperty=value", "-Dproperty1=value1"] -bamboo_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true", "-Datlassian.upm.signature.check.disabled=true", "-Datlassian.upm.config.loosecheck.allowed=true"] +bamboo_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true", "-Datlassian.upm.config.loosecheck.allowed=true"] ################################################################################ # Monitoring settings From 8f3f576fd96cbb1cf66d2396dab79de1dfdf8d89 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 6 Nov 2025 10:55:49 +0100 Subject: [PATCH 545/765] Bump terraform image version in docs --- ...apps-performance-toolkit-user-guide-bamboo.md | 8 ++++---- ...s-performance-toolkit-user-guide-bitbucket.md | 16 ++++++++-------- ...-performance-toolkit-user-guide-confluence.md | 16 ++++++++-------- ...-apps-performance-toolkit-user-guide-crowd.md | 14 +++++++------- ...c-apps-performance-toolkit-user-guide-jira.md | 16 ++++++++-------- ...dc-apps-performance-toolkit-user-guide-jsm.md | 16 ++++++++-------- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index c85b0b041..7fbab23d7 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -102,7 +102,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. @@ -303,7 +303,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -334,7 +334,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -368,7 +368,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index f3e59d230..b0358010a 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -115,7 +115,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -319,7 +319,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -394,7 +394,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -425,7 +425,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -475,7 +475,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -500,7 +500,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -513,7 +513,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -542,7 +542,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index 01b6aa8d3..f69e12ddc 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -474,7 +474,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -504,7 +504,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index df6862e96..9df5dc09a 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -97,7 +97,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -208,7 +208,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -237,7 +237,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -296,7 +296,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -320,7 +320,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -347,7 +347,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -390,7 +390,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index c0585543f..5ed6db6b2 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -122,7 +122,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -423,7 +423,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -498,7 +498,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -550,7 +550,7 @@ The re-index time for Jira is about ~50-70 minutes. -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -636,7 +636,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -649,7 +649,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -678,7 +678,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 96e842b40..4501dd44f 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -124,7 +124,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -459,7 +459,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -539,7 +539,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -594,7 +594,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -679,7 +679,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.10 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -692,7 +692,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -721,7 +721,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.10 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From 66a9760b6f17b4066c1c3ae4f97f302764bdbf98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 6 Nov 2025 11:25:29 +0100 Subject: [PATCH 546/765] Bump requirements versions --- requirements.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 61356cd8e..c4dbc6d68 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ -matplotlib==3.10.5 -pandas==2.3.2 -pytest==8.4.1 -locust==2.39.0 -selenium==4.35.0 -filelock==3.19.1 +matplotlib==3.10.7 +pandas==2.3.3 +pytest==8.4.2 +locust==2.42.1 +selenium==4.38.0 +filelock==3.20.0 packaging==25.0 prettytable==3.16.0 -bzt==1.16.45 -boto3==1.40.16 +bzt==1.16.46 +boto3==1.40.67 retry==0.9.2 apiritif==1.1.3 pytest-xdist==3.8.0 \ No newline at end of file From dddf1bf8f41b9256c9e450bead08f8c3814e4562 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 6 Nov 2025 13:29:18 +0100 Subject: [PATCH 547/765] Bump selenium version in yml files --- 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 bb8bc9ca2..cff297439 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -53,7 +53,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.35.0 + - selenium==4.38.0 execution: - scenario: jmeter executor: jmeter diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 1b8eebc11..4847c8106 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -39,7 +39,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.35.0 + - selenium==4.38.0 execution: - scenario: ${load_executor} concurrency: ${concurrency} diff --git a/app/confluence.yml b/app/confluence.yml index 60fad8edd..3eead4472 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -54,7 +54,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.35.0 + - selenium==4.38.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jira.yml b/app/jira.yml index 91a62e1d6..c5da25f84 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -54,7 +54,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.35.0 + - selenium==4.38.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jsm.yml b/app/jsm.yml index 2726a7645..b18654b17 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -69,7 +69,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.35.0 + - selenium==4.38.0 execution: - scenario: ${load_executor}_agents executor: ${load_executor} From d0a71fe2fe90dced4fb232418c9d0b64f20b5d0e Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 6 Nov 2025 14:59:40 +0100 Subject: [PATCH 548/765] Update docs timestamp --- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-bitbucket.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 2 +- 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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 7fbab23d7..e1597a6bb 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: "2025-09-11" +date: "2025-11-06" --- # 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 b0358010a..72eb93d8b 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: "2025-09-11" +date: "2025-11-06" --- # 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 f69e12ddc..b9140e7ca 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: "2025-09-11" +date: "2025-11-06" --- # Data Center App Performance Toolkit User Guide For Confluence diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 9df5dc09a..9c0fd11d6 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: "2025-09-11" +date: "2025-11-06" --- # 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 5ed6db6b2..bd8bb5da7 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: "2025-09-11" +date: "2025-11-06" --- # 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 4501dd44f..61fee9f87 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: "2025-09-11" +date: "2025-11-06" --- # Data Center App Performance Toolkit User Guide For Jira Service Management From 72d499e216ffab154565f08ebecb72270068b0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 6 Nov 2025 15:18:20 +0100 Subject: [PATCH 549/765] fixed jvm arg --- app/util/k8s/dcapt.tfvars | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 0917d911d..b0fa441b8 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -390,7 +390,7 @@ crowd_db_master_password = "Password1!" # A list of JVM arguments to be passed to the server. Defaults to an empty list. # Example: ["-Dproperty=value", "-Dproperty1=value1"] -crowd_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] +crowd_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true", "-Datlassian.upm.config.loosecheck.allowed=true"] ################################################################################ # Bamboo Settings @@ -479,7 +479,7 @@ bamboo_dataset_url = "https://centaurus-datasets.s3.amazonaws.com/bamboo/dcapt-b # A list of JVM arguments to be passed to the server. Defaults to an empty list. # Example: ["-Dproperty=value", "-Dproperty1=value1"] -bamboo_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true", "-Datlassian.upm.config.loosecheck.allowed=true"] +bamboo_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Monitoring settings From fa2b9bf46a8081effe1278504811addad9408144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 6 Nov 2025 15:20:55 +0100 Subject: [PATCH 550/765] change allow_analytics for release --- 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 cff297439..80e15b7ac 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for JMeter load executor view_all_builds: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 4847c8106..56eef598a 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. diff --git a/app/confluence.yml b/app/confluence.yml index 3eead4472..7a9081e3b 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. extended_metrics: False # Action percentage for JMeter and Locust load executors diff --git a/app/crowd.yml b/app/crowd.yml index 8d90b55ff..ebb999f12 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index c5da25f84..dd746f9eb 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors create_issue: 4 diff --git a/app/jsm.yml b/app/jsm.yml index b18654b17..778c28482 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 From 3f2a0a94e30723e6775cb84017c3b30c57ffa39a Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 6 Nov 2025 15:50:33 +0100 Subject: [PATCH 551/765] Update toolkit supported version --- app/util/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/conf.py b/app/util/conf.py index ff5686bff..d550e0360 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -2,8 +2,8 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML -TOOLKIT_VERSION = '8.9.0' -UNSUPPORTED_VERSION = '8.5.0' +TOOLKIT_VERSION = '8.10.0' +UNSUPPORTED_VERSION = '8.6.0' def read_yml_file(file): From 7bf7da073d0df4f8d353c1c8882234684691987b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 12 Nov 2025 06:00:57 +0100 Subject: [PATCH 552/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index cff297439..d707df9f0 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 70eadc1fd60a9b08631cbd57e8d7699b30fd530f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 12 Nov 2025 06:00:58 +0100 Subject: [PATCH 553/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 3eead4472..8f2c2a47d 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From da53e745f7a7d95441239e5f3a74cb6ba33dc481 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 12 Nov 2025 06:00:59 +0100 Subject: [PATCH 554/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 4847c8106..02da8c748 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 42f70ff0b0b532ff8e04bf4c3fcd247008959c7b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 12 Nov 2025 06:00:59 +0100 Subject: [PATCH 555/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index c5da25f84..b3e7e0e08 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1f7cac5f66b65ce2d709cab7eb67c0c7f3fd5e88 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 12 Nov 2025 06:01:00 +0100 Subject: [PATCH 556/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index b18654b17..33934ce73 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b4befb270d044eaed76ebdd35562fd6360588733 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 18 Nov 2025 06:00:54 +0100 Subject: [PATCH 557/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index d707df9f0..936773dd2 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6cc48a128783370b8928bbe39c02f846ecc1663b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 18 Nov 2025 06:00:55 +0100 Subject: [PATCH 558/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 8f2c2a47d..180e41b85 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 16910ab91bbe841fd4106234010fa7906868ace1 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 18 Nov 2025 06:00:55 +0100 Subject: [PATCH 559/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 02da8c748..b02525ae0 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 86ccb28b0414ec572e64b17c7c9ee63073bc0d2c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 18 Nov 2025 06:00:56 +0100 Subject: [PATCH 560/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index b3e7e0e08..2434d2926 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 31f813c5202d5b5265868883716098898d4ecab6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 18 Nov 2025 06:00:57 +0100 Subject: [PATCH 561/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 33934ce73..af39c56b6 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.162" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 748d30e1d8cc365216a825c506bbed593303b155 Mon Sep 17 00:00:00 2001 From: Harsh Agrawal Date: Tue, 25 Nov 2025 12:32:43 +0530 Subject: [PATCH 562/765] DAPT-26 : add page interaction to resolve browser metric --- app/selenium_ui/conftest.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index a52243165..108337e11 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -8,6 +8,7 @@ import sys from datetime import timezone from pprint import pprint +from selenium.webdriver.common.by import By from time import sleep, time import filelock @@ -296,11 +297,15 @@ def get_requests_by_url(requests, url_path): def get_wait_browser_metrics(webdriver, expected_metrics): + body_element = webdriver.find_element(By.TAG_NAME, "body") attempts = 15 sleep_time = 0.5 data = {} for i in range(attempts): + if i > 0: + body_element.click() + print("Successfully clicked on page body") requests = get_performance_logs(webdriver) requests_bulk = get_requests_by_url(requests, 'bulk') data.update(requests_bulk) From 003bb380415fcf25a1d46bc97ce0e34b8c25796a Mon Sep 17 00:00:00 2001 From: Harsh Agrawal Date: Tue, 25 Nov 2025 15:52:33 +0530 Subject: [PATCH 563/765] DAPT-26 : add reusable click_page_body utility method to base_page --- app/selenium_ui/base_page.py | 8 ++++++++ app/selenium_ui/confluence/modules.py | 8 ++++++++ app/selenium_ui/conftest.py | 15 +++++---------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index cff6e289e..0d6f0ff56 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -188,6 +188,14 @@ def delete_all_cookies(self): def scroll_down_till_bottom(self): self.driver.execute_script("window.scrollTo(0, document.body.scrollHeight)") + def click_page_body(self): + try: + body_element = self.driver.find_element(By.TAG_NAME, "body") + body_element.click() + print("Successfully clicked on page body") + except Exception as e: + print(f"Failed to click on page body: {e}") + class AnyEc: """ Use with WebDriverWait to combine expected_conditions diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index d19524df5..535386408 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -84,6 +84,7 @@ def sub_measure(): if login_page.is_first_login(): login_page.first_user_setup() all_updates_page.wait_for_page_loaded() + all_updates_page.click_page_body() measure_dom_requests(webdriver, interaction="selenium_login:login_and_view_dashboard") if CONFLUENCE_SETTINGS.extended_metrics: measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_login']) @@ -111,6 +112,7 @@ def view_page(webdriver, datasets): def measure(): page.go_to() page.wait_for_page_loaded() + page.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_view_page", description=page_description) if CONFLUENCE_SETTINGS.extended_metrics: measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_view_page']) @@ -130,6 +132,7 @@ def view_page_from_cache(webdriver, datasets): def measure(): page.go_to() page.wait_for_page_loaded() + page.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_view_page_from_cache", description=page_description) if CONFLUENCE_SETTINGS.extended_metrics: measure_browser_navi_metrics(webdriver, datasets, @@ -149,6 +152,7 @@ def view_blog(webdriver, datasets): def measure(): blog.go_to() blog.wait_for_page_loaded() + blog.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_view_blog", description=blog_description) if CONFLUENCE_SETTINGS.extended_metrics: measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_view_blog']) @@ -163,6 +167,7 @@ def view_dashboard(webdriver, datasets): def measure(): dashboard_page.go_to() dashboard_page.wait_for_page_loaded() + dashboard_page.click_page_body() measure_dom_requests(webdriver, interaction="selenium_view_dashboard") if CONFLUENCE_SETTINGS.extended_metrics: measure_browser_navi_metrics(webdriver, datasets, @@ -182,6 +187,7 @@ def sub_measure(): nav_panel.click_create() PopupManager(webdriver).dismiss_default_popup() create_page.wait_for_create_page_open() + create_page.click_page_body() measure_dom_requests(webdriver, interaction="selenium_create_page:open_create_page_editor") if CONFLUENCE_SETTINGS.extended_metrics: measure_browser_navi_metrics(webdriver, datasets, @@ -217,6 +223,7 @@ def measure(): def sub_measure(): edit_page.go_to() edit_page.wait_for_page_loaded() + edit_page.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_edit_page_by_url:open_create_page_editor", description=page_description) if CONFLUENCE_SETTINGS.extended_metrics: @@ -253,6 +260,7 @@ def sub_measure(): PopupManager(webdriver).dismiss_default_popup() page.click_edit() edit_page.wait_for_page_loaded() + edit_page.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_quick_edit_page_click:open_create_page_editor", description=page_description) if CONFLUENCE_SETTINGS.extended_metrics: diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index 108337e11..034f4edeb 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -8,7 +8,6 @@ import sys from datetime import timezone from pprint import pprint -from selenium.webdriver.common.by import By from time import sleep, time import filelock @@ -135,8 +134,8 @@ def datetime_now(prefix): def is_docker(): path = '/proc/self/cgroup' return ( - os.path.exists('/.dockerenv') or - os.path.isfile(path) and any('docker' in line for line in open(path)) + os.path.exists('/.dockerenv') or + os.path.isfile(path) and any('docker' in line for line in open(path)) ) @@ -270,9 +269,9 @@ def get_performance_logs(webdriver): for entry in logs: log = json.loads(entry["message"])["message"] if log["method"] == "Network.requestWillBeSent" or \ - log["method"] == "Network.responseReceived" or \ - log["method"] == "Network.requestServedFromCache" or \ - log["method"] == "Network.loadingFinished": + log["method"] == "Network.responseReceived" or \ + log["method"] == "Network.requestServedFromCache" or \ + log["method"] == "Network.loadingFinished": needed_logs.append(log) sorted_requests = {} @@ -297,15 +296,11 @@ def get_requests_by_url(requests, url_path): def get_wait_browser_metrics(webdriver, expected_metrics): - body_element = webdriver.find_element(By.TAG_NAME, "body") attempts = 15 sleep_time = 0.5 data = {} for i in range(attempts): - if i > 0: - body_element.click() - print("Successfully clicked on page body") requests = get_performance_logs(webdriver) requests_bulk = get_requests_by_url(requests, 'bulk') data.update(requests_bulk) From 5641e03458c978da4f44a544ef4d28fbf6af1ee1 Mon Sep 17 00:00:00 2001 From: Harsh Agrawal Date: Tue, 25 Nov 2025 15:58:36 +0530 Subject: [PATCH 564/765] DAPT-26 : fix formatting --- app/selenium_ui/conftest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index 034f4edeb..a52243165 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -134,8 +134,8 @@ def datetime_now(prefix): def is_docker(): path = '/proc/self/cgroup' return ( - os.path.exists('/.dockerenv') or - os.path.isfile(path) and any('docker' in line for line in open(path)) + os.path.exists('/.dockerenv') or + os.path.isfile(path) and any('docker' in line for line in open(path)) ) @@ -269,9 +269,9 @@ def get_performance_logs(webdriver): for entry in logs: log = json.loads(entry["message"])["message"] if log["method"] == "Network.requestWillBeSent" or \ - log["method"] == "Network.responseReceived" or \ - log["method"] == "Network.requestServedFromCache" or \ - log["method"] == "Network.loadingFinished": + log["method"] == "Network.responseReceived" or \ + log["method"] == "Network.requestServedFromCache" or \ + log["method"] == "Network.loadingFinished": needed_logs.append(log) sorted_requests = {} From a09f051c0d15df3b85d6ab8f47902dc89a96ada8 Mon Sep 17 00:00:00 2001 From: Harsh Agrawal Date: Thu, 27 Nov 2025 18:35:18 +0530 Subject: [PATCH 565/765] DAPT-26 : ignore browser metric resolution time --- app/selenium_ui/base_page.py | 8 ---- app/selenium_ui/confluence/modules.py | 54 ++++++++++++------------ app/selenium_ui/conftest.py | 59 ++++++++++++++++++++++++++- 3 files changed, 83 insertions(+), 38 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index 0d6f0ff56..cff6e289e 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -188,14 +188,6 @@ def delete_all_cookies(self): def scroll_down_till_bottom(self): self.driver.execute_script("window.scrollTo(0, document.body.scrollHeight)") - def click_page_body(self): - try: - body_element = self.driver.find_element(By.TAG_NAME, "body") - body_element.click() - print("Successfully clicked on page body") - except Exception as e: - print(f"Failed to click on page body: {e}") - class AnyEc: """ Use with WebDriverWait to combine expected_conditions diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index 535386408..29f9ec283 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -1,5 +1,5 @@ import random -from selenium_ui.conftest import print_timing, measure_browser_navi_metrics, measure_dom_requests +from selenium_ui.conftest import print_timing, measure_timing, measure_browser_navi_metrics, measure_dom_requests, measure_with_browser_metrics from selenium_ui.confluence.pages.pages import Login, AllUpdates, PopupManager, Page, Dashboard, TopNavPanel, Editor, \ Logout @@ -84,7 +84,6 @@ def sub_measure(): if login_page.is_first_login(): login_page.first_user_setup() all_updates_page.wait_for_page_loaded() - all_updates_page.click_page_body() measure_dom_requests(webdriver, interaction="selenium_login:login_and_view_dashboard") if CONFLUENCE_SETTINGS.extended_metrics: measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_login']) @@ -108,16 +107,17 @@ def view_page(webdriver, datasets): datasets['current_session']['view_page_cache'] = random_page page = Page(webdriver, page_id=page_id) - @print_timing("selenium_view_page") def measure(): page.go_to() page.wait_for_page_loaded() - page.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_view_page", description=page_description) - if CONFLUENCE_SETTINGS.extended_metrics: - measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_view_page']) - measure() + measure_with_browser_metrics( + "selenium_view_page", + webdriver, + datasets, + measure + ) def view_page_from_cache(webdriver, datasets): @@ -128,18 +128,17 @@ def view_page_from_cache(webdriver, datasets): page = Page(webdriver, page_id=page_id) - @print_timing("selenium_view_page_from_cache") def measure(): page.go_to() page.wait_for_page_loaded() - page.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_view_page_from_cache", description=page_description) - if CONFLUENCE_SETTINGS.extended_metrics: - measure_browser_navi_metrics(webdriver, datasets, - expected_metrics=browser_metrics['selenium_view_page_from_cache']) - - measure() + measure_with_browser_metrics( + "selenium_view_page_from_cache", + webdriver, + datasets, + measure + ) def view_blog(webdriver, datasets): random_blog = random.choice(datasets[BLOGS]) @@ -148,33 +147,33 @@ def view_blog(webdriver, datasets): blog = Page(webdriver, page_id=blog_id) datasets['current_session']['view_blog'] = random_blog - @print_timing("selenium_view_blog") def measure(): blog.go_to() blog.wait_for_page_loaded() - blog.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_view_blog", description=blog_description) - if CONFLUENCE_SETTINGS.extended_metrics: - measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_view_blog']) - measure() + measure_with_browser_metrics( + "selenium_view_blog", + webdriver, + datasets, + measure + ) def view_dashboard(webdriver, datasets): dashboard_page = Dashboard(webdriver) - @print_timing("selenium_view_dashboard") def measure(): dashboard_page.go_to() dashboard_page.wait_for_page_loaded() - dashboard_page.click_page_body() measure_dom_requests(webdriver, interaction="selenium_view_dashboard") - if CONFLUENCE_SETTINGS.extended_metrics: - measure_browser_navi_metrics(webdriver, datasets, - expected_metrics=browser_metrics['selenium_view_dashboard']) - - measure() + measure_with_browser_metrics( + "selenium_view_dashboard", + webdriver, + datasets, + measure + ) def create_confluence_page(webdriver, datasets): nav_panel = TopNavPanel(webdriver) @@ -187,7 +186,6 @@ def sub_measure(): nav_panel.click_create() PopupManager(webdriver).dismiss_default_popup() create_page.wait_for_create_page_open() - create_page.click_page_body() measure_dom_requests(webdriver, interaction="selenium_create_page:open_create_page_editor") if CONFLUENCE_SETTINGS.extended_metrics: measure_browser_navi_metrics(webdriver, datasets, @@ -223,7 +221,6 @@ def measure(): def sub_measure(): edit_page.go_to() edit_page.wait_for_page_loaded() - edit_page.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_edit_page_by_url:open_create_page_editor", description=page_description) if CONFLUENCE_SETTINGS.extended_metrics: @@ -260,7 +257,6 @@ def sub_measure(): PopupManager(webdriver).dismiss_default_popup() page.click_edit() edit_page.wait_for_page_loaded() - edit_page.click_page_body() measure_dom_requests(webdriver, interaction=f"selenium_quick_edit_page_click:open_create_page_editor", description=page_description) if CONFLUENCE_SETTINGS.extended_metrics: diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index a52243165..ea41ba3bb 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -18,6 +18,7 @@ from util.common_util import webdriver_pretty_debug from util.conf import CONFLUENCE_SETTINGS, JIRA_SETTINGS, BITBUCKET_SETTINGS, JSM_SETTINGS, BAMBOO_SETTINGS +from util.confluence.browser_metrics import browser_metrics from util.exceptions import WebDriverExceptionPostpone from util.project_paths import JIRA_DATASET_ISSUES, JIRA_DATASET_JQLS, JIRA_DATASET_KANBAN_BOARDS, \ JIRA_DATASET_PROJECTS, JIRA_DATASET_SCRUM_BOARDS, JIRA_DATASET_USERS, JIRA_DATASET_CUSTOM_ISSUES, BITBUCKET_USERS, \ @@ -139,6 +140,46 @@ def is_docker(): ) +def measure_timing(func): + @functools.wraps(func) + def wrapper(*args, **kwargs): + start = time() + func(*args, **kwargs) + end = time() + return end - start + return wrapper + + +def measure_with_browser_metrics(interaction_name, webdriver, datasets, measure_func): + """ + Helper function that combines measure_timing + ready_for_user_timing. + """ + # Step 1: Measure core operations + @measure_timing + def measure1(): + measure_func() + + timing = measure1() + + # Step 2: Measure browser metrics AFTER core operations (not included in core timing) + ready_for_user_timing = None + if CONFLUENCE_SETTINGS.extended_metrics: + ready_for_user_timing = measure_browser_navi_metrics( + webdriver, datasets, expected_metrics=browser_metrics[interaction_name] + ) + + # Step 3: Calculate combined timing + if ready_for_user_timing is not None: + timing = timing + (int(ready_for_user_timing) / 1000) + + # Step 4: Record combined timing using print_timing with explicit_timing + @print_timing(interaction_name, explicit_timing=timing) + def record_result(): + pass + + record_result() + + def print_timing(interaction=None, explicit_timing=None): assert interaction is not None, "Interaction name is not passed to print_timing decorator" @@ -295,11 +336,22 @@ def get_requests_by_url(requests, url_path): return filtered_requests +def click_page_body(webdriver): + try: + body_element = webdriver.find_element("tag name", "body") + body_element.click() + print("Successfully clicked on page body") + except Exception as e: + print(f"Failed to click on page body: {e}") + + def get_wait_browser_metrics(webdriver, expected_metrics): attempts = 15 sleep_time = 0.5 data = {} + click_page_body(webdriver) #this resolves browser metric + for i in range(attempts): requests = get_performance_logs(webdriver) requests_bulk = get_requests_by_url(requests, 'bulk') @@ -398,8 +450,11 @@ def measure_browser_navi_metrics(webdriver, dataset, expected_metrics): lockfile = f'{selenium_results_file}.lock' error_msg = 'Success' success = True + ready_for_user_timing = None + if not metrics: - return + return ready_for_user_timing + with filelock.SoftFileLock(lockfile): with open(selenium_results_file, "a+") as jtl_file: for metric in metrics: @@ -411,6 +466,8 @@ def measure_browser_navi_metrics(webdriver, dataset, expected_metrics): f"{timestamp},{ready_for_user_timing},{interaction},,{error_msg},,{success},0,0,0,0,{node_ip},0\n") print( f"{timestamp},{ready_for_user_timing},{interaction},{error_msg},{success},{node_ip}") + + return ready_for_user_timing @pytest.fixture(scope="module") From c9faf83b16ad6829e3db8b16f810d413543ad917 Mon Sep 17 00:00:00 2001 From: Harsh Agrawal Date: Thu, 27 Nov 2025 21:28:26 +0530 Subject: [PATCH 566/765] DAPT-26 : convert explicit timing to integer --- app/selenium_ui/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index ea41ba3bb..56d3d1348 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -224,7 +224,7 @@ def wrapper(*args, **kwargs): timestamp = round(time() * 1000) if explicit_timing: jtl_file.write( - f"{timestamp},{explicit_timing*1000},{interaction},,{error_msg}," + f"{timestamp},{str(int(explicit_timing * 1000))},{interaction},,{error_msg}," f",{success},0,0,0,0,,0\n") else: jtl_file.write( From d85d9d18e372a1188baab21b0dc9197b43ca4500 Mon Sep 17 00:00:00 2001 From: Harsh Agrawal Date: Fri, 28 Nov 2025 13:33:27 +0530 Subject: [PATCH 567/765] DAPT-26 : include logic to measure post browser metric execution --- app/selenium_ui/confluence/modules.py | 163 ++++++++++++-------------- app/selenium_ui/conftest.py | 17 ++- 2 files changed, 91 insertions(+), 89 deletions(-) diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index 29f9ec283..6c2003860 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -1,5 +1,5 @@ import random -from selenium_ui.conftest import print_timing, measure_timing, measure_browser_navi_metrics, measure_dom_requests, measure_with_browser_metrics +from selenium_ui.conftest import print_timing, measure_timing, measure_dom_requests, measure_with_browser_metrics from selenium_ui.confluence.pages.pages import Login, AllUpdates, PopupManager, Page, Dashboard, TopNavPanel, Editor, \ Logout @@ -57,45 +57,45 @@ def login(webdriver, datasets): login_page = Login(webdriver) webdriver.debug_info = generate_debug_session_info(webdriver, datasets) - @print_timing("selenium_login") - def measure(): - def sub_measure(): + def measure(): + login_page.go_to() + if login_page.is_logged_in(): + login_page.delete_all_cookies() login_page.go_to() - if login_page.is_logged_in(): - login_page.delete_all_cookies() - login_page.go_to() - login_page.wait_for_page_loaded() - node_id = login_page.get_node_id() - node_ip = rest_client.get_node_ip(node_id) - webdriver.node_ip = node_ip - print(f"node_id:{node_id}, node_ip: {webdriver.node_ip}") - measure_dom_requests(webdriver, interaction="selenium_login:open_login_page") - - sub_measure() + login_page.wait_for_page_loaded() + node_id = login_page.get_node_id() + node_ip = rest_client.get_node_ip(node_id) + webdriver.node_ip = node_ip + print(f"node_id:{node_id}, node_ip: {webdriver.node_ip}") + measure_dom_requests(webdriver, interaction="selenium_login:open_login_page") login_page.set_credentials(username=datasets['current_session']['username'], password=datasets['current_session']['password']) - def sub_measure(): - login_page.click_login_button() - all_updates_page = AllUpdates(webdriver) - all_updates_page.wait_for_page_loaded() - if login_page.is_first_login(): - login_page.first_user_setup() - all_updates_page.wait_for_page_loaded() - measure_dom_requests(webdriver, interaction="selenium_login:login_and_view_dashboard") - if CONFLUENCE_SETTINGS.extended_metrics: - measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_login']) + login_page.click_login_button() + all_updates_page = AllUpdates(webdriver) + all_updates_page.wait_for_page_loaded() + if login_page.is_first_login(): + login_page.first_user_setup() + all_updates_page.wait_for_page_loaded() + measure_dom_requests(webdriver, interaction="selenium_login:login_and_view_dashboard") - sub_measure() + + def post_metric_measure(): current_session_response = login_page.rest_api_get(url=f'{CONFLUENCE_SETTINGS.server_url}' f'/rest/api/user/current') if 'username' in current_session_response: actual_username = current_session_response['username'] assert actual_username == datasets['current_session']['username'] - measure() + measure_with_browser_metrics( + "selenium_login", + webdriver, + datasets, + measure, + post_metric_measure + ) PopupManager(webdriver).dismiss_default_popup() @@ -179,34 +179,33 @@ def create_confluence_page(webdriver, datasets): nav_panel = TopNavPanel(webdriver) create_page = Editor(webdriver) - @print_timing("selenium_create_page") def measure(): - def sub_measure(): - PopupManager(webdriver).dismiss_default_popup() - nav_panel.click_create() - PopupManager(webdriver).dismiss_default_popup() - create_page.wait_for_create_page_open() - measure_dom_requests(webdriver, interaction="selenium_create_page:open_create_page_editor") - if CONFLUENCE_SETTINGS.extended_metrics: - measure_browser_navi_metrics(webdriver, datasets, - expected_metrics=browser_metrics['selenium_create_page']) + PopupManager(webdriver).dismiss_default_popup() + nav_panel.click_create() + PopupManager(webdriver).dismiss_default_popup() + create_page.wait_for_create_page_open() + measure_dom_requests(webdriver, interaction="selenium_create_page:open_create_page_editor") - sub_measure() + def post_metric_measure(): PopupManager(webdriver).dismiss_default_popup() create_page.write_title() create_page.write_content() - def sub_measure(): - create_page.click_submit() - page = Page(webdriver) - page.wait_for_page_loaded() - measure_dom_requests(webdriver, interaction="selenium_create_page:save_created_page") + create_page.click_submit() + page = Page(webdriver) + page.wait_for_page_loaded() + measure_dom_requests(webdriver, interaction="selenium_create_page:save_created_page") - sub_measure() - measure() + measure_with_browser_metrics( + "selenium_create_page", + webdriver, + datasets, + measure, + post_metric_measure + ) def edit_confluence_page_by_url(webdriver, datasets): @@ -216,29 +215,26 @@ def edit_confluence_page_by_url(webdriver, datasets): datasets['current_session']['edit_page'] = random_page edit_page = Editor(webdriver, page_id=page_id) - @print_timing("selenium_edit_page_by_url") def measure(): - def sub_measure(): - edit_page.go_to() - edit_page.wait_for_page_loaded() - measure_dom_requests(webdriver, interaction=f"selenium_edit_page_by_url:open_create_page_editor", - description=page_description) - if CONFLUENCE_SETTINGS.extended_metrics: - measure_browser_navi_metrics(webdriver, datasets, - expected_metrics=browser_metrics['selenium_edit_page_by_url']) - - sub_measure() + edit_page.go_to() + edit_page.wait_for_page_loaded() + measure_dom_requests(webdriver, interaction=f"selenium_edit_page_by_url:open_create_page_editor", + description=page_description) + def post_metric_measure(): edit_page.write_content() - def sub_measure(): - edit_page.save_edited_page() - measure_dom_requests(webdriver, interaction=f"selenium_edit_page_by_url:save_edited_page", - description=page_description) + edit_page.save_edited_page() + measure_dom_requests(webdriver, interaction=f"selenium_edit_page_by_url:save_edited_page", + description=page_description) - sub_measure() - - measure() + measure_with_browser_metrics( + "selenium_edit_page_by_url", + webdriver, + datasets, + measure, + post_metric_measure + ) def edit_confluence_page_quick_edit(webdriver, datasets): @@ -250,32 +246,29 @@ def edit_confluence_page_quick_edit(webdriver, datasets): @print_timing("selenium_quick_edit_page_click") def measure(): - def sub_measure(): - page.go_to() - page.wait_for_resources_loaded() - page.wait_for_page_loaded() - PopupManager(webdriver).dismiss_default_popup() - page.click_edit() - edit_page.wait_for_page_loaded() - measure_dom_requests(webdriver, interaction=f"selenium_quick_edit_page_click:open_create_page_editor", - description=page_description) - if CONFLUENCE_SETTINGS.extended_metrics: - measure_browser_navi_metrics(webdriver, datasets, - expected_metrics=browser_metrics['selenium_quick_edit_page_click']) - - sub_measure() + page.go_to() + page.wait_for_resources_loaded() + page.wait_for_page_loaded() + PopupManager(webdriver).dismiss_default_popup() + page.click_edit() + edit_page.wait_for_page_loaded() + measure_dom_requests(webdriver, interaction=f"selenium_quick_edit_page_click:open_create_page_editor", + description=page_description) + def post_metric_measure(): edit_page.write_content() - def sub_measure(): - edit_page.save_edited_page() - measure_dom_requests(webdriver, interaction=f"selenium_quick_edit_page_click:save_edited_page", - description=page_description) - - sub_measure() - - measure() + edit_page.save_edited_page() + measure_dom_requests(webdriver, interaction=f"selenium_quick_edit_page_click:save_edited_page", + description=page_description) + measure_with_browser_metrics( + "selenium_quick_edit_page_click", + webdriver, + datasets, + measure, + post_metric_measure + ) def create_inline_comment(webdriver, datasets): page = random.choice(datasets[PAGES]) diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index 56d3d1348..57c63dd69 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -150,9 +150,9 @@ def wrapper(*args, **kwargs): return wrapper -def measure_with_browser_metrics(interaction_name, webdriver, datasets, measure_func): +def measure_with_browser_metrics(interaction_name, webdriver, datasets, measure_func, post_metric_measure_func=None): """ - Helper function that combines measure_timing + ready_for_user_timing. + Helper function that combines timing for measure_func + post_metric_measure_func + ready_for_user_timing. """ # Step 1: Measure core operations @measure_timing @@ -168,11 +168,20 @@ def measure1(): webdriver, datasets, expected_metrics=browser_metrics[interaction_name] ) - # Step 3: Calculate combined timing + # Step 3: Measure post_metric_measure_func (included in total timing) + if post_metric_measure_func is not None: + @measure_timing + def measure_post(): + post_metric_measure_func() + + post_timing = measure_post() + timing = timing + post_timing + + # Step 4: Calculate combined timing (core + post + ready_for_user) if ready_for_user_timing is not None: timing = timing + (int(ready_for_user_timing) / 1000) - # Step 4: Record combined timing using print_timing with explicit_timing + # Step 5: Record combined timing using print_timing with explicit_timing @print_timing(interaction_name, explicit_timing=timing) def record_result(): pass From e7748759d3e98ef40b5f3db94e997c6fb9240968 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Dec 2025 06:01:09 +0100 Subject: [PATCH 568/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 936773dd2..7df071c3c 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 263ac097f0efb603eba059bd086f667acf06ee1c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Dec 2025 06:01:10 +0100 Subject: [PATCH 569/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 180e41b85..330f4f67c 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 574c2de27bf9fb34ffd0ce5125836484613a3f13 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Dec 2025 06:01:11 +0100 Subject: [PATCH 570/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index b02525ae0..484d4640f 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4e84e7c489828d838aa57a33be3314b7d2185b7b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Dec 2025 06:01:11 +0100 Subject: [PATCH 571/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 2434d2926..d9fbc7a5d 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From cdb2faefe99e0a00ab10a30965d9e9316b413e34 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 3 Dec 2025 06:01:12 +0100 Subject: [PATCH 572/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index af39c56b6..c05bd46b9 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "142.0.7444.175" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e036667972a6f2b04e2fe27ca213f40a1f563617 Mon Sep 17 00:00:00 2001 From: Harsh Agrawal Date: Thu, 4 Dec 2025 14:11:28 +0530 Subject: [PATCH 573/765] DAPT-26 : refactor explicit_timing --- app/selenium_ui/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index 57c63dd69..4f4f12737 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -232,8 +232,9 @@ def wrapper(*args, **kwargs): with open(selenium_results_file, "a+") as jtl_file: timestamp = round(time() * 1000) if explicit_timing: + timing = str(int(explicit_timing * 1000)) jtl_file.write( - f"{timestamp},{str(int(explicit_timing * 1000))},{interaction},,{error_msg}," + f"{timestamp},{timing},{interaction},,{error_msg}," f",{success},0,0,0,0,,0\n") else: jtl_file.write( From 97a5540611b5f2b172f63f3de62849cbe3d544f2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Dec 2025 11:22:10 +0000 Subject: [PATCH 574/765] Update dependency selenium to v4.39.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c4dbc6d68..ab3a6e47b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ matplotlib==3.10.7 pandas==2.3.3 pytest==8.4.2 locust==2.42.1 -selenium==4.38.0 +selenium==4.39.0 filelock==3.20.0 packaging==25.0 prettytable==3.16.0 From ad3168360edd01d793f5bddd240c10a7c8b1a1fe Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 9 Dec 2025 10:01:29 +0100 Subject: [PATCH 575/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index e150526d3..9a0fcc8da 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -506,6 +506,32 @@ } ], "build_number": "9111" + }, + { + "version": "10.2.1", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-06539327a4ecaa580", + "us-east-1": "snap-04810522502049ae7" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-2-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-2-1" + } + ] + } + ], + "build_number": "9403" } ] }, From e613e3173d443f414c8dc72485c6e4235f7ee8b4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 11 Dec 2025 06:00:52 +0100 Subject: [PATCH 576/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 7df071c3c..64612e07d 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 16ee0a542f3465d3e73e8b505e7ea229ef380e58 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 11 Dec 2025 06:00:52 +0100 Subject: [PATCH 577/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 330f4f67c..e092513f6 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 98f2ae1f8aa1cc8a0dec394d64773212432efe6d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 11 Dec 2025 06:00:53 +0100 Subject: [PATCH 578/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 484d4640f..9ff7db98e 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From cb01747e2ba803422789b15fd141d86df51dc127 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 11 Dec 2025 06:00:54 +0100 Subject: [PATCH 579/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index d9fbc7a5d..b3aaf9e6b 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4197589acf294bee9d2e10b624e0f69bc4132815 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 11 Dec 2025 06:00:54 +0100 Subject: [PATCH 580/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index c05bd46b9..9d4f5512c 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.40" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ccfde50f8e5aad8202e9a554863e42f2312c016d Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 11 Dec 2025 13:18:19 +0100 Subject: [PATCH 581/765] Confluence 10.2.1 snapshots --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 9a0fcc8da..3b4e768dc 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -529,6 +529,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-2-1" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-02ffec9429d302d4f", + "us-east-1": "snap-07a005f562cd9e4a4" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-2-1", + "us-east-1": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-2-1" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-037fed47915b233dc", + "us-east-1": "snap-0e69c87f7ff829af8" + } + ] } ], "build_number": "9403" From 0b2279b648c3768fe1899e582687238372988641 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Fri, 12 Dec 2025 09:59:26 +0100 Subject: [PATCH 582/765] Remove old confluence snapshots; update README --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 112 ------------------------------ 2 files changed, 1 insertion(+), 113 deletions(-) diff --git a/README.md b/README.md index 8b0095c54..38df363ea 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): `5.12.28`, `10.3.12` and `11.0.1` Platform release * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.27`, `9.2.9` and `10.0.3` Platform release + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.9`, `10.2.1` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.24`, `9.4.12` and `10.0.1` Platform release diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 3b4e768dc..7f68358c6 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -339,118 +339,6 @@ }, "confluence": { "versions": [ - { - "version": "10.0.3", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0ce01eb9097aa636c", - "us-east-1": "snap-07108e7230c9688f8" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-0-3", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-3" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-097a3bbe8f68e13ee", - "us-east-1": "snap-006d84c546c0e8677" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-0-3", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-0-3" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-02e8158dcedd57722", - "us-east-1": "snap-04a5fcd6fd282e183" - } - ] - } - ], - "build_number": "9304" - }, - { - "version": "8.5.27", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-00ca731968c64e1e2", - "us-east-1": "snap-077a8e89862171dbc" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-27", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-27" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-077829db18893ab66", - "us-east-1": "snap-038266b2049f9b3eb" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-27", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-27" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0665d86d443de97e3", - "us-east-1": "snap-089afbfd299a0aac4" - } - ] - } - ], - "build_number": "9012" - }, { "version": "9.2.9", "data": [ From 3b96bcb605aa3b01abea1ea300105834a04c2c35 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Fri, 12 Dec 2025 10:08:32 +0100 Subject: [PATCH 583/765] Update default confluence tags --- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt.tfvars | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 8eae43f07..48e60d20e 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -161,7 +161,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "9.2.9" +confluence_version_tag = "10.2.1" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "small" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index b0fa441b8..6fc5630c4 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -172,7 +172,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "9.2.9" +confluence_version_tag = "10.2.1" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "large" From 49ea33902a90b01ee200529b5a19e80d326e544d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Fri, 12 Dec 2025 16:00:16 +0100 Subject: [PATCH 584/765] Added snapshots for jira 11.3.0 --- app/util/k8s/dcapt-snapshots.json | 55 +++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 7f68358c6..4e419358d 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -1,6 +1,61 @@ { "jira": { "versions": [ + { + "version": "11.3.0", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-05857a77bc09f345e", + "us-east-1": "snap-0e414e5d81cc5eaa3" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-11-3-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-11-3-0" + } + ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0478259eeff42f204", + "us-east-1": "snap-06da8df54d086c246" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-11-3-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-11-3-0" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-08c28c814cce27efc", + "us-east-1": "snap-018a17be898c38739" + } + ] + } + ] + }, { "version": "10.3.12", "data": [ From 1f09f558282e519c500a16dfe60a29eb996e5cdf Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 15 Dec 2025 14:12:27 +0100 Subject: [PATCH 585/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 4e419358d..17f43075f 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -389,6 +389,31 @@ ] } ] + }, + { + "version": "11.3.0", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0a099cabd853450bb", + "us-east-1": "snap-04f86635f46e78198" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-11-3-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-3-0" + } + ] + } + ] } ] }, From 00ea4b725b849f555dee464d59ce9e3dec26e06b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 15 Dec 2025 15:19:54 +0100 Subject: [PATCH 586/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 17f43075f..b64aa906f 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -412,6 +412,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-3-0" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0d11f3890b4253269", + "us-east-1": "snap-02ba81f7a31bd147b" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-11-3-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-11-3-0" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0835551d051d8886b", + "us-east-1": "snap-022edf5a472f6e1ae" + } + ] } ] } From f7540fe88dc4986bd0df4405fefdce0b6065699c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Mon, 15 Dec 2025 16:22:53 +0100 Subject: [PATCH 587/765] * removed unused snapshots * edited readme with supported jira versions * edited .tfvrs files with new default jira version --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 110 ------------------------------ app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 3 insertions(+), 113 deletions(-) diff --git a/README.md b/README.md index 38df363ea..ff22741f5 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): `9.12.28`, `10.3.12` and `11.0.1` Platform release + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `10.3.12`, `11.3.0` * Supported Jira Service Management versions: * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.28`, `10.3.12` and `11.0.1` Platform release diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 48e60d20e..eaa71ea29 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -89,7 +89,7 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version. -jira_version_tag = "10.3.12" +jira_version_tag = "11.3.0" # JSM version # ! REQUIRED for JSM ! # jira_version_tag = "10.3.12" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 4e419358d..080f7d87c 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -110,116 +110,6 @@ ] } ] - }, - { - "version": "11.0.1", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-024621e28f539ea71", - "us-east-1": "snap-03d4930514bda5fa1" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-11-0-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-11-0-1" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-08b58d86b66c56e62", - "us-east-1": "snap-087c54ff2be1e3dec" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-11-0-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-11-0-1" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-049a5d6741dfce7ec", - "us-east-1": "snap-0513dbf6bb5bf162d" - } - ] - } - ] - }, - { - "version": "9.12.28", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-01b34946a0c382028", - "us-east-1": "snap-02829ae02bc59d70e" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-12-28", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-12-28" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-07a542154b712feb5", - "us-east-1": "snap-07fd1e4b12e5a71ba" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-12-28", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-12-28" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-04d5f07e4711dce9d", - "us-east-1": "snap-0fe73c9a61e6b8fe0" - } - ] - } - ] } ] }, diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 6fc5630c4..a4508300e 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -110,7 +110,7 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version -jira_version_tag = "10.3.12" +jira_version_tag = "11.3.0" # JSM version # ! REQUIRED for JSM ! From 0bdd93b98d0a6d0856a861c006e540b8b93b261b Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 15 Dec 2025 16:28:58 +0100 Subject: [PATCH 588/765] Remove old JSM snapshots; update README --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 110 ------------------------------ 2 files changed, 1 insertion(+), 111 deletions(-) diff --git a/README.md b/README.md index 38df363ea..24976d512 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): `9.12.28`, `10.3.12` and `11.0.1` Platform release * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.28`, `10.3.12` and `11.0.1` Platform release + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `10.3.12`, `11.3.0` * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.9`, `10.2.1` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index b64aa906f..909fd663e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -280,116 +280,6 @@ } ] }, - { - "version": "11.0.1", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-05dc0bb94cd2ec1eb", - "us-east-1": "snap-04385c9cc2dbd753f" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-11-0-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-0-1" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0faa27f921b703cc1", - "us-east-1": "snap-00a7e983f03758d8f" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-11-0-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-11-0-1" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0ff64ea89c341050b", - "us-east-1": "snap-0f7cc06e81c642bef" - } - ] - } - ] - }, - { - "version": "5.12.28", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0de35b536983cb6a0", - "us-east-1": "snap-05bc13add8392d287" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-12-28", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-12-28" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-031b461ed66ce4072", - "us-east-1": "snap-05d14db5535435790" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-12-28", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-12-28" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-074b2b42e6bc32eff", - "us-east-1": "snap-032fe17b5668daae3" - } - ] - } - ] - }, { "version": "11.3.0", "data": [ From 021e953b4e747c747f64f6734765fbfbe28cdbc4 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 15 Dec 2025 16:30:48 +0100 Subject: [PATCH 589/765] Update default JSM version tags --- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt.tfvars | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 48e60d20e..7ea502c54 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -92,7 +92,7 @@ jira_image_repository = "atlassian/jira-software" jira_version_tag = "10.3.12" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "10.3.12" +# jira_version_tag = "11.3.0" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large jira_dataset_size = "small" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 6fc5630c4..923f8a4c8 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -114,7 +114,7 @@ jira_version_tag = "10.3.12" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "10.3.12" +# jira_version_tag = "11.3.0" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large. jira_dataset_size = "large" From ef7f57d48cf7e6282d8cb128a8ee3b3f91e86c46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Dec 2025 22:57:55 +0000 Subject: [PATCH 590/765] Bump filelock from 3.20.0 to 3.20.1 Bumps [filelock](https://github.com/tox-dev/py-filelock) from 3.20.0 to 3.20.1. - [Release notes](https://github.com/tox-dev/py-filelock/releases) - [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/py-filelock/compare/3.20.0...3.20.1) --- updated-dependencies: - dependency-name: filelock dependency-version: 3.20.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c4dbc6d68..3219c9e25 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pandas==2.3.3 pytest==8.4.2 locust==2.42.1 selenium==4.38.0 -filelock==3.20.0 +filelock==3.20.1 packaging==25.0 prettytable==3.16.0 bzt==1.16.46 From ac211b11c8e58f2961f9c5594393b3b7075f6214 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 17 Dec 2025 06:00:45 +0100 Subject: [PATCH 591/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 64612e07d..3ecf68de5 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 53540a5f24b4ff859bfc5cdab6f8b60f02f73bf8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 17 Dec 2025 06:00:45 +0100 Subject: [PATCH 592/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index e092513f6..698c6bbd7 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 11bc1535f51f2ece6843e8390a0ea71ba8dc98cf Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 17 Dec 2025 06:00:46 +0100 Subject: [PATCH 593/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 9ff7db98e..2e8215dee 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From d4a855635e89c6b67b45a7527a03729a18fec414 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 17 Dec 2025 06:00:47 +0100 Subject: [PATCH 594/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index b3aaf9e6b..764bb5ae9 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 49df7fc02594f1fa7d3b554f84e143d81a7b818c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 17 Dec 2025 06:00:47 +0100 Subject: [PATCH 595/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 9d4f5512c..4ec672e5a 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.42" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 21ca4b2d881064798188d02c3237e1ea50a26638 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 17 Dec 2025 16:05:51 +0100 Subject: [PATCH 596/765] Fix JSM 11.3.0 selector; retry wait in case of stale elements to reduce flakiness --- app/selenium_ui/base_page.py | 8 ++++-- app/selenium_ui/jsm/pages/agent_pages.py | 26 ++++++++++---------- app/selenium_ui/jsm/pages/agent_selectors.py | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index cff6e289e..8f0627557 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -4,7 +4,7 @@ import time from packaging import version -from selenium.common.exceptions import WebDriverException, TimeoutException +from selenium.common.exceptions import WebDriverException, TimeoutException, StaleElementReferenceException from selenium.webdriver.common.action_chains import ActionChains from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as ec @@ -138,7 +138,11 @@ def __wait_until(self, expected_condition, locator, time_out=timeout): message += (f"Timed out after {time_out} sec waiting for {str(expected_condition)}. \n" f"Locator: {locator}{str(expected_condition)}") - return WebDriverWait(self.driver, time_out).until(expected_condition, message=message) + try: + return WebDriverWait(self.driver, time_out).until(expected_condition, message=message) + except StaleElementReferenceException: + print(f"Stale element reference detected for {locator}, retrying wait...") + return WebDriverWait(self.driver, time_out).until(expected_condition, message=message) def dismiss_popup(self, popup_selectors): for selector_type, selector_value in popup_selectors: diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index 682dc4d0a..e829a2e00 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -7,7 +7,6 @@ class PopupManager(BasePage): - def dismiss_default_popup(self): return self.dismiss_popup(PopupLocators.popup_selectors) @@ -126,37 +125,38 @@ def check_comment_text_is_displayed(self, text, rte_status=None): self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).send_keys(text) self.return_to_parent_frame() if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): - self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click() + self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn).click() else: - self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click() + self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click() elif self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).text != text: self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).send_keys(text) if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): - self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click() + self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn).click() else: - self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click() + self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click() 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_area) - textarea = self.get_element(ViewCustomerRequestLocators.comment_collapsed_textarea) - self.driver.execute_script("arguments[0].scrollIntoView(true);", textarea) - textarea.click() + self.driver.execute_script("arguments[0].scrollIntoView(true);", + self.wait_until_present(ViewCustomerRequestLocators.comment_collapsed_textarea)) + self.wait_until_clickable(ViewCustomerRequestLocators.comment_collapsed_textarea).click() if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): - comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn) + comment_button_selector = ViewCustomerRequestLocators.comment_internally_btn else: - comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn_jsm10) - self.driver.execute_script("arguments[0].scrollIntoView(true);", comment_button) + comment_button_selector = ViewCustomerRequestLocators.comment_internally_btn_jsm10 + self.driver.execute_script("arguments[0].scrollIntoView(true);", + self.wait_until_present(comment_button_selector)) if rte_status: self.wait_until_available_to_switch(ViewCustomerRequestLocators.comment_text_field_RTE) self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).send_keys(comment_text) self.return_to_parent_frame() - comment_button.click() + self.wait_until_clickable(comment_button_selector).click() self.check_comment_text_is_displayed(comment_text, True) else: self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).send_keys(comment_text) - comment_button.click() + self.wait_until_clickable(comment_button_selector).click() self.check_comment_text_is_displayed(comment_text) diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index 37b616287..d5b11d869 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -186,7 +186,7 @@ class InsightViewQueueLocators: class InsightSearchObjectIql: search_object_text_field = (By.CSS_SELECTOR, "textarea[name='iql']") - search_iql_button = (By.CLASS_NAME, "rIcon-search") + search_iql_button = (By.CSS_SELECTOR, ".rIcon-search, .rlIqlEditor ~ button") search_iql_success = (By.XPATH, "//thead/tr[1]") From d03f559606a3338fe4b9b734e60ee833f3485c2e Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 18 Dec 2025 18:20:46 +0100 Subject: [PATCH 597/765] Wait for DOM mutations complete before performing search in Confluence --- app/selenium_ui/base_page.py | 37 +++++++++++++++++++++++++++ app/selenium_ui/confluence/modules.py | 1 + 2 files changed, 38 insertions(+) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index 8f0627557..68e4197fc 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -144,6 +144,43 @@ def __wait_until(self, expected_condition, locator, time_out=timeout): print(f"Stale element reference detected for {locator}, retrying wait...") return WebDriverWait(self.driver, time_out).until(expected_condition, message=message) + def wait_for_dom_mutations_complete(self, timeout=10): + start_time = time.time() + script = """ + var callback = arguments[arguments.length - 1]; + var timeout = arguments[0] * 1000; + var lastMutation = Date.now(); + var startTime = Date.now(); + + var observer = new MutationObserver(function() { + lastMutation = Date.now(); + }); + + observer.observe(document.body, { + childList: true, + subtree: true, + attributes: true + }); + + var interval = setInterval(function() { + if (Date.now() - lastMutation > 500) { + observer.disconnect(); + clearInterval(interval); + callback(true); + } else if (Date.now() - startTime > timeout) { + observer.disconnect(); + clearInterval(interval); + callback(false); + } + }, 100); + """ + complete = self.driver.execute_async_script(script, timeout) + if not complete: + print(f'WARNING: DOM mutations did not complete in {timeout} s') + else: + print(f'DOM mutations completed after {time.time() - start_time} s') + return complete + def dismiss_popup(self, popup_selectors): for selector_type, selector_value in popup_selectors: if self.driver.find_elements(by=selector_type, value=selector_value): diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index 6c2003860..a5b617a2a 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -311,6 +311,7 @@ def cql_search(webdriver, cql_string, print_timing_suffix): page = Page(webdriver) page.wait_until_visible(PageLocators.search_box) PopupManager(webdriver).dismiss_default_popup() + page.wait_for_dom_mutations_complete() @print_timing(f"selenium_cql_search_{print_timing_suffix}") def measure(): From d2973475ce89d66930324eac1074cbf02466a721 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 19 Dec 2025 06:00:53 +0100 Subject: [PATCH 598/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 3ecf68de5..5309c856c 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From dcbb03fc232ea31080e1517cd2e37bb595cbba6b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 19 Dec 2025 06:00:53 +0100 Subject: [PATCH 599/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 698c6bbd7..35f973f30 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 68d3fc8c6188be4322de76cb39513f1600e5bbb3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 19 Dec 2025 06:00:54 +0100 Subject: [PATCH 600/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 2e8215dee..8fde48eaa 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 645a47b8eb57f952481108b96b594bbb62aba762 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 19 Dec 2025 06:00:55 +0100 Subject: [PATCH 601/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 764bb5ae9..3c22b5d17 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 64a3960d7cf527cac54044f3cff8f618b7e48af4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 19 Dec 2025 06:00:55 +0100 Subject: [PATCH 602/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 4ec672e5a..c9dc5f6e3 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.146" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6b145eb47ac51d1abbf788a462b35d1eab2ede65 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Fri, 19 Dec 2025 09:44:38 +0100 Subject: [PATCH 603/765] Change the way pop-ups are being closed --- app/selenium_ui/base_page.py | 5 +---- app/selenium_ui/confluence/modules.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index 68e4197fc..e997576dd 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -185,10 +185,7 @@ def dismiss_popup(self, popup_selectors): for selector_type, selector_value in popup_selectors: if self.driver.find_elements(by=selector_type, value=selector_value): try: - if selector_type == By.CSS_SELECTOR: - self.driver.execute_script(f"document.querySelector('{selector_value}').click()") - elif selector_type == By.XPATH: - self.driver.find_element(by=selector_type, value=selector_value).click() + self.wait_until_clickable((selector_type, selector_value), 1).click() except (WebDriverException, Exception): pass diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index a5b617a2a..e32c5204d 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -310,8 +310,8 @@ def cql_search_two_words(webdriver): def cql_search(webdriver, cql_string, print_timing_suffix): page = Page(webdriver) page.wait_until_visible(PageLocators.search_box) - PopupManager(webdriver).dismiss_default_popup() page.wait_for_dom_mutations_complete() + PopupManager(webdriver).dismiss_default_popup() @print_timing(f"selenium_cql_search_{print_timing_suffix}") def measure(): From bc16ae99eefae193f5512040cda3e5976102ccce Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 19 Dec 2025 11:03:43 +0100 Subject: [PATCH 604/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f0aae6fb5..c7db5d5f2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -110,6 +110,31 @@ ] } ] + }, + { + "version": "10.3.15", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-02eb1cd14e3469db7", + "us-east-1": "snap-0a9106a09c4ac7d7d" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-3-15", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-15" + } + ] + } + ] } ] }, From 7f188ba12a5c9f3838097ed4153356da6e5d5786 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Fri, 19 Dec 2025 12:02:07 +0100 Subject: [PATCH 605/765] Add debug logs --- app/selenium_ui/confluence/modules.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index e32c5204d..d84a6c172 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -310,15 +310,19 @@ def cql_search_two_words(webdriver): def cql_search(webdriver, cql_string, print_timing_suffix): page = Page(webdriver) page.wait_until_visible(PageLocators.search_box) - page.wait_for_dom_mutations_complete() PopupManager(webdriver).dismiss_default_popup() + page.wait_for_dom_mutations_complete() @print_timing(f"selenium_cql_search_{print_timing_suffix}") def measure(): + print(f"Before sending keys {cql_string}") page.get_element(PageLocators.search_box).send_keys(cql_string) + print("Waiting for search result") page.wait_until_any_ec_presented((PageLocators.empty_search_results, PageLocators.search_results), timeout=30) + print("Closing search results") page.get_element(PageLocators.close_search_button).click() + print("Search finished") measure() From a09046a882a874c36b9352259eb3b5671b9e64e8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 19 Dec 2025 12:58:39 +0100 Subject: [PATCH 606/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index c7db5d5f2..4c8f394b9 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -133,6 +133,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-15" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-059045232a2854831", + "us-east-1": "snap-05cf4def8804c4da5" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-15", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-15" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0ad935ea594e2f3ec", + "us-east-1": "snap-0dcaeea7150f12c80" + } + ] } ] } From e8dde70dc84ee8077d2607663ecda6ef9184bfc7 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Fri, 19 Dec 2025 14:07:43 +0100 Subject: [PATCH 607/765] Wait DOM mutation complete after dismissing pop-ups --- app/selenium_ui/base_page.py | 5 +++++ app/selenium_ui/confluence/modules.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index e997576dd..f5cc6e6ca 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -182,12 +182,17 @@ def wait_for_dom_mutations_complete(self, timeout=10): return complete def dismiss_popup(self, popup_selectors): + dismissed = False for selector_type, selector_value in popup_selectors: if self.driver.find_elements(by=selector_type, value=selector_value): try: self.wait_until_clickable((selector_type, selector_value), 1).click() + dismissed = True except (WebDriverException, Exception): pass + if dismissed: + self.wait_for_dom_mutations_complete() + return dismissed def return_to_parent_frame(self): return self.driver.switch_to.parent_frame() diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index d84a6c172..b6c70bf39 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -310,8 +310,8 @@ def cql_search_two_words(webdriver): def cql_search(webdriver, cql_string, print_timing_suffix): page = Page(webdriver) page.wait_until_visible(PageLocators.search_box) - PopupManager(webdriver).dismiss_default_popup() page.wait_for_dom_mutations_complete() + PopupManager(webdriver).dismiss_default_popup() @print_timing(f"selenium_cql_search_{print_timing_suffix}") def measure(): From dc93d8d541a10fe285e9fb4bb5166c012958b3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Fri, 19 Dec 2025 14:39:57 +0100 Subject: [PATCH 608/765] removed unused snapshots --- app/util/k8s/dcapt-snapshots.json | 55 ------------------------------- 1 file changed, 55 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 4c8f394b9..c1f1960b2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -56,61 +56,6 @@ } ] }, - { - "version": "10.3.12", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0ed31cf24b9eef7bb", - "us-east-1": "snap-0fef1e9ba11e5acc4" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-10-3-12", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-10-3-12" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-00fcc042a2a279cec", - "us-east-1": "snap-0468ef7ca249c13e3" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-10-3-12", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-10-3-12" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-064a6d96b09bd9d89", - "us-east-1": "snap-0607cc3ea10d8f744" - } - ] - } - ] - }, { "version": "10.3.15", "data": [ From 76083b12fcb7d1f7bc0e4c05cc3172b1e3165389 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 19 Dec 2025 15:16:42 +0100 Subject: [PATCH 609/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index c1f1960b2..00e2aef63 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -224,6 +224,31 @@ ] } ] + }, + { + "version": "10.3.15", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0a2905cc27a9416a3", + "us-east-1": "snap-07425ee15645e6c03" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-15", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-15" + } + ] + } + ] } ] }, From 847cb164f719774eb6ff6b58de148aae56caad53 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 22 Dec 2025 14:21:11 +0100 Subject: [PATCH 610/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 00e2aef63..ee541ab64 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -110,6 +110,31 @@ ] } ] + }, + { + "version": "11.3.1", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0eced159eea56a6e3", + "us-east-1": "snap-07f9fdfaaf4107997" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-11-3-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-11-3-1" + } + ] + } + ] } ] }, From 6142033cb24ecc3f3c90d37b43f7cb01bbb3f3d5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 22 Dec 2025 17:27:33 +0100 Subject: [PATCH 611/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ee541ab64..f4280ba0c 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -133,6 +133,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-11-3-1" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-05cb805552827adf7", + "us-east-1": "snap-0c936325b25fd3899" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-11-3-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-11-3-1" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0dc413e149a0e6664", + "us-east-1": "snap-0b141d82744a59622" + } + ] } ] } From 849936ccb4c19e803747fc748b24830c47712c27 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 23 Dec 2025 08:00:38 +0100 Subject: [PATCH 612/765] Remove debug logging --- app/selenium_ui/confluence/modules.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/selenium_ui/confluence/modules.py b/app/selenium_ui/confluence/modules.py index b6c70bf39..e32c5204d 100644 --- a/app/selenium_ui/confluence/modules.py +++ b/app/selenium_ui/confluence/modules.py @@ -315,14 +315,10 @@ def cql_search(webdriver, cql_string, print_timing_suffix): @print_timing(f"selenium_cql_search_{print_timing_suffix}") def measure(): - print(f"Before sending keys {cql_string}") page.get_element(PageLocators.search_box).send_keys(cql_string) - print("Waiting for search result") page.wait_until_any_ec_presented((PageLocators.empty_search_results, PageLocators.search_results), timeout=30) - print("Closing search results") page.get_element(PageLocators.close_search_button).click() - print("Search finished") measure() From 5c9562f98274cb0971afd1922e296eae6600b173 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 23 Dec 2025 15:13:47 +0100 Subject: [PATCH 613/765] Removed check_comment_text_is_displayed; added safe_click in BasePage to wait and click element handling StaleElementReferenceException --- app/selenium_ui/base_page.py | 11 +++++++++++ app/selenium_ui/jsm/pages/agent_pages.py | 25 ++---------------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/app/selenium_ui/base_page.py b/app/selenium_ui/base_page.py index f5cc6e6ca..9bc5348ad 100644 --- a/app/selenium_ui/base_page.py +++ b/app/selenium_ui/base_page.py @@ -116,6 +116,17 @@ def wait_until_any_ec_text_presented_in_el(self, selector_text_list, timeout=tim selector_text in selector_text_list) return self.__wait_until(expected_condition=any_ec, locator=selector_text_list, time_out=timeout) + def safe_click(self, locator, retries=3, delay=0.5): + for attempt in range(retries): + try: + self.wait_until_clickable(locator).click() + return + except StaleElementReferenceException: + if attempt < retries - 1: + time.sleep(delay) + else: + raise + def __wait_until(self, expected_condition, locator, time_out=timeout): message = f"Error in wait_until: " ec_type = type(expected_condition) diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index e829a2e00..8e3e8895e 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -116,25 +116,6 @@ def __init__(self, driver, request_key=None): def wait_for_page_loaded(self): self.wait_until_visible(ViewCustomerRequestLocators.bread_crumbs) - def check_comment_text_is_displayed(self, text, rte_status=None): - if self.get_elements(ViewCustomerRequestLocators.comment_text_field_RTE) or \ - self.get_elements(ViewCustomerRequestLocators.comment_text_field): - if rte_status: - self.wait_until_available_to_switch(ViewCustomerRequestLocators.comment_text_field_RTE) - if self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).text != text: - self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).send_keys(text) - self.return_to_parent_frame() - if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): - self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn).click() - else: - self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click() - elif self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).text != text: - self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).send_keys(text) - if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn): - self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn).click() - else: - self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click() - 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_area) @@ -152,12 +133,10 @@ def add_request_comment(self, rte_status): self.wait_until_available_to_switch(ViewCustomerRequestLocators.comment_text_field_RTE) self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).send_keys(comment_text) self.return_to_parent_frame() - self.wait_until_clickable(comment_button_selector).click() - self.check_comment_text_is_displayed(comment_text, True) + self.safe_click(comment_button_selector) else: self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).send_keys(comment_text) - self.wait_until_clickable(comment_button_selector).click() - self.check_comment_text_is_displayed(comment_text) + self.safe_click(comment_button_selector) class Report: From d7c73f090cb9a41e25ba2b7261ec77868367d988 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 29 Dec 2025 13:00:34 +0100 Subject: [PATCH 614/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f4280ba0c..ef8ca5f7d 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -302,6 +302,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-15" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0a7d11c1dab549c1a", + "us-east-1": "snap-0b857f1dbf2e86a1f" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-15", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-15" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0a8c284701dd1663b", + "us-east-1": "snap-03c6f5c7e527df09a" + } + ] } ] } From eeb997f8f19b41ef1d12818b3a72f8ec86eab596 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 29 Dec 2025 17:14:22 +0100 Subject: [PATCH 615/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef8ca5f7d..eac5923bf 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -334,6 +334,31 @@ ] } ] + }, + { + "version": "11.3.1", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-065286c2c445a2775", + "us-east-1": "snap-0b5a3b6127ed8e148" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-11-3-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-3-1" + } + ] + } + ] } ] }, From 186fc83201a159339afb2066dfd73ac755eb1ab9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 29 Dec 2025 18:27:48 +0100 Subject: [PATCH 616/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index eac5923bf..f64409176 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -357,6 +357,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-3-1" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0bdea6e84ec67ddfb", + "us-east-1": "snap-005c5b261056d32be" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-11-3-1", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-11-3-1" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-06d90281190cd0b01", + "us-east-1": "snap-0fc071a9262e8599b" + } + ] } ] } From 49d4690c9f65efb161a8096499cadf81f54d35e7 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 30 Dec 2025 08:26:50 +0100 Subject: [PATCH 617/765] Bump Jira/JSM to 11.3.1 --- README.md | 4 +- app/util/k8s/dcapt-small.tfvars | 4 +- app/util/k8s/dcapt-snapshots.json | 110 ------------------------------ app/util/k8s/dcapt.tfvars | 4 +- 4 files changed, 6 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index 22df3fb85..3391e4841 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): `10.3.12`, `11.3.0` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `10.3.12`, `11.3.1` * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `10.3.12`, `11.3.0` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `10.3.12`, `11.3.1` * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.9`, `10.2.1` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 15469223c..40f7b47a9 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -89,10 +89,10 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version. -jira_version_tag = "11.3.0" +jira_version_tag = "11.3.1" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "11.3.0" +# jira_version_tag = "11.3.1" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large jira_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f64409176..2e44b1008 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -1,61 +1,6 @@ { "jira": { "versions": [ - { - "version": "11.3.0", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-05857a77bc09f345e", - "us-east-1": "snap-0e414e5d81cc5eaa3" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-11-3-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-11-3-0" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0478259eeff42f204", - "us-east-1": "snap-06da8df54d086c246" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-11-3-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-11-3-0" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-08c28c814cce27efc", - "us-east-1": "snap-018a17be898c38739" - } - ] - } - ] - }, { "version": "10.3.15", "data": [ @@ -225,61 +170,6 @@ } ] }, - { - "version": "11.3.0", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-0a099cabd853450bb", - "us-east-1": "snap-04f86635f46e78198" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-11-3-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-11-3-0" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0d11f3890b4253269", - "us-east-1": "snap-02ba81f7a31bd147b" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-11-3-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-11-3-0" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0835551d051d8886b", - "us-east-1": "snap-022edf5a472f6e1ae" - } - ] - } - ] - }, { "version": "10.3.15", "data": [ diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 5946dcfc7..2d446ad1f 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -110,11 +110,11 @@ jira_image_repository = "atlassian/jira-software" # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # Jira version -jira_version_tag = "11.3.0" +jira_version_tag = "11.3.1" # JSM version # ! REQUIRED for JSM ! -# jira_version_tag = "11.3.0" +# jira_version_tag = "11.3.1" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large. jira_dataset_size = "large" From 58f5346fb869dc70d86be0756512607b20a5bb15 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 30 Dec 2025 09:43:14 +0100 Subject: [PATCH 618/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f64409176..bf1b1a34a 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -505,6 +505,32 @@ } ], "build_number": "9403" + }, + { + "version": "9.2.13", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-066c381fdc33458bf", + "us-east-1": "snap-0e39690f01312f00e" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-13", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-13" + } + ] + } + ], + "build_number": "9111" } ] }, From 30673cdfd3374b3109fc23080109162ec5a05ce9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Dec 2025 09:10:58 +0000 Subject: [PATCH 619/765] Update dependency org.apache.logging.log4j:log4j-core to v2.25.3 [SECURITY] --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index b53ccde19..15aa73390 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -102,7 +102,7 @@ org.apache.logging.log4j log4j-core - 2.25.2 + 2.25.3 org.apache.logging.log4j From 913379e783d4cb5e521f9c7920a834c89ef27c6b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 31 Dec 2025 01:13:03 +0100 Subject: [PATCH 620/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 3cc89988f..390af22af 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -418,6 +418,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-13" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0c088f193f2d35664", + "us-east-1": "snap-01048de412bc5d8e8" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-13", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-13" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-04fc92a8f62bf76b9", + "us-east-1": "snap-0b43639ae4bf65a88" + } + ] } ], "build_number": "9111" From 74a61bb1f483611dfcbe5b3bf8d40028708807c6 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 31 Dec 2025 08:39:27 +0100 Subject: [PATCH 621/765] Bump Confluence to 9.2.13 --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 56 ------------------------------- 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/README.md b/README.md index 3391e4841..81b1a21b5 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): `10.3.12`, `11.3.1` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.9`, `10.2.1` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.13`, `10.2.1` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.24`, `9.4.12` and `10.0.1` Platform release diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 390af22af..01b7dc6fe 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -284,62 +284,6 @@ }, "confluence": { "versions": [ - { - "version": "9.2.9", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-076742658a22f1dbd", - "us-east-1": "snap-03472b3f05e7f5bfc" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-9" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0c05810642150a381", - "us-east-1": "snap-0813a01df87065be2" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-9" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0571f817c05b4097d", - "us-east-1": "snap-067e27a8a1df50e42" - } - ] - } - ], - "build_number": "9111" - }, { "version": "10.2.1", "data": [ From 4ad1fc18ff8e4e978a499622bbc8b84bf13a1493 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 31 Dec 2025 14:25:02 +0100 Subject: [PATCH 622/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 01b7dc6fe..b2dfc2b07 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -395,6 +395,32 @@ } ], "build_number": "9111" + }, + { + "version": "10.2.2", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0a81429e6b4fd3099", + "us-east-1": "snap-06b8cc895b8a63d54" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-2-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-2-2" + } + ] + } + ], + "build_number": "9405" } ] }, From ab49bc63ceba689c575a7723bb345a29cb43ffea Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 Jan 2026 06:00:56 +0100 Subject: [PATCH 623/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 5309c856c..c15874c4e 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From d5374fbb1854a9e911091ecc849a8abf7825fbc7 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 Jan 2026 06:00:57 +0100 Subject: [PATCH 624/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 35f973f30..60a6b3f24 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b8f629ed48a30fc3744678c435a8540d4e4dd5e5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 Jan 2026 06:00:58 +0100 Subject: [PATCH 625/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 8fde48eaa..e5073dcef 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 3f2d46413c12fc5b9f7a26b4fc07ab740947eae5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 Jan 2026 06:00:58 +0100 Subject: [PATCH 626/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 3c22b5d17..0ffa9860b 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6777b88ed1a0e67d6e375bfaffc286bf4aafa31e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 7 Jan 2026 06:00:59 +0100 Subject: [PATCH 627/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index c9dc5f6e3..86a68c9bc 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.169" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fefaba072fa96bccda55376d183d482cffcc02df Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 8 Jan 2026 11:45:00 +0100 Subject: [PATCH 628/765] Fix /rest/zdu/cluster response handler for local setup --- app/util/api/confluence_clients.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/util/api/confluence_clients.py b/app/util/api/confluence_clients.py index b6308191c..7fb0b35ba 100644 --- a/app/util/api/confluence_clients.py +++ b/app/util/api/confluence_clients.py @@ -135,9 +135,15 @@ def get_confluence_nodes(self): error_msg='Could not get Confluence nodes count via API', expected_status_codes=[ 200, + 401, 403, 500]) - if response.status_code == 403 and 'clustered installation' in response.text: + if (response.status_code in [401,403] and + ('clustered installation' in response.text or + ('www-authenticate' in response.headers and + 'clustered installation' in response.headers['www-authenticate']) + ) + ): return 'Server' nodes = [node['id'] for node in response.json()['nodes']] return nodes From 901734cc7a6db37ed3ac3714ed07a66ddf5f38c4 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 8 Jan 2026 14:32:38 +0100 Subject: [PATCH 629/765] Reduce number of threads in crowd_client when searching users in prepare data phase to cpu_count / 2 --- app/util/api/crowd_clients.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/api/crowd_clients.py b/app/util/api/crowd_clients.py index 9be32e6f6..12e0d63f3 100644 --- a/app/util/api/crowd_clients.py +++ b/app/util/api/crowd_clients.py @@ -71,7 +71,7 @@ def search_users(i): return loop_users num_cores = cpu_count() - pool = ThreadPool(processes=num_cores) + pool = ThreadPool(processes=max(round(num_cores / 2), 2)) loop_users_list = pool.map(search_users, [i for i in range(loop_count)]) print("") # new line users = [user for loop_users in loop_users_list for user in loop_users] From 04ced3ca540d50119fc26e1d7b56f69505ca3779 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 8 Jan 2026 15:28:48 +0100 Subject: [PATCH 630/765] Even more reduce --- app/util/api/crowd_clients.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/api/crowd_clients.py b/app/util/api/crowd_clients.py index 12e0d63f3..089b4480a 100644 --- a/app/util/api/crowd_clients.py +++ b/app/util/api/crowd_clients.py @@ -71,7 +71,7 @@ def search_users(i): return loop_users num_cores = cpu_count() - pool = ThreadPool(processes=max(round(num_cores / 2), 2)) + pool = ThreadPool(processes=max(round(num_cores / 4), 2)) loop_users_list = pool.map(search_users, [i for i in range(loop_count)]) print("") # new line users = [user for loop_users in loop_users_list for user in loop_users] From d39e6cbe30557a9f3227ecb3c6ed3b03c5e7eb1c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 8 Jan 2026 16:54:10 +0100 Subject: [PATCH 631/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index b2dfc2b07..74c9f1685 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -590,6 +590,32 @@ } ], "build_number": "2500" + }, + { + "version": "7.1.3", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0226bd02f53c8cade", + "us-east-1": "snap-0b9becd90f8c4227d" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-7-1-3", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-7-1-3" + } + ] + } + ], + "build_number": "2503" } ] } From 3f1be0183899c963ee5e520da7a26a2bcd58d373 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 8 Jan 2026 17:03:37 +0100 Subject: [PATCH 632/765] Bump Crowd to 7.1.3 --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 26 -------------------------- app/util/k8s/dcapt.tfvars | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 81b1a21b5..ab3dc283a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.24`, `9.4.12` and `10.0.1` Platform release * Supported Crowd versions: - * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.1.0` + * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.1.3` * Supported Bamboo versions: * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.9` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 74c9f1685..2bed8cc06 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -565,32 +565,6 @@ }, "crowd": { "versions": [ - { - "version": "7.1.0", - "data": [ - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0fce9e4ed6ed58794", - "us-east-1": "snap-0f2122473e0455894" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-crowd-7-1-0", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-crowd-7-1-0" - } - ] - } - ], - "build_number": "2500" - }, { "version": "7.1.3", "data": [ diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 2d446ad1f..ea526221a 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -335,7 +335,7 @@ bitbucket_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -crowd_version_tag = "7.1.0" +crowd_version_tag = "7.1.3" # Helm chart version of Crowd and Crowd agent instances. By default the latest version is installed. # crowd_helm_chart_version = "" From 07064adea206c32dd59277da02d64911a252cf49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 8 Jan 2026 17:09:57 +0100 Subject: [PATCH 633/765] removed unused jsm snapshot --- app/util/k8s/dcapt-snapshots.json | 55 ------------------------------- 1 file changed, 55 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 74c9f1685..081a13ca9 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -115,61 +115,6 @@ }, "jsm": { "versions": [ - { - "version": "10.3.12", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-085ee08f797710aa5", - "us-east-1": "snap-0663eb7e4f79e76ef" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-12", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-12" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0f0acc5b92501d3f2", - "us-east-1": "snap-0e4a2ee1a253c16cf" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-12", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-12" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-0880ab71d6fb059ff", - "us-east-1": "snap-0b5e8b65398ea8835" - } - ] - } - ] - }, { "version": "10.3.15", "data": [ From bf081b28524bb6b5abc89ab2820751a42a50f9ed Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 12 Jan 2026 16:31:33 +0100 Subject: [PATCH 634/765] Clear variables used in jmeter_upload_attachment after login_as_specific_user --- app/jmeter/confluence.jmx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/jmeter/confluence.jmx b/app/jmeter/confluence.jmx index 46c89658e..9df5f79a8 100644 --- a/app/jmeter/confluence.jmx +++ b/app/jmeter/confluence.jmx @@ -5500,6 +5500,15 @@ if ( sleep_time > 0 ) { + + groovy + + + true + vars.remove("x_atl_token_view_issue") +vars.remove("x_editable_g2") + + ${__groovy(vars.get("legacy_login_form") == 'false')} false From b60bd7c429e11f106836660baf9042466f3176d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Jan 2026 21:00:12 +0000 Subject: [PATCH 635/765] Bump filelock from 3.20.1 to 3.20.3 Bumps [filelock](https://github.com/tox-dev/py-filelock) from 3.20.1 to 3.20.3. - [Release notes](https://github.com/tox-dev/py-filelock/releases) - [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/py-filelock/compare/3.20.1...3.20.3) --- updated-dependencies: - dependency-name: filelock dependency-version: 3.20.3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3219c9e25..81cc2a8d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pandas==2.3.3 pytest==8.4.2 locust==2.42.1 selenium==4.38.0 -filelock==3.20.1 +filelock==3.20.3 packaging==25.0 prettytable==3.16.0 bzt==1.16.46 From ab43b44fb25b6889b70a24c562259813fa291d4b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Jan 2026 21:00:45 +0000 Subject: [PATCH 636/765] Update dependency filelock to v3.20.3 [SECURITY] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ab3a6e47b..3d29fadb8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pandas==2.3.3 pytest==8.4.2 locust==2.42.1 selenium==4.39.0 -filelock==3.20.0 +filelock==3.20.3 packaging==25.0 prettytable==3.16.0 bzt==1.16.46 From 8bfc39e9246756442c809d71ec0e8e15c13d3a48 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 15 Jan 2026 13:56:00 +0100 Subject: [PATCH 637/765] Validate jmeter version format on start --- app/util/jmeter/start_jmeter_ui.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/util/jmeter/start_jmeter_ui.py b/app/util/jmeter/start_jmeter_ui.py index ca6de3681..f4750939b 100644 --- a/app/util/jmeter/start_jmeter_ui.py +++ b/app/util/jmeter/start_jmeter_ui.py @@ -1,4 +1,5 @@ import argparse +import re from pathlib import Path from platform import system from subprocess import run @@ -109,6 +110,10 @@ def trim_string(text): def get_settings(self): obj = self.read_yml_file(self.yml) self.env_settings = obj['settings']['env'] + jmeter_version = self.env_settings.get('JMETER_VERSION') + if jmeter_version and not re.match(r'^\d+(\.\d+)*$', str(jmeter_version)): + raise SystemExit( + f"ERROR: Invalid JMETER_VERSION format '{jmeter_version}'") hostname = self.env_settings['application_hostname'] if hostname in DEFAULT_HOSTNAMES and not self.args.skip_check: raise SystemExit(f"ERROR: Check 'application_hostname' correctness in " @@ -140,6 +145,7 @@ def print_settings(self, settings): def launch_jmeter_ui(self): jmeter_path = JMETER_HOME / str(self.env_settings['JMETER_VERSION']) / 'bin' / 'jmeter' + print(jmeter_path) command = [str(jmeter_path), "-p", str(PROPERTIES), "-t", str(self.jmx)] print(f"JMeter start command: {' '.join(command)}") print(f"Working dir: {APP_DIR}") From 290c8f3ac02167c3f43a1d64513372f9f92a1ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Mon, 19 Jan 2026 15:08:03 +0100 Subject: [PATCH 638/765] Bumped bamboo version --- README.md | 2 +- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ab3dc283a..ef8aacd88 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.1.3` * Supported Bamboo versions: - * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.9` + * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.14` ## Support In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel. diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 15aa73390..6c6d5c98f 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 10.2.9 + 10.2.14 diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index ea526221a..151e9e36f 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -399,8 +399,8 @@ crowd_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true", "-Datlassian.up # By default, latest supported by DCAPT version is set. # https://hub.docker.com/r/atlassian/bamboo/tags # https://hub.docker.com/r/atlassian/bamboo-agent-base/tags -bamboo_version_tag = "10.2.9" -bamboo_agent_version_tag = "10.2.9" +bamboo_version_tag = "10.2.14" +bamboo_agent_version_tag = "10.2.14" # Helm chart version of Bamboo and Bamboo agent instances # bamboo_helm_chart_version = "" From 6cfa3c39a6f57dac99c388fc1560b62d2e251e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Mon, 19 Jan 2026 16:03:03 +0100 Subject: [PATCH 639/765] Bumped dependency versions in pom.xml --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 6c6d5c98f..3b6639680 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -92,12 +92,12 @@ commons-codec commons-codec - 1.19.0 + 1.20.0 org.apache.logging.log4j log4j-api - 2.25.2 + 2.25.3 org.apache.logging.log4j @@ -107,7 +107,7 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.25.2 + 2.25.3 From d0d5efad5a1ebf862e3e18346aa340ac679b7486 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 20 Jan 2026 10:22:34 +0100 Subject: [PATCH 640/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 405f6cf20..fde74430c 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -363,6 +363,36 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-2-2" } ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0aec260dbb558b9e0", + "us-east-1": "snap-090156ad8c8963599" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-2-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-2-2" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-02fac9e3f5c373412", + "us-east-1": "snap-056af91c80b436604" + } + ] } ], "build_number": "9405" From 67936f323c79af64bc92864f2edce4b497e42bf3 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 20 Jan 2026 11:07:36 +0100 Subject: [PATCH 641/765] Bump Confluence 10.2 --- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 56 ------------------------------- app/util/k8s/dcapt.tfvars | 2 +- 3 files changed, 2 insertions(+), 58 deletions(-) diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 40f7b47a9..6353d67ad 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -161,7 +161,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "10.2.1" +confluence_version_tag = "10.2.2" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index fde74430c..dfc81978d 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -229,62 +229,6 @@ }, "confluence": { "versions": [ - { - "version": "10.2.1", - "data": [ - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-2": "snap-06539327a4ecaa580", - "us-east-1": "snap-04810522502049ae7" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-2-1", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-2-1" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-02ffec9429d302d4f", - "us-east-1": "snap-07a005f562cd9e4a4" - } - ] - }, - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-2-1", - "us-east-1": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-2-1" - } - ] - }, - { - "type": "local-home", - "size": "large", - "snapshots": [ - { - "us-east-2": "snap-037fed47915b233dc", - "us-east-1": "snap-0e69c87f7ff829af8" - } - ] - } - ], - "build_number": "9403" - }, { "version": "9.2.13", "data": [ diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 151e9e36f..156d246d9 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -172,7 +172,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "10.2.1" +confluence_version_tag = "10.2.2" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "large" From c88dd33c16b8656fc25a7763a3e81ce4998a5b7f Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 20 Jan 2026 11:07:45 +0100 Subject: [PATCH 642/765] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef8aacd88..f452899c3 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): `10.3.12`, `11.3.1` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.13`, `10.2.1` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.13`, `10.2.2` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.24`, `9.4.12` and `10.0.1` Platform release From ba019eb55f8bfc402668f0464bd622162e02eb96 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 21 Jan 2026 06:01:26 +0100 Subject: [PATCH 643/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index c15874c4e..2c712efff 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 268ee348ecef78cfac55a0652cbc0c316d1a31ee Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 21 Jan 2026 06:01:27 +0100 Subject: [PATCH 644/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 60a6b3f24..13e70d478 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b6b33476ab592310f7526610689fac1ea595d592 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 21 Jan 2026 06:01:28 +0100 Subject: [PATCH 645/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index e5073dcef..7ba67fd36 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 42e3181d749e4260c60c6101f120c1540ea6b416 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 21 Jan 2026 06:01:28 +0100 Subject: [PATCH 646/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 0ffa9860b..56f048932 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e0aed600f674475be52cac774e98754db11ab4bb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 21 Jan 2026 06:01:29 +0100 Subject: [PATCH 647/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 86a68c9bc..717eaf6a6 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "143.0.7499.192" # Supports Chrome version 143. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 948c193be384b2494eb747e82cc8042c72e1bd50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 22 Jan 2026 08:51:26 +0100 Subject: [PATCH 648/765] Reverted requirements.txt and urwid fix fot locust error --- requirements.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3d29fadb8..5fedc1331 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,14 @@ -matplotlib==3.10.7 -pandas==2.3.3 -pytest==8.4.2 -locust==2.42.1 -selenium==4.39.0 -filelock==3.20.3 +matplotlib==3.9.4 +pandas==2.3.2 +pytest==8.4.1 +locust==2.34.0 +selenium==4.35.0 +filelock==3.19.1 packaging==25.0 prettytable==3.16.0 -bzt==1.16.46 -boto3==1.40.67 +bzt==1.16.45 +urwid==2.1.2 +boto3==1.40.16 retry==0.9.2 apiritif==1.1.3 pytest-xdist==3.8.0 \ No newline at end of file From 6dcfcbdca626813287328a3598ad8aa62ae98565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Fri, 23 Jan 2026 15:27:57 +0100 Subject: [PATCH 649/765] Update supported versions of python to 3.10-3.14 Bump dockerfile python image Bump requirements.txt Readme.md information about urwid==2.1.2 while using locust --- Dockerfile | 2 +- README.md | 4 +++- app/util/jmeter/start_jmeter_ui.py | 2 +- app/util/pre_run/environment_checker.py | 2 +- requirements.txt | 19 +++++++++---------- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d3053ca9..13dd26f25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # bzt run: docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt jira.yml # interactive run: docker run -it --entrypoint="/bin/bash" -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt -FROM python:3.13-slim-bookworm +FROM python:3.14-slim-bookworm ENV APT_INSTALL="apt-get -y install --no-install-recommends" diff --git a/README.md b/README.md index f452899c3..eec9dd2b8 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ In case of technical questions, issues or problems with DC Apps Performance Tool ## Installation and set up #### Dependencies -* Python 3.9 - 3.13 and pip +* Python 3.10 - 3.14 and pip * JDK 17 or JDK 21 * Google Chrome web browser * Git client (only for Bitbucket DC) @@ -75,6 +75,8 @@ source venv/bin/activate 4. Install dependencies: ``` pip install -r requirements.txt + +pip install urwid==2.1.2 --force-reinstall # if you intend to use locust as main load-executor while runnning tests ``` ### Linux setup diff --git a/app/util/jmeter/start_jmeter_ui.py b/app/util/jmeter/start_jmeter_ui.py index f4750939b..46d637937 100644 --- a/app/util/jmeter/start_jmeter_ui.py +++ b/app/util/jmeter/start_jmeter_ui.py @@ -7,7 +7,7 @@ import yaml -SUPPORTED_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13"] +SUPPORTED_PYTHON_VERSIONS = ["3.10", "3.11", "3.12", "3.13", "3.14"] python_full_version = '.'.join(map(str, version_info[0:3])) python_short_version = '.'.join(map(str, version_info[0:2])) diff --git a/app/util/pre_run/environment_checker.py b/app/util/pre_run/environment_checker.py index 5e862b38e..b5853ad08 100644 --- a/app/util/pre_run/environment_checker.py +++ b/app/util/pre_run/environment_checker.py @@ -1,6 +1,6 @@ from sys import version_info -SUPPORTED_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13"] +SUPPORTED_PYTHON_VERSIONS = ["3.10", "3.11", "3.12", "3.13", "3.14"] python_full_version = '.'.join(map(str, version_info[0:3])) python_short_version = '.'.join(map(str, version_info[0:2])) diff --git a/requirements.txt b/requirements.txt index 5fedc1331..12bd324e2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,13 @@ -matplotlib==3.9.4 -pandas==2.3.2 -pytest==8.4.1 -locust==2.34.0 -selenium==4.35.0 -filelock==3.19.1 +matplotlib==3.10.8 +pandas==2.3.3 +pytest==9.0.2 +locust==2.43.1 +selenium==4.39.0 +filelock==3.20.3 packaging==25.0 -prettytable==3.16.0 -bzt==1.16.45 -urwid==2.1.2 -boto3==1.40.16 +prettytable==3.17.0 +bzt==1.16.46 +boto3==1.42.33 retry==0.9.2 apiritif==1.1.3 pytest-xdist==3.8.0 \ No newline at end of file From 6e811ad389e7997d9eae606acbd31c406e24064d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 Jan 2026 06:00:47 +0100 Subject: [PATCH 650/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 2c712efff..8992c2dcd 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ef032a732d89793a4b7705982368e8bcdfea365d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 Jan 2026 06:00:48 +0100 Subject: [PATCH 651/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 13e70d478..65e7cdbbb 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5e4cea75fbe94471b6da8b75f04f923b23e91fe3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 Jan 2026 06:00:49 +0100 Subject: [PATCH 652/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 7ba67fd36..7a358ead4 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f4ebae069359d329db710d333a990262ae78a85e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 Jan 2026 06:00:49 +0100 Subject: [PATCH 653/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 56f048932..e3ef53123 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c7b216fc58b60601431afbaaa73b9a2afc67f304 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 28 Jan 2026 06:00:50 +0100 Subject: [PATCH 654/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 717eaf6a6..2be5da219 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.96" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9500a548a1d073ca200736056fd71cf36e9c4698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Wed, 28 Jan 2026 09:30:11 +0100 Subject: [PATCH 655/765] Removed python 3.14 support Changed selenium version in platform ymls --- Dockerfile | 2 +- README.md | 8 +++++--- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- app/util/jmeter/start_jmeter_ui.py | 2 +- app/util/pre_run/environment_checker.py | 2 +- 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13dd26f25..8d3053ca9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # bzt run: docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt jira.yml # interactive run: docker run -it --entrypoint="/bin/bash" -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt -FROM python:3.14-slim-bookworm +FROM python:3.13-slim-bookworm ENV APT_INSTALL="apt-get -y install --no-install-recommends" diff --git a/README.md b/README.md index eec9dd2b8..272daf274 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ In case of technical questions, issues or problems with DC Apps Performance Tool ## Installation and set up #### Dependencies -* Python 3.10 - 3.14 and pip +* Python 3.10 - 3.13 and pip * JDK 17 or JDK 21 * Google Chrome web browser * Git client (only for Bitbucket DC) @@ -75,8 +75,10 @@ source venv/bin/activate 4. Install dependencies: ``` pip install -r requirements.txt - -pip install urwid==2.1.2 --force-reinstall # if you intend to use locust as main load-executor while runnning tests +``` +5. Optional: Reinstall urwid package if you intend to use locust as main load-executor while runnning tests: +``` +pip install urwid==2.1.2 --force-reinstall ``` ### Linux setup diff --git a/app/bamboo.yml b/app/bamboo.yml index 2c712efff..8e207f4a1 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -53,7 +53,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.38.0 + - selenium==4.39.0 execution: - scenario: jmeter executor: jmeter diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 7ba67fd36..cf82f6179 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -39,7 +39,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.38.0 + - selenium==4.39.0 execution: - scenario: ${load_executor} concurrency: ${concurrency} diff --git a/app/confluence.yml b/app/confluence.yml index 13e70d478..d30e28cea 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -54,7 +54,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.38.0 + - selenium==4.39.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jira.yml b/app/jira.yml index 56f048932..a2d979f5d 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -54,7 +54,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.38.0 + - selenium==4.39.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jsm.yml b/app/jsm.yml index 717eaf6a6..2495b5b96 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -69,7 +69,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.38.0 + - selenium==4.39.0 execution: - scenario: ${load_executor}_agents executor: ${load_executor} diff --git a/app/util/jmeter/start_jmeter_ui.py b/app/util/jmeter/start_jmeter_ui.py index 46d637937..8f45ef22d 100644 --- a/app/util/jmeter/start_jmeter_ui.py +++ b/app/util/jmeter/start_jmeter_ui.py @@ -7,7 +7,7 @@ import yaml -SUPPORTED_PYTHON_VERSIONS = ["3.10", "3.11", "3.12", "3.13", "3.14"] +SUPPORTED_PYTHON_VERSIONS = ["3.10", "3.11", "3.12", "3.13"] python_full_version = '.'.join(map(str, version_info[0:3])) python_short_version = '.'.join(map(str, version_info[0:2])) diff --git a/app/util/pre_run/environment_checker.py b/app/util/pre_run/environment_checker.py index b5853ad08..0113f2cee 100644 --- a/app/util/pre_run/environment_checker.py +++ b/app/util/pre_run/environment_checker.py @@ -1,6 +1,6 @@ from sys import version_info -SUPPORTED_PYTHON_VERSIONS = ["3.10", "3.11", "3.12", "3.13", "3.14"] +SUPPORTED_PYTHON_VERSIONS = ["3.10", "3.11", "3.12", "3.13"] python_full_version = '.'.join(map(str, version_info[0:3])) python_short_version = '.'.join(map(str, version_info[0:2])) From 9c969ad8958aca3899069135cc3231ee568e043a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 29 Jan 2026 06:00:45 +0100 Subject: [PATCH 656/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 8992c2dcd..cebdc983e 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4cd00b7bb0ae7e4c08c22f2aae31d735e8d80cb8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 29 Jan 2026 06:00:46 +0100 Subject: [PATCH 657/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 65e7cdbbb..38520b405 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2c34d77b1b353407b7b27fa9533fd87e027bff5d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 29 Jan 2026 06:00:47 +0100 Subject: [PATCH 658/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 7a358ead4..08238ef26 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 36f5d46929115d17d4bc664d7e463bc8e4f93627 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 29 Jan 2026 06:00:48 +0100 Subject: [PATCH 659/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index e3ef53123..7665c9527 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 33a2481f6d8551d3fc15d1994faf5e7de73d80e6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 29 Jan 2026 06:00:48 +0100 Subject: [PATCH 660/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 2be5da219..b383a496a 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5ef811cf2923f44b511af6292c4cf3950f8cf8db Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 29 Jan 2026 14:11:30 +0100 Subject: [PATCH 661/765] Increate execution pod resources --- app/util/k8s/dcapt.tfvars | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 156d246d9..066ca4605 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -87,10 +87,10 @@ max_cluster_capacity = 6 # Create a docker-in-docker privileged container as execution environment pod start_test_deployment = "true" -test_deployment_cpu_request = "3" -test_deployment_cpu_limit = "4" -test_deployment_mem_request = "8Gi" -test_deployment_mem_limit = "8Gi" +test_deployment_cpu_request = "7" +test_deployment_cpu_limit = "8" +test_deployment_mem_request = "15Gi" +test_deployment_mem_limit = "16Gi" ################################################################################ # Jira/JSM Settings From 26299552699219045a3dc13dfb2cc1104884c618 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 29 Jan 2026 14:59:27 +0100 Subject: [PATCH 662/765] Get rid of retry dependency and replace that by own short decorator --- app/util/k8s/terminate_cluster.py | 32 +++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/app/util/k8s/terminate_cluster.py b/app/util/k8s/terminate_cluster.py index 13b30f19f..9d2a124bc 100644 --- a/app/util/k8s/terminate_cluster.py +++ b/app/util/k8s/terminate_cluster.py @@ -2,14 +2,13 @@ from argparse import ArgumentParser from datetime import datetime, timedelta from time import sleep, time +from functools import wraps import boto3 import botocore from boto3.exceptions import Boto3Error from botocore import exceptions -from retry import retry - DEFAULT_RETRY_COUNT = 3 DEFAULT_RETRY_DELAY = 10 @@ -18,6 +17,23 @@ REGIONS = [US_EAST_2, US_EAST_1] +def retry(exception_type=Exception, tries=DEFAULT_RETRY_COUNT, delay=DEFAULT_RETRY_DELAY): + def decorator(func): + @wraps(func) + def wrapper(*args, **kwargs): + for attempt in range(tries): + try: + return func(*args, **kwargs) + except exception_type as e: + logging.error(f"Attempt {attempt + 1} failed with error: {e}") + if attempt < tries - 1: + time.sleep(delay) + else: + raise + return wrapper + return decorator + + def is_float(element): try: float(element) @@ -268,7 +284,7 @@ def delete_hosted_zone_record_if_exists(aws_region, cluster_name): logging.error(f"Unexpected error occurs: {e}") -@retry(Exception, tries=DEFAULT_RETRY_COUNT, delay=DEFAULT_RETRY_DELAY) +@retry() def delete_lb(aws_region, vpc_id): elb_client = boto3.client('elb', region_name=aws_region) try: @@ -313,7 +329,7 @@ def wait_for_nat_gateway_delete(ec2, nat_gateway_id): logging.error(f"NAT gateway with id {nat_gateway_id} was not deleted in {timeout} seconds.") -@retry(Exception, tries=DEFAULT_RETRY_COUNT, delay=DEFAULT_RETRY_DELAY) +@retry() def delete_nat_gateway(aws_region, vpc_id): ec2_client = boto3.client('ec2', region_name=aws_region) filters = [{'Name': 'vpc-id', 'Values': [f'{vpc_id}', ]}, ] @@ -333,7 +349,7 @@ def delete_nat_gateway(aws_region, vpc_id): logging.error(f"Deleting NAT gateway with id {nat_gateway_id} failed with error: {e}") -@retry(Exception, tries=DEFAULT_RETRY_COUNT, delay=DEFAULT_RETRY_DELAY) +@retry() def delete_igw(ec2_resource, vpc_id): vpc_resource = ec2_resource.Vpc(vpc_id) igws = vpc_resource.internet_gateways.all() @@ -355,7 +371,7 @@ def delete_igw(ec2_resource, vpc_id): logging.error(f"Deleting igw failed with error: {e}") -@retry(Exception, tries=12, delay=DEFAULT_RETRY_DELAY) +@retry(tries=12) def delete_subnets(ec2_resource, vpc_id, aws_region): vpc_resource = ec2_resource.Vpc(vpc_id) subnets_all = vpc_resource.subnets.all() @@ -381,7 +397,7 @@ def delete_subnets(ec2_resource, vpc_id, aws_region): logging.error(f"Delete of subnet failed with error: {e}") -@retry(Exception, tries=DEFAULT_RETRY_COUNT, delay=DEFAULT_RETRY_DELAY) +@retry() def delete_route_tables(ec2_resource, vpc_id): vpc_resource = ec2_resource.Vpc(vpc_id) rtbs = vpc_resource.route_tables.all() @@ -398,7 +414,7 @@ def delete_route_tables(ec2_resource, vpc_id): logging.error(f"Delete of route table failed with error: {e}") -@retry(Exception, tries=DEFAULT_RETRY_COUNT, delay=DEFAULT_RETRY_DELAY) +@retry() def delete_security_groups(ec2_resource, vpc_id): vpc_resource = ec2_resource.Vpc(vpc_id) sgps = vpc_resource.security_groups.all() From 38657bc8a315ce020c208048c5ec5987b5cab6f7 Mon Sep 17 00:00:00 2001 From: bhyde Date: Fri, 30 Jan 2026 11:03:55 +1100 Subject: [PATCH 663/765] Revert "Merge pull request #2002 from atlassian/ci-update-chromedriver-145" This reverts commit 055667b67fee671d21804659e99509f6d935e398, reversing changes made to 5a1924bd24bd72ff4479ac347149b2323801253d. --- 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 1bae24ceb..0c89033d1 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/bitbucket.yml b/app/bitbucket.yml index db91f5fbc..2e6bcf8e4 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/confluence.yml b/app/confluence.yml index 43d522027..b56bfd0d2 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jira.yml b/app/jira.yml index 117d4d65e..7ee1ead6e 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jsm.yml b/app/jsm.yml index 62a60eeb5..727d39169 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bfc4f146d014812bd5de2710705fa3b5e85f5bed Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 31 Jan 2026 06:01:38 +0100 Subject: [PATCH 664/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 0c89033d1..1bae24ceb 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a242dce8b5620fce78004dd654ccdc2f3572ec51 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 31 Jan 2026 06:01:39 +0100 Subject: [PATCH 665/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index b56bfd0d2..43d522027 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c50a2c01a1e0d0ad855cd4f4d793c19ab384121b Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 31 Jan 2026 06:01:40 +0100 Subject: [PATCH 666/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 2e6bcf8e4..db91f5fbc 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ab8509cbb92218d141bee0f276653ce33b292bf1 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 31 Jan 2026 06:01:41 +0100 Subject: [PATCH 667/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 7ee1ead6e..117d4d65e 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4a5098c5fea0747076023886e08684f062fb0e7a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 31 Jan 2026 06:01:41 +0100 Subject: [PATCH 668/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 727d39169..62a60eeb5 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From d7767704f9809c029f77a8d4c489e964ecef24a2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Feb 2026 06:00:54 +0100 Subject: [PATCH 669/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 0c89033d1..9240dbf04 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.133" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0a04c968439d76ae47d50ec303069e413d369be9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Feb 2026 06:00:54 +0100 Subject: [PATCH 670/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index b56bfd0d2..0e0f79e21 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.133" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f41a1507c0b4247bbabe8f2eec0bfd77792f057c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Feb 2026 06:00:55 +0100 Subject: [PATCH 671/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 2e6bcf8e4..56e0c4ae1 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.133" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 11bf1ac48cdf376ad21502a7afb0723d97422ad7 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Feb 2026 06:00:56 +0100 Subject: [PATCH 672/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 7ee1ead6e..4bed36a29 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.133" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1eef51ac51fb51c893665c3e4fb4025ccbf90cbd Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Feb 2026 06:00:57 +0100 Subject: [PATCH 673/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 727d39169..9e4a39066 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "144.0.7559.109" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "144.0.7559.133" # Supports Chrome version 144. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ed94012f5b377406f2478c59f20ec031cf6153c1 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 4 Feb 2026 15:29:45 +0100 Subject: [PATCH 674/765] Update DAC --- ...ps-performance-toolkit-user-guide-bamboo.md | 10 +++++----- ...performance-toolkit-user-guide-bitbucket.md | 18 +++++++++--------- ...erformance-toolkit-user-guide-confluence.md | 18 +++++++++--------- ...pps-performance-toolkit-user-guide-crowd.md | 16 ++++++++-------- ...apps-performance-toolkit-user-guide-jira.md | 18 +++++++++--------- ...-apps-performance-toolkit-user-guide-jsm.md | 18 +++++++++--------- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index e1597a6bb..d05d3500e 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: "2025-11-06" +date: "2026-02-04" --- # Data Center App Performance Toolkit User Guide For Bamboo @@ -102,7 +102,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. @@ -303,7 +303,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -334,7 +334,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -368,7 +368,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 72eb93d8b..46ef836d1 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: "2025-11-06" +date: "2026-02-04" --- # Data Center App Performance Toolkit User Guide For Bitbucket @@ -115,7 +115,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -319,7 +319,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -394,7 +394,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -425,7 +425,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -475,7 +475,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -500,7 +500,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -513,7 +513,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -542,7 +542,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index b9140e7ca..eb242ec45 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: "2025-11-06" +date: "2026-02-04" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -474,7 +474,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -504,7 +504,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 9c0fd11d6..d62cfbc9c 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: "2025-11-06" +date: "2026-02-04" --- # Data Center App Performance Toolkit User Guide For Crowd @@ -97,7 +97,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -208,7 +208,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -237,7 +237,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -296,7 +296,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -320,7 +320,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -347,7 +347,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -390,7 +390,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index bd8bb5da7..c47c3ef61 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: "2025-11-06" +date: "2026-02-04" --- # Data Center App Performance Toolkit User Guide For Jira @@ -122,7 +122,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -423,7 +423,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -498,7 +498,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -550,7 +550,7 @@ The re-index time for Jira is about ~50-70 minutes. -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -636,7 +636,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -649,7 +649,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -678,7 +678,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 61fee9f87..f78c092e9 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: "2025-11-06" +date: "2026-02-04" --- # Data Center App Performance Toolkit User Guide For Jira Service Management @@ -124,7 +124,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -459,7 +459,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -539,7 +539,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -594,7 +594,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -679,7 +679,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.12 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -692,7 +692,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -721,7 +721,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.12 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From 274f5460afaf5d24c94fcb979dbd5f54684b08f1 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 4 Feb 2026 16:18:44 +0100 Subject: [PATCH 675/765] Update Jira/JSM 10.3 version in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 272daf274..5b1de1cff 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): `10.3.12`, `11.3.1` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `10.3.15`, `11.3.1` * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `10.3.12`, `11.3.1` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `10.3.15`, `11.3.1` * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.13`, `10.2.2` From 942db2bc91a20ac51076f0815bfc71d0b6683f65 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 4 Feb 2026 16:24:49 +0100 Subject: [PATCH 676/765] Prepare release 8.10.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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 9240dbf04..359a068a5 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for JMeter load executor view_all_builds: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 56e0c4ae1..3f7b50a47 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. diff --git a/app/confluence.yml b/app/confluence.yml index 0e0f79e21..2e16d613f 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. extended_metrics: False # Action percentage for JMeter and Locust load executors diff --git a/app/crowd.yml b/app/crowd.yml index 8d90b55ff..ebb999f12 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index 4bed36a29..759ad6ec5 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors create_issue: 4 diff --git a/app/jsm.yml b/app/jsm.yml index 9e4a39066..9ecd97cf5 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 From 6c3c0cff7a48cc315f9e5dd83487bf18e247d8f5 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Wed, 4 Feb 2026 17:31:17 +0100 Subject: [PATCH 677/765] Bump toolkit version 8.11.0 --- app/util/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/util/conf.py b/app/util/conf.py index d550e0360..93f41bcab 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -2,8 +2,8 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML -TOOLKIT_VERSION = '8.10.0' -UNSUPPORTED_VERSION = '8.6.0' +TOOLKIT_VERSION = '8.11.0' +UNSUPPORTED_VERSION = '8.7.0' def read_yml_file(file): From bf3f2b944fb24f4d382dc92a42baea0b3aea50d4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Feb 2026 06:00:46 +0100 Subject: [PATCH 678/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 1bae24ceb..a95ada6fd 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 91a260dc9df541119c77714661bdcdd52bf7a6fc Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Feb 2026 06:00:47 +0100 Subject: [PATCH 679/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 43d522027..16bc1e6c9 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a50437461206352d32a094e8f2b7d1f904feed5f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Feb 2026 06:00:47 +0100 Subject: [PATCH 680/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index db91f5fbc..6a098650b 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7c086cfbdc239fbe0934f15b3817d34fbbfcc841 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Feb 2026 06:00:48 +0100 Subject: [PATCH 681/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 117d4d65e..d9e97bf45 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0d5ca15e626a1d12b1346490838043ac8657dec9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Feb 2026 06:00:49 +0100 Subject: [PATCH 682/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 62a60eeb5..4453be619 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.26" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4a490c3518d19fd51ecdcb3aaefb18ead1c41c76 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Feb 2026 06:00:47 +0100 Subject: [PATCH 683/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index a95ada6fd..91918ab4e 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a21c9ff75b83ec8fb191ddfa8cf494062a1423b4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Feb 2026 06:00:47 +0100 Subject: [PATCH 684/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 16bc1e6c9..60851f856 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6e0acde5ec2fdae8cf9280aee3886ebfa09fc733 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Feb 2026 06:00:48 +0100 Subject: [PATCH 685/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 6a098650b..bdf8d4889 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ac959ec77ff5543a1f616ec0ff1e202e4b12902a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Feb 2026 06:00:49 +0100 Subject: [PATCH 686/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index d9e97bf45..915b21dd5 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6b417ce82de4ac20b05d33e339c64674053dcd16 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Feb 2026 06:00:50 +0100 Subject: [PATCH 687/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 4453be619..4a11d5455 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.46" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 80d20f59b46908045362135bc646d293690f33ff Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Feb 2026 06:01:02 +0100 Subject: [PATCH 688/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 91918ab4e..49d95c566 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6594d8568c7b062fbf4983c76c7756f8f7ff5747 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Feb 2026 06:01:02 +0100 Subject: [PATCH 689/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 60851f856..b1e3e74a2 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 02b0d13af9d834fd2f77c8108d20a8414c4c1e74 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Feb 2026 06:01:03 +0100 Subject: [PATCH 690/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index bdf8d4889..811c2c064 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ae80609783f623ef277386e85cd3241989bd5c32 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Feb 2026 06:01:04 +0100 Subject: [PATCH 691/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 915b21dd5..8c569c82d 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From dae56a640be1697e3da1f6f48cae865604abf829 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Feb 2026 06:01:05 +0100 Subject: [PATCH 692/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 4a11d5455..9ef36be09 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.67" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6201e35347f6457c39b0efbabb664fe052396a5e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Feb 2026 06:00:49 +0100 Subject: [PATCH 693/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 49d95c566..bbdca8bfd 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b6848562e6bf2ffe2653ac98349b85f660c2d0ed Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Feb 2026 06:00:50 +0100 Subject: [PATCH 694/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index b1e3e74a2..104494625 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a04b77b9aff8f797b7cd13e1b24b8089c4d4fa6c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Feb 2026 06:00:51 +0100 Subject: [PATCH 695/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 811c2c064..4f0727bbc 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From ba3d5c0693e8dc382672d17d8da995d833932cd2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Feb 2026 06:00:51 +0100 Subject: [PATCH 696/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 8c569c82d..e4d2502f4 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From aa3013b122148a48364c96683c9897cd3df46b12 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Feb 2026 06:00:52 +0100 Subject: [PATCH 697/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 9ef36be09..cbed5963a 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.76" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5898d54ee94066c55623624fc113498286bebb62 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Feb 2026 06:00:43 +0100 Subject: [PATCH 698/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index bbdca8bfd..f3dd6a9ea 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 85b77247c56cf28e4e28b4123985921b4581b4d2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Feb 2026 06:00:44 +0100 Subject: [PATCH 699/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 104494625..1b73f280d 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 22af3d7aac04e106419d31a115735c42d078b82d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Feb 2026 06:00:45 +0100 Subject: [PATCH 700/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 4f0727bbc..97d56bf50 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 02518b1369f0842b25c5279cdc441f7289ed31f0 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Feb 2026 06:00:46 +0100 Subject: [PATCH 701/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index e4d2502f4..06fdef9d8 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2fd4a03bfca9dc846af6f9eadc7dd11a6c0875a8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Feb 2026 06:00:47 +0100 Subject: [PATCH 702/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index cbed5963a..3210bb98e 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.77" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fe84b0e28576784913cacb95a9ea8c8277f58c8d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Feb 2026 06:00:48 +0100 Subject: [PATCH 703/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f3dd6a9ea..64ecc30d2 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f9aaad0434fe0f40b9c19069e63cfeb61d48b9d4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Feb 2026 06:00:49 +0100 Subject: [PATCH 704/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 1b73f280d..eb1f55511 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 96daaedac524ceab8f16280a5048755aed09384a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Feb 2026 06:00:49 +0100 Subject: [PATCH 705/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 97d56bf50..2667d045e 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2951a46e67089c63a59d9af8fdddb25ef4252432 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Feb 2026 06:00:50 +0100 Subject: [PATCH 706/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 06fdef9d8..1e587f9ad 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4e8ffa5639fb1b9beacaca7be0976e1c102319a2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Feb 2026 06:00:51 +0100 Subject: [PATCH 707/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 3210bb98e..7eaf4a4cf 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "145.0.7632.117" # Supports Chrome version 145. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 71164149a261ba0605a5d970b9cf7af4c62b29f2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2026 03:45:51 +0000 Subject: [PATCH 708/765] Update dependency com.fasterxml.jackson.core:jackson-core to v2.21.1 [SECURITY] --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 3b6639680..64787b027 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -67,7 +67,7 @@ com.fasterxml.jackson.core jackson-core - 2.20.1 + 2.21.1 com.fasterxml.jackson.core From dec9234fee6949a65d5da5099dd01037f65a6757 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Thu, 5 Mar 2026 14:40:08 +0100 Subject: [PATCH 709/765] Chardet 7.0.1 removed the UniversalDetector class (it was replaced with CharsetMatches), but apiritif 1.1.3 is trying to import it. --- requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 12bd324e2..78c82ee26 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,4 +10,6 @@ bzt==1.16.46 boto3==1.42.33 retry==0.9.2 apiritif==1.1.3 -pytest-xdist==3.8.0 \ No newline at end of file +pytest-xdist==3.8.0 +chardet>=5.0,<6.0 +urllib3==2.5.0 \ No newline at end of file From a71334660ad6b273ca57d75bb132a00f72fa6fc9 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 9 Mar 2026 09:56:39 +0100 Subject: [PATCH 710/765] --no-tmux command line option in bzt_on_pod.sh --- app/util/k8s/bzt_on_pod.sh | 251 ++++++++++++++++++++++--------------- 1 file changed, 148 insertions(+), 103 deletions(-) diff --git a/app/util/k8s/bzt_on_pod.sh b/app/util/k8s/bzt_on_pod.sh index 7e7daeb27..cbd9416c0 100644 --- a/app/util/k8s/bzt_on_pod.sh +++ b/app/util/k8s/bzt_on_pod.sh @@ -28,15 +28,23 @@ else exit 1 fi -# Parse arguments for --ci flag (starting from 2nd argument) +# Parse arguments for --ci and --no-tmux flags (starting from 2nd argument) ci=false +no_tmux=false for ((i=2; i<=$#; i++)); do if [[ "${!i}" == "--ci" ]]; then ci=true - break + elif [[ "${!i}" == "--no-tmux" ]]; then + no_tmux=true fi done +# Validate mutual exclusivity +if [[ "$ci" == "true" && "$no_tmux" == "true" ]]; then + echo "ERROR: --ci and --no-tmux flags are mutually exclusive. Please use only one." + exit 1 +fi + echo "INFO: Update kubeconfig" aws eks update-kubeconfig --name atlas-"$ENVIRONMENT_NAME"-cluster --region "$REGION" @@ -51,34 +59,25 @@ fi echo "INFO: Execution environment pod name: $exec_pod_name" -# Ensure tmux is installed in the pod (using apk for Alpine) -echo "INFO: Ensuring tmux is available in the pod" -kubectl exec -i "$exec_pod_name" -n atlassian -- sh -c "command -v tmux || apk add --no-cache tmux" +# Prepare the dcapt archive locally first +echo "INFO: Preparing dc-app-performance-toolkit archive" +start=$(date +%s) +tar -czf dcapt.tar.gz -C dc-app-performance-toolkit --exclude results --exclude util/k8s app Dockerfile requirements.txt -# Check if tmux session already exists and contains our setup -session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?") +# Copy the archive to the pod +echo "INFO: Copying archive to pod" +kubectl cp dcapt.tar.gz atlassian/"$exec_pod_name":/tmp/dcapt.tar.gz +rm -rf dcapt.tar.gz +end=$(date +%s) +runtime=$((end-start)) +echo "INFO: Archive preparation and copy finished in $runtime seconds" -if [[ "$session_exists" == "0" ]]; then - echo "INFO: Found existing tmux session 'bzt_session', attaching to it..." -else - echo "INFO: Creating new tmux session and running setup inside it" +if [[ "$no_tmux" == "true" ]]; then + echo "INFO: Running bzt execution directly without tmux" - # Prepare the dcapt archive locally first - echo "INFO: Preparing dc-app-performance-toolkit archive" - start=$(date +%s) - tar -czf dcapt.tar.gz -C dc-app-performance-toolkit --exclude results --exclude util/k8s app Dockerfile requirements.txt - - # Copy the archive to the pod - echo "INFO: Copying archive to pod" - kubectl cp dcapt.tar.gz atlassian/"$exec_pod_name":/tmp/dcapt.tar.gz - rm -rf dcapt.tar.gz - end=$(date +%s) - runtime=$((end-start)) - echo "INFO: Archive preparation and copy finished in $runtime seconds" - - # Create the setup script that will run inside tmux - setup_script=" - echo 'INFO: Starting setup inside tmux session' + # Run setup and bzt directly in the pod + kubectl exec -i "$exec_pod_name" -n atlassian -- sh -c " + echo 'INFO: Starting setup' # Cleanup and recreate directory echo 'INFO: Cleanup dc-app-performance-toolkit folder' @@ -96,98 +95,144 @@ else docker build -t $DCAPT_DOCKER_IMAGE dc-app-performance-toolkit fi - # Create a marker file to indicate setup is complete - touch /tmp/dcapt_setup_complete - echo 'INFO: Setup complete, starting bzt execution' # Run bzt docker run --shm-size=4g -v /dc-app-performance-toolkit:/dc-app-performance-toolkit $DCAPT_DOCKER_IMAGE '$1' " + exit_code=$? - # Start tmux session with the complete setup and execution - kubectl exec -i "$exec_pod_name" -n atlassian -- sh -c " - rm -f /tmp/bzt_session.log - tmux new-session -d -s bzt_session \"$setup_script\" - tmux pipe-pane -t bzt_session \"cat > /tmp/bzt_session.log\" - " - - echo "INFO: Tmux session 'bzt_session' created with setup and execution" -fi + if [[ $exit_code -eq 0 ]]; then + echo "INFO: bzt execution completed successfully." + else + echo "ERROR: bzt execution failed with exit code $exit_code." + exit $exit_code + fi +else + # Ensure tmux is installed in the pod (using apk for Alpine) + echo "INFO: Ensuring tmux is available in the pod" + kubectl exec -i "$exec_pod_name" -n atlassian -- sh -c "command -v tmux || apk add --no-cache tmux" -attempt=1 -max_attempts=5 -echo "INFO: Attaching to tmux session 'bzt_session'..." + # Check if tmux session already exists and contains our setup + session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?") -while [ $attempt -le $max_attempts ]; do - echo "INFO: Attempt $attempt to attach to tmux session 'bzt_session'..." - - # Check if session still exists before attempting to attach - session_check=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) - - if [[ "$session_check" != "0" ]]; then - echo "INFO: bzt session has finished or does not exist." - break - fi - - # Different behavior based on ci flag - if [[ "$ci" == "true" ]]; then - # CI mode: stream logs from /tmp/bzt_session.log (non-interactive) - kubectl exec "$exec_pod_name" -n atlassian -- sh -c " - tail -f /tmp/bzt_session.log & - tail_pid=\$! - - while true; do - sleep 5 - if ! tmux has-session -t bzt_session 2>/dev/null; then - break - fi - done - - kill \$tail_pid 2>/dev/null || true - " 2>/dev/null - exit_code=$? + if [[ "$session_exists" == "0" ]]; then + echo "INFO: Found existing tmux session 'bzt_session', attaching to it..." else - # Interactive mode: attach to tmux session - kubectl exec -it "$exec_pod_name" -n atlassian -- tmux attach-session -t bzt_session 2>/dev/null - exit_code=$? + echo "INFO: Creating new tmux session and running setup inside it" + + # Create the setup script that will run inside tmux + setup_script=" + echo 'INFO: Starting setup inside tmux session' + + # Cleanup and recreate directory + echo 'INFO: Cleanup dc-app-performance-toolkit folder' + rm -rf /dc-app-performance-toolkit + mkdir -p /dc-app-performance-toolkit + + # Extract the archive + echo 'INFO: Extracting dc-app-performance-toolkit' + tar xzf /tmp/dcapt.tar.gz -C /dc-app-performance-toolkit + rm -f /tmp/dcapt.tar.gz + + # Docker image rebuild if requested + if [ '$2' = '--docker_image_rebuild' ]; then + echo 'INFO: Rebuilding docker image' + docker build -t $DCAPT_DOCKER_IMAGE dc-app-performance-toolkit + fi + + # Create a marker file to indicate setup is complete + touch /tmp/dcapt_setup_complete + + echo 'INFO: Setup complete, starting bzt execution' + # Run bzt + docker run --shm-size=4g -v /dc-app-performance-toolkit:/dc-app-performance-toolkit $DCAPT_DOCKER_IMAGE '$1' + " + + # Start tmux session with the complete setup and execution + kubectl exec -i "$exec_pod_name" -n atlassian -- sh -c " + rm -f /tmp/bzt_session.log + tmux new-session -d -s bzt_session \"$setup_script\" + tmux pipe-pane -t bzt_session \"cat > /tmp/bzt_session.log\" + " + + echo "INFO: Tmux session 'bzt_session' created with setup and execution" fi - - # Handle different exit scenarios - if [[ $exit_code -eq 0 ]]; then - echo "INFO: Successfully detached from tmux session." - # Double-check if session still exists after clean detachment - session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) - if [[ "$session_exists" != "0" ]]; then - echo "INFO: bzt session has completed." - break - fi - # Clean detachment but session still exists, continue monitoring - echo "INFO: Session still active, continuing to monitor..." - elif [[ $exit_code -ne 0 ]]; then - # Handle network errors or other failures - echo "WARNING: Connection lost (exit code: $exit_code)" + + attempt=1 + max_attempts=5 + echo "INFO: Attaching to tmux session 'bzt_session'..." + + while [ $attempt -le $max_attempts ]; do + echo "INFO: Attempt $attempt to attach to tmux session 'bzt_session'..." - # Verify session still exists before retrying - session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) + # Check if session still exists before attempting to attach + session_check=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) - if [[ "$session_exists" != "0" ]]; then - echo "INFO: bzt session has finished during disconnection." + if [[ "$session_check" != "0" ]]; then + echo "INFO: bzt session has finished or does not exist." break fi - if [ $attempt -eq $max_attempts ]; then - echo "ERROR: Reached maximum number of attempts ($max_attempts). Session may still be running." - echo "ERROR: You can manually reconnect using: kubectl exec -it $exec_pod_name -n atlassian -- tmux attach-session -t bzt_session" - break + # Different behavior based on ci flag + if [[ "$ci" == "true" ]]; then + # CI mode: stream logs from /tmp/bzt_session.log (non-interactive) + kubectl exec "$exec_pod_name" -n atlassian -- sh -c " + tail -f /tmp/bzt_session.log & + tail_pid=\$! + + while true; do + sleep 5 + if ! tmux has-session -t bzt_session 2>/dev/null; then + break + fi + done + + kill \$tail_pid 2>/dev/null || true + " 2>/dev/null + exit_code=$? + else + # Interactive mode: attach to tmux session + kubectl exec -it "$exec_pod_name" -n atlassian -- tmux attach-session -t bzt_session 2>/dev/null + exit_code=$? fi - # Exponential backoff for retries - sleep_time=$((2 + attempt)) - echo "INFO: Network error or disconnect detected, reconnecting to tmux session in $sleep_time seconds (attempt $((attempt+1)))..." - sleep $sleep_time - attempt=$((attempt+1)) - fi -done + # Handle different exit scenarios + if [[ $exit_code -eq 0 ]]; then + echo "INFO: Successfully detached from tmux session." + # Double-check if session still exists after clean detachment + session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) + if [[ "$session_exists" != "0" ]]; then + echo "INFO: bzt session has completed." + break + fi + # Clean detachment but session still exists, continue monitoring + echo "INFO: Session still active, continuing to monitor..." + elif [[ $exit_code -ne 0 ]]; then + # Handle network errors or other failures + echo "WARNING: Connection lost (exit code: $exit_code)" + + # Verify session still exists before retrying + session_exists=$(kubectl exec "$exec_pod_name" -n atlassian -- sh -c "tmux has-session -t bzt_session 2>/dev/null; echo \$?" 2>/dev/null) + + if [[ "$session_exists" != "0" ]]; then + echo "INFO: bzt session has finished during disconnection." + break + fi + + if [ $attempt -eq $max_attempts ]; then + echo "ERROR: Reached maximum number of attempts ($max_attempts). Session may still be running." + echo "ERROR: You can manually reconnect using: kubectl exec -it $exec_pod_name -n atlassian -- tmux attach-session -t bzt_session" + break + fi + + # Exponential backoff for retries + sleep_time=$((2 + attempt)) + echo "INFO: Network error or disconnect detected, reconnecting to tmux session in $sleep_time seconds (attempt $((attempt+1)))..." + sleep $sleep_time + attempt=$((attempt+1)) + fi + done +fi sleep 10 From b3761fcc276f56319133ad3898813ea2701d7fe9 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 9 Mar 2026 14:57:38 +0100 Subject: [PATCH 711/765] Find and delete abandoned TF state dynamoDB tables --- app/util/k8s/terminate_cluster.py | 68 ++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/app/util/k8s/terminate_cluster.py b/app/util/k8s/terminate_cluster.py index 9d2a124bc..52999cbc9 100644 --- a/app/util/k8s/terminate_cluster.py +++ b/app/util/k8s/terminate_cluster.py @@ -27,7 +27,7 @@ def wrapper(*args, **kwargs): except exception_type as e: logging.error(f"Attempt {attempt + 1} failed with error: {e}") if attempt < tries - 1: - time.sleep(delay) + sleep(delay) else: raise return wrapper @@ -985,6 +985,70 @@ def delete_dynamo_bucket_tf_state(cluster_name, aws_region): logging.warning(f"Could not delete dynamo db '{table}': {e}") +def dynamodb_list_tables_all(dynamodb_client): + table_names = [] + paginator = dynamodb_client.get_paginator('list_tables') + for page in paginator.paginate(): + table_names.extend(page.get('TableNames', [])) + return table_names + + +def delete_expired_dynamodb_tables(): + for rgn in REGIONS: + logging.info(f"Region: {rgn}") + dynamodb_client = boto3.client('dynamodb', region_name=rgn) + try: + table_names = dynamodb_list_tables_all(dynamodb_client) + except exceptions.EndpointConnectionError as e: + logging.error(f"Could not connect to DynamoDB endpoint URL: {e}") + continue + + for table_name in table_names: + if not table_name.startswith('atl_dc_'): + continue + try: + table_desc = dynamodb_client.describe_table(TableName=table_name).get('Table', {}) + except botocore.exceptions.ClientError as e: + logging.warning(f"Could not describe DynamoDB table {table_name}: {e}") + continue + + table_arn = table_desc.get('TableArn') + if not table_arn: + continue + + try: + response = dynamodb_client.list_tags_of_resource(ResourceArn=table_arn) + tags = response.get('Tags', []) + except botocore.exceptions.ClientError as e: + raise RuntimeError(f"Could not list tags for {table_arn}: {e}") + persist_days = next((tag.get('Value') for tag in tags if tag.get('Key') == 'persist_days'), None) + if not persist_days: + logging.warning(f"DynamoDB table {table_name} does not have 'persist_days' tag; skipping") + continue + if not is_float(persist_days): + persist_days = 0 + + created_at = table_desc.get('CreationDateTime') + if not created_at: + logging.warning(f"DynamoDB table {table_name} has no CreationDateTime; skipping") + continue + + created_date_timestamp = created_at.timestamp() + persist_seconds = float(persist_days) * 24 * 60 * 60 + now = time() + if created_date_timestamp + persist_seconds > now: + logging.info(f"DynamoDB table {table_name} is not EOL yet; skipping") + continue + + try: + logging.info( + f"DynamoDB table {table_name} is EOL (created_at={created_at.isoformat()}, persist_days={persist_days}); deleting" + ) + dynamodb_client.delete_table(TableName=table_name) + except botocore.exceptions.ClientError as e: + logging.warning(f"Could not delete DynamoDB table {table_name}: {e}") + + def delete_expired_tf_state_s3_buckets(): for rgn in REGIONS: logging.info(f"Region: {rgn}") @@ -1146,6 +1210,8 @@ def main(): delete_unused_volumes() logging.info("Search for abandoned S3 buckets") delete_expired_tf_state_s3_buckets() + logging.info("Search for abandoned DynamoDB tables") + delete_expired_dynamodb_tables() if __name__ == '__main__': From a7dcfc95e7b3cc0dbeec43d544850a3080816721 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Mar 2026 06:00:53 +0100 Subject: [PATCH 712/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 64ecc30d2..f2a475fd8 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bfc7511a7884a95d6b7598f04c2ebedcaab2adee Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Mar 2026 06:00:54 +0100 Subject: [PATCH 713/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index eb1f55511..88b1de104 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a4e827079c87937f998ec00c09565482bfb6f866 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Mar 2026 06:00:55 +0100 Subject: [PATCH 714/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 2667d045e..f601b128b 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 4e1cdb697d58cda530de86b5629e97ea3d2243a3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Mar 2026 06:00:56 +0100 Subject: [PATCH 715/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 1e587f9ad..8e23e2bc0 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c85cfc6249b3f23cef0509cdcc9c5568a05e1076 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 12 Mar 2026 06:00:56 +0100 Subject: [PATCH 716/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 7eaf4a4cf..6e823ff48 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.31" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1b835758c6aa2e82df6b62c1440c4d5e73af8cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 12 Mar 2026 13:13:45 +0100 Subject: [PATCH 717/765] Updated DAC before release --- ...ps-performance-toolkit-user-guide-bamboo.md | 10 +++++----- ...performance-toolkit-user-guide-bitbucket.md | 18 +++++++++--------- ...erformance-toolkit-user-guide-confluence.md | 18 +++++++++--------- ...pps-performance-toolkit-user-guide-crowd.md | 16 ++++++++-------- ...apps-performance-toolkit-user-guide-jira.md | 18 +++++++++--------- ...-apps-performance-toolkit-user-guide-jsm.md | 18 +++++++++--------- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index d05d3500e..8c4ea74e5 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: "2026-02-04" +date: "2026-03-12" --- # Data Center App Performance Toolkit User Guide For Bamboo @@ -102,7 +102,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. 8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. @@ -303,7 +303,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -334,7 +334,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -368,7 +368,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 46ef836d1..272257b65 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: "2026-02-04" +date: "2026-03-12" --- # Data Center App Performance Toolkit User Guide For Bitbucket @@ -115,7 +115,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -319,7 +319,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -394,7 +394,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -425,7 +425,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -475,7 +475,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -500,7 +500,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -513,7 +513,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -542,7 +542,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index eb242ec45..98b054305 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: "2026-02-04" +date: "2026-03-12" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -114,7 +114,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -399,7 +399,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -474,7 +474,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -504,7 +504,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -565,7 +565,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -590,7 +590,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -603,7 +603,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -632,7 +632,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index d62cfbc9c..b403093a2 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: "2026-02-04" +date: "2026-03-12" --- # Data Center App Performance Toolkit User Guide For Crowd @@ -97,7 +97,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -208,7 +208,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -237,7 +237,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -296,7 +296,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -320,7 +320,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -347,7 +347,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -390,7 +390,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index c47c3ef61..bc62cf629 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: "2026-02-04" +date: "2026-03-12" --- # Data Center App Performance Toolkit User Guide For Jira @@ -122,7 +122,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -423,7 +423,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -498,7 +498,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -550,7 +550,7 @@ The re-index time for Jira is about ~50-70 minutes. -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -636,7 +636,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -649,7 +649,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -678,7 +678,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index f78c092e9..08b92ab1b 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: "2026-02-04" +date: "2026-03-12" --- # Data Center App Performance Toolkit User Guide For Jira Service Management @@ -124,7 +124,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -459,7 +459,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -539,7 +539,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -594,7 +594,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -679,7 +679,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.9.14 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.15 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -692,7 +692,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -721,7 +721,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.9.14 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.15 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From 3962d22ac896685b92629fb00ee9c14f5a1b9d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 12 Mar 2026 13:34:50 +0100 Subject: [PATCH 718/765] Updated toolkit version --- 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 f2a475fd8..5398cff85 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for JMeter load executor view_all_builds: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index f601b128b..329f24e13 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. diff --git a/app/confluence.yml b/app/confluence.yml index 88b1de104..5b8f03082 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. extended_metrics: False # Action percentage for JMeter and Locust load executors diff --git a/app/crowd.yml b/app/crowd.yml index 8d90b55ff..ebb999f12 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index 8e23e2bc0..640526bc9 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors create_issue: 4 diff --git a/app/jsm.yml b/app/jsm.yml index 6e823ff48..69793edba 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 diff --git a/app/util/conf.py b/app/util/conf.py index 93f41bcab..1506e573b 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 = '8.11.0' +TOOLKIT_VERSION = '8.10.1' UNSUPPORTED_VERSION = '8.7.0' From 3555aa198b41500f3970c12a40db83f6b887c666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Thu, 12 Mar 2026 14:50:01 +0100 Subject: [PATCH 719/765] Bumped unsupported version --- 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 93f41bcab..cc7e8d801 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -3,7 +3,7 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML TOOLKIT_VERSION = '8.11.0' -UNSUPPORTED_VERSION = '8.7.0' +UNSUPPORTED_VERSION = '8.8.0' def read_yml_file(file): From fb50029f8949769b2922e3576ac23d5af9db10f3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Mar 2026 06:00:54 +0100 Subject: [PATCH 720/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f2a475fd8..7cacf0595 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 227beb1de25ae68773ad3e54ffaeb22a14af78a2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Mar 2026 06:00:55 +0100 Subject: [PATCH 721/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 88b1de104..c8bd2b693 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 680239c83133a651de20d898b4dfbf6148f37127 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Mar 2026 06:00:56 +0100 Subject: [PATCH 722/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index f601b128b..ad7ac10fb 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 92a7ad7ba33b1f4d6ea7b38baa149763a6024b33 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Mar 2026 06:00:57 +0100 Subject: [PATCH 723/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 8e23e2bc0..66a532589 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 6a1121babe518a09b7ddd9b67eac35190599ae20 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 13 Mar 2026 06:00:57 +0100 Subject: [PATCH 724/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 6e823ff48..336bdd402 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.72" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From dbd8326d4070b53dc16e31b6c7d50669091caae9 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Mar 2026 06:01:35 +0100 Subject: [PATCH 725/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 7cacf0595..17c051610 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5f92f66834bb2e85880fd1bd8b6526e8fdde211c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Mar 2026 06:01:36 +0100 Subject: [PATCH 726/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index c8bd2b693..273d8f14d 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 69b72d9db76dbeab506ae25eb96022a3a6b1b1b8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Mar 2026 06:01:36 +0100 Subject: [PATCH 727/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index ad7ac10fb..ed65fbc8b 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From a91cd46fd41ee13f2e02a6480d75918181836a50 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Mar 2026 06:01:37 +0100 Subject: [PATCH 728/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 66a532589..b088099f2 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c187887665cab6539ff5a7bf7ed8f7b5017a7d0a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Sat, 14 Mar 2026 06:01:38 +0100 Subject: [PATCH 729/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 336bdd402..ab3db93b9 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.76" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b9886cbcad0b50f1564fa81d49a3ab53fb59bda5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Mar 2026 06:00:57 +0100 Subject: [PATCH 730/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 17c051610..0d53775ad 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 410a692b8a9da1f4ef20287f17db242de1daf15e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Mar 2026 06:00:58 +0100 Subject: [PATCH 731/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 273d8f14d..9d4e12f93 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 94607409f2933c31fd97aa2d19ad984d2eec7e62 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Mar 2026 06:00:59 +0100 Subject: [PATCH 732/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index ed65fbc8b..51c4ce625 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bcaa7569a05cbe7ac06ace52c9020a5099b094fa Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Mar 2026 06:01:00 +0100 Subject: [PATCH 733/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index b088099f2..06a27bbce 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From f63d49765a8d24c4a297e95fdeb9bb3959624906 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 19 Mar 2026 06:01:00 +0100 Subject: [PATCH 734/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index ab3db93b9..9645577a5 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.80" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1916dce30ab8bdd54c7dd99c4b3007b9323949b8 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Mar 2026 06:01:26 +0100 Subject: [PATCH 735/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 0d53775ad..faf370ce7 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From aedbef4c5c4ffb0afe0be890dc3145a8848c3a2c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Mar 2026 06:01:27 +0100 Subject: [PATCH 736/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 9d4e12f93..0b9e6ac09 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7fbe29937fbeb2800b692964cb4f0ce66d443392 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Mar 2026 06:01:28 +0100 Subject: [PATCH 737/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 51c4ce625..8eac95f50 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9843f3f896a370d6de3c40e7a0e77d3cc1667903 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Mar 2026 06:01:28 +0100 Subject: [PATCH 738/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 06a27bbce..dc446a144 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7a25a243744ec7f92ed597547a8d758022642d71 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 24 Mar 2026 06:01:29 +0100 Subject: [PATCH 739/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 9645577a5..ffd0265b3 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.153" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 0c493e955d19b56108be40fbccebc6106d9c6af2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Mar 2026 06:01:08 +0100 Subject: [PATCH 740/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index faf370ce7..47ffc2dde 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 325d04af66cfbb649ee4f06b9fa984efa514d795 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Mar 2026 06:01:09 +0100 Subject: [PATCH 741/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 0b9e6ac09..7c755ccbc 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bc7634951c565a5ebfbbda0a42cd44dfa55a7aca Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Mar 2026 06:01:10 +0100 Subject: [PATCH 742/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 8eac95f50..adccee80e 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 9bda7687d8800eefc370bdaa5f8683dab969f14a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Mar 2026 06:01:10 +0100 Subject: [PATCH 743/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index dc446a144..9811285f8 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 85c93746f55135efd8c187cf08846b641af0d015 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 26 Mar 2026 06:01:11 +0100 Subject: [PATCH 744/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index ffd0265b3..9c097a85b 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "146.0.7680.165" # Supports Chrome version 146. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 7f5d216ab57f1ea678ab5cc7224fd2b630be54e4 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 31 Mar 2026 11:46:22 +0200 Subject: [PATCH 745/765] Bump bzt and urllib3; add compatible urwid dependency version --- README.md | 4 ++-- requirements.txt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5b1de1cff..8ccba8118 100644 --- a/README.md +++ b/README.md @@ -76,9 +76,9 @@ source venv/bin/activate ``` pip install -r requirements.txt ``` -5. Optional: Reinstall urwid package if you intend to use locust as main load-executor while runnning tests: +5. Optional: to use locust as main load-executor while running tests uninstall 'trio' and 'trio-websocket because they conflict with gevent monkey-patching used by bzt's Locust wrapper: ``` -pip install urwid==2.1.2 --force-reinstall +pip uninstall -y trio trio-websocket ``` ### Linux setup diff --git a/requirements.txt b/requirements.txt index 78c82ee26..2b88f4e4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,10 +6,11 @@ selenium==4.39.0 filelock==3.20.3 packaging==25.0 prettytable==3.17.0 -bzt==1.16.46 +bzt==1.16.49 +urwid==3.0.2 boto3==1.42.33 retry==0.9.2 apiritif==1.1.3 pytest-xdist==3.8.0 chardet>=5.0,<6.0 -urllib3==2.5.0 \ No newline at end of file +urllib3==2.6.3 \ No newline at end of file From 0792eb5469d67fbe6513842f9dd0ccc607055f6e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 9 Apr 2026 07:01:23 +0200 Subject: [PATCH 746/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 47ffc2dde..8e76cca87 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1a77ff356db7bd4d67afd7d3c294d64ea1c51abf Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 9 Apr 2026 07:01:24 +0200 Subject: [PATCH 747/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 7c755ccbc..9a1b333cd 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -116,7 +116,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1ce905fad2f16fbd940b2d28f7998d2e1782b072 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 9 Apr 2026 07:01:25 +0200 Subject: [PATCH 748/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index adccee80e..c7cbf7b51 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -89,7 +89,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1f2a6ce66d9b61d2501899e47ccada249365e35c Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 9 Apr 2026 07:01:26 +0200 Subject: [PATCH 749/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 9811285f8..53c50732f 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 225df8689f4831aab2bca4d1b03d2da3eb52114d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 9 Apr 2026 07:01:27 +0200 Subject: [PATCH 750/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 9c097a85b..b12636730 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -168,7 +168,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.24" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2cc6901c81dfdc7521ef326a77cbb1e9c353410c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2026 23:49:02 +0000 Subject: [PATCH 751/765] Bump org.apache.logging.log4j:log4j-core Bumps org.apache.logging.log4j:log4j-core from 2.25.3 to 2.25.4. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-version: 2.25.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 64787b027..0c0df20a7 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -102,7 +102,7 @@ org.apache.logging.log4j log4j-core - 2.25.3 + 2.25.4 org.apache.logging.log4j From 14cff11de4c227330766a90071fdb7143f39dc13 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2026 23:49:20 +0000 Subject: [PATCH 752/765] Update dependency org.apache.logging.log4j:log4j-core to v2.25.4 [SECURITY] --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 64787b027..0c0df20a7 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -102,7 +102,7 @@ org.apache.logging.log4j log4j-core - 2.25.3 + 2.25.4 org.apache.logging.log4j From e96316bab06eb6b44049726a9fdde56990bfca03 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 13 Apr 2026 18:32:11 +0200 Subject: [PATCH 753/765] Update docs to mention ECOHELP to request license --- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 5 ++--- docs/dc-apps-performance-toolkit-user-guide-bitbucket.md | 8 +++----- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 8 +++----- docs/dc-apps-performance-toolkit-user-guide-crowd.md | 5 ++--- docs/dc-apps-performance-toolkit-user-guide-jira.md | 8 +++----- docs/dc-apps-performance-toolkit-user-guide-jsm.md | 8 +++----- 6 files changed, 16 insertions(+), 26 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 8c4ea74e5..63fdb1edd 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: "2026-03-12" +date: "2026-04-13" --- # Data Center App Performance Toolkit User Guide For Bamboo @@ -91,8 +91,7 @@ specifically for performance testing during the DC app review process. - `region` - **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use `BX02-9YO1-IN86-LO5G` Server ID for generation. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. From local terminal (Git Bash for Windows users) start the installation: diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 272257b65..a4d3159d1 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: "2026-03-12" +date: "2026-04-13" --- # Data Center App Performance Toolkit User Guide For Bitbucket @@ -103,8 +103,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use `BX02-9YO1-IN86-LO5G` Server ID for generation. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. Optional variables to override: @@ -307,8 +306,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use this server id for generation `BX02-9YO1-IN86-LO5G`. + If you don't have your own license, you can request a trial license for testing purposes via ECOHELP ticket. {{% /note %}} 6. Optional variables to override: diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index 98b054305..b82046ad5 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: "2026-03-12" +date: "2026-04-13" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -102,8 +102,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use `BX02-9YO1-IN86-LO5G` Server ID for generation. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. Optional variables to override: @@ -387,8 +386,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use this server id for generation `BX02-9YO1-IN86-LO5G`. + If you don't have your own license, you can request a trial license for testing purposes via ECOHELP ticket. {{% /note %}} 6. Optional variables to override: diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index b403093a2..344f8788d 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: "2026-03-12" +date: "2026-04-13" --- # Data Center App Performance Toolkit User Guide For Crowd @@ -87,8 +87,7 @@ specifically for performance testing during the DC app review process. - `region` - **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use `BX02-9YO1-IN86-LO5G` Server ID for generation. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. From local terminal (Git Bash for Windows users) start the installation (~40min): diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index bc62cf629..1e287a9c3 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: "2026-03-12" +date: "2026-04-13" --- # Data Center App Performance Toolkit User Guide For Jira @@ -110,8 +110,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use `BX02-9YO1-IN86-LO5G` Server ID for generation. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. Optional variables to override: @@ -411,8 +410,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use `BX02-9YO1-IN86-LO5G` Server ID for generation. + If you don't have your own license, you can request a trial license for testing purposes via ECOHELP ticket. {{% /note %}} 6. Optional variables to override: diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 08b92ab1b..73d39e7df 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: "2026-03-12" +date: "2026-04-13" --- # Data Center App Performance Toolkit User Guide For Jira Service Management @@ -112,8 +112,7 @@ Below process describes how to install low-tier Jira Service Management DC with - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use `BX02-9YO1-IN86-LO5G` Server ID for generation. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. Optional variables to override: @@ -447,8 +446,7 @@ Below process describes how to install enterprise-scale Jira Service Management - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). - Use `BX02-9YO1-IN86-LO5G` Server ID for generation. + If you don't have your own license, you can request a trial license for testing purposes via ECOHELP ticket. {{% /note %}} 6. Optional variables to override: From 4baeeeddf08de34018be4018cd296a457d71ea96 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Mon, 13 Apr 2026 18:37:14 +0200 Subject: [PATCH 754/765] Update all places where license mentioned --- docs/dc-apps-performance-toolkit-user-guide-bitbucket.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-jira.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-jsm.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index a4d3159d1..bb22b943a 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -306,7 +306,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have your own license, you can request a trial license for testing purposes via ECOHELP ticket. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. Optional variables to override: diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index b82046ad5..acfb7c8df 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -386,7 +386,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have your own license, you can request a trial license for testing purposes via ECOHELP ticket. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. Optional variables to override: diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 1e287a9c3..7b3a15470 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -410,7 +410,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have your own license, you can request a trial license for testing purposes via ECOHELP ticket. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. Optional variables to override: diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 73d39e7df..051fb469d 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -446,7 +446,7 @@ Below process describes how to install enterprise-scale Jira Service Management - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have your own license, you can request a trial license for testing purposes via ECOHELP ticket. + If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. {{% /note %}} 6. Optional variables to override: From 92cb010a36c5cccdf72f5ee189d8b20ccb2c1e35 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Apr 2026 02:36:43 +0000 Subject: [PATCH 755/765] Update dependency pytest to v9.0.3 [SECURITY] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2b88f4e4b..58cf2b243 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ matplotlib==3.10.8 pandas==2.3.3 -pytest==9.0.2 +pytest==9.0.3 locust==2.43.1 selenium==4.39.0 filelock==3.20.3 From d650903a029769d8e80441c6bd3748a7ce529834 Mon Sep 17 00:00:00 2001 From: Vadzim Kavalenka Date: Tue, 14 Apr 2026 17:07:02 +0200 Subject: [PATCH 756/765] Update request license text --- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 4 ++-- docs/dc-apps-performance-toolkit-user-guide-bitbucket.md | 6 +++--- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 6 +++--- docs/dc-apps-performance-toolkit-user-guide-crowd.md | 4 ++-- docs/dc-apps-performance-toolkit-user-guide-jira.md | 6 +++--- docs/dc-apps-performance-toolkit-user-guide-jsm.md | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 63fdb1edd..aadf9534f 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: "2026-04-13" +date: "2026-04-14" --- # Data Center App Performance Toolkit User Guide For Bamboo @@ -91,7 +91,7 @@ specifically for performance testing during the DC app review process. - `region` - **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. From local terminal (Git Bash for Windows users) start the installation: diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index bb22b943a..9b7605c1e 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: "2026-04-13" +date: "2026-04-14" --- # Data Center App Performance Toolkit User Guide For Bitbucket @@ -103,7 +103,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. Optional variables to override: @@ -306,7 +306,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. Optional variables to override: diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index acfb7c8df..4775616af 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: "2026-04-13" +date: "2026-04-14" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -102,7 +102,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. Optional variables to override: @@ -386,7 +386,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. Optional variables to override: diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 344f8788d..aed8cfae6 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: "2026-04-13" +date: "2026-04-14" --- # Data Center App Performance Toolkit User Guide For Crowd @@ -87,7 +87,7 @@ specifically for performance testing during the DC app review process. - `region` - **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. From local terminal (Git Bash for Windows users) start the installation (~40min): diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 7b3a15470..28fe56126 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: "2026-04-13" +date: "2026-04-14" --- # Data Center App Performance Toolkit User Guide For Jira @@ -110,7 +110,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. Optional variables to override: @@ -410,7 +410,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. Optional variables to override: diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 051fb469d..8cf6b220e 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: "2026-04-13" +date: "2026-04-14" --- # Data Center App Performance Toolkit User Guide For Jira Service Management @@ -112,7 +112,7 @@ Below process describes how to install low-tier Jira Service Management DC with - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. Optional variables to override: @@ -446,7 +446,7 @@ Below process describes how to install enterprise-scale Jira Service Management - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** {{% note %}} - If you don't have a license, you can request a trial one for testing purposes via an ECOHELP ticket. + If you don't have a license, you can request a trial one for DCAPT performance testing purposes via your open DC Annual Review ECOHELP ticket. {{% /note %}} 6. Optional variables to override: From a503f5db8cf6e455f8a0012811d10f0095a6b71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Wed, 15 Apr 2026 13:42:49 +0200 Subject: [PATCH 757/765] Added: * chrome options to yaml files * conf.py chrome options reader * conftest.py apply chrome options --- app/bamboo.yml | 3 +++ app/bitbucket.yml | 3 +++ app/confluence.yml | 3 +++ app/jira.yml | 3 +++ app/jsm.yml | 3 +++ app/selenium_ui/conftest.py | 20 ++++++++++++++++++-- app/util/conf.py | 10 ++++++++++ 7 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 8e76cca87..5519407c5 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -38,6 +38,9 @@ settings: start_plan_timeout: 60 # maximum timeout of plan to start default_dataset_plan_duration: 60 # expected plan execution duration local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + chrome_options: # Optional Chrome browser options for Selenium. Avoids manual edits to Python files in CI/CD. + arguments: # List of Chrome command-line arguments, e.g. ["--disable-gpu", "--remote-debugging-port=9222"] + experimental_options: # Chrome experimental options. 'prefs' are deep-merged with defaults, so you can override specific keys only. services: - module: shellexec diff --git a/app/bitbucket.yml b/app/bitbucket.yml index c7cbf7b51..5745abef8 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -23,6 +23,9 @@ settings: 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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + chrome_options: # Optional Chrome browser options for Selenium. Avoids manual edits to Python files in CI/CD. + arguments: # List of Chrome command-line arguments, e.g. ["--disable-gpu", "--remote-debugging-port=9222"] + experimental_options: # Chrome experimental options. 'prefs' are deep-merged with defaults, so you can override specific keys only. services: - module: shellexec diff --git a/app/confluence.yml b/app/confluence.yml index 9a1b333cd..b1d14028a 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -39,6 +39,9 @@ settings: # Custom dataset section. custom_dataset_query: # Write CQL query to add CQL output to the app/datasets/confluence/custom_pages.csv, e.g. "title ~ 'AppPage*'" local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + chrome_options: # Optional Chrome browser options for Selenium. Avoids manual edits to Python files in CI/CD. + arguments: # List of Chrome command-line arguments, e.g. ["--disable-gpu", "--remote-debugging-port=9222"] + experimental_options: # Chrome experimental options. 'prefs' are deep-merged with defaults, so you can override specific keys only. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index 53c50732f..5a38e9e6e 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -39,6 +39,9 @@ settings: # Custom dataset section. custom_dataset_query: # Write JQL query to add JQL output to the app/datasets/jira/custom-issues.csv, e.g. "summary ~ 'AppIssue*'" local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + chrome_options: # Optional Chrome browser options for Selenium. Avoids manual edits to Python files in CI/CD. + arguments: # List of Chrome command-line arguments, e.g. ["--disable-gpu", "--remote-debugging-port=9222"] + experimental_options: # Chrome experimental options. 'prefs' are deep-merged with defaults, so you can override specific keys only. services: - module: shellexec diff --git a/app/jsm.yml b/app/jsm.yml index b12636730..68fa5ef37 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -54,6 +54,9 @@ settings: customer_standalone_extension: 0 custom_dataset_query: # Write JQL query to add JQL output to the app/datasets/jsm/custom-issues.csv, e.g. "summary ~ 'AppRequests*'" local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. + chrome_options: # Optional Chrome browser options for Selenium. Avoids manual edits to Python files in CI/CD. + arguments: # List of Chrome command-line arguments, e.g. ["--disable-gpu", "--remote-debugging-port=9222"] + experimental_options: # Chrome experimental options. 'prefs' are deep-merged with defaults, so you can override specific keys only. services: - module: shellexec diff --git a/app/selenium_ui/conftest.py b/app/selenium_ui/conftest.py index 4f4f12737..c9531db3e 100644 --- a/app/selenium_ui/conftest.py +++ b/app/selenium_ui/conftest.py @@ -275,8 +275,24 @@ def driver_init(): # Prevent Chrome from showing the search engine prompt chrome_options.add_argument("--disable-search-engine-choice-screen") chrome_options.add_argument("--no-first-run") - chrome_options.add_experimental_option( - 'prefs', {'intl.accept_languages': 'en,en_US'}) + # Build prefs by starting with the default language preference and + # deep-merging any user-supplied prefs on top, so user values win. + default_prefs = {'intl.accept_languages': 'en,en_US'} + user_experimental = app_settings.chrome_options['experimental_options'] + user_prefs = user_experimental.get('prefs', {}) + merged_prefs = {**default_prefs, **user_prefs} + chrome_options.add_experimental_option('prefs', merged_prefs) + + # Apply any remaining user-supplied experimental options (excluding prefs, + # which was already handled above). + for key, value in user_experimental.items(): + if key != 'prefs': + chrome_options.add_experimental_option(key, value) + + # Apply any user-supplied Chrome arguments from the YML config. + for argument in app_settings.chrome_options['arguments']: + chrome_options.add_argument(argument) + chrome_options.set_capability( 'goog:loggingPrefs', { 'performance': 'ALL'}) diff --git a/app/util/conf.py b/app/util/conf.py index cc7e8d801..847025b25 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -35,6 +35,16 @@ def __init__(self, config_yml): def server_url(self): return f'{self.protocol}://{self.hostname}:{self.port}{self.postfix}' + @property + def chrome_options(self): + # Returns user-defined chrome options from the YML env section. + # Supports 'arguments' (list) and 'experimental_options' (dict). + options = self.env_settings.get('chrome_options') or {} + return { + 'arguments': options.get('arguments') or [], + 'experimental_options': options.get('experimental_options') or {}, + } + def get_property(self, property_name): if property_name not in self.env_settings: raise Exception(f'Application property {property_name} was not found in .yml configuration file') From 348388cfb77c735d840700d3c0aa3fcc23d38204 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 16 Apr 2026 07:07:21 +0200 Subject: [PATCH 758/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 5519407c5..f9c38effb 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -126,7 +126,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.57" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 2d211f8570309970d91af38662b1dbeae772d29e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 16 Apr 2026 07:07:22 +0200 Subject: [PATCH 759/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index b1d14028a..1d33db7c8 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -119,7 +119,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.57" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 94d2f156a6ec08566dda7dadb8d330653097ee5d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 16 Apr 2026 07:07:22 +0200 Subject: [PATCH 760/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 5745abef8..fc9629cf6 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -92,7 +92,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.57" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 93adb4db28dbb97568d466263cd1d7445197c46e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 16 Apr 2026 07:07:23 +0200 Subject: [PATCH 761/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 5a38e9e6e..68da6e8c7 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -120,7 +120,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.57" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fdc045317d3eaa4e62ceccdeba5e42b6aeac470d Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 16 Apr 2026 07:07:24 +0200 Subject: [PATCH 762/765] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index 68fa5ef37..57ec8f888 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -171,7 +171,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "147.0.7727.56" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "147.0.7727.57" # Supports Chrome version 147. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 5a7c4e19f9cf0a857c731e034bec178da847ed81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Tue, 21 Apr 2026 16:10:58 +0200 Subject: [PATCH 763/765] Changed dates in md files --- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-bitbucket.md | 2 +- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 2 +- 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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index aadf9534f..aadae8408 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: "2026-04-14" +date: "2026-04-21" --- # 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 9b7605c1e..d99710e22 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: "2026-04-14" +date: "2026-04-21" --- # 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 4775616af..8107712fb 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: "2026-04-14" +date: "2026-04-21" --- # Data Center App Performance Toolkit User Guide For Confluence diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index aed8cfae6..5069a9161 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: "2026-04-14" +date: "2026-04-21" --- # 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 28fe56126..0c280195b 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: "2026-04-14" +date: "2026-04-21" --- # 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 8cf6b220e..c35c6ea13 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: "2026-04-14" +date: "2026-04-21" --- # Data Center App Performance Toolkit User Guide For Jira Service Management From 24a0a7d88399ea95ea4ee62f57349cd4529e0865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Tue, 21 Apr 2026 16:17:39 +0200 Subject: [PATCH 764/765] Bumped version --- 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 f9c38effb..0d968fd30 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for JMeter load executor view_all_builds: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index fc9629cf6..1a1ad5ad2 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path. chrome_options: # Optional Chrome browser options for Selenium. Avoids manual edits to Python files in CI/CD. diff --git a/app/confluence.yml b/app/confluence.yml index 1d33db7c8..3a1fa3a51 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. extended_metrics: False # Action percentage for JMeter and Locust load executors diff --git a/app/crowd.yml b/app/crowd.yml index 8d90b55ff..ebb999f12 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. services: - module: shellexec diff --git a/app/jira.yml b/app/jira.yml index 68da6e8c7..17f14018f 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors create_issue: 4 diff --git a/app/jsm.yml b/app/jsm.yml index 57ec8f888..9743b4f50 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.6.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. environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 diff --git a/app/util/conf.py b/app/util/conf.py index 847025b25..497325096 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 = '8.11.0' +TOOLKIT_VERSION = '8.10.2' UNSUPPORTED_VERSION = '8.8.0' From f9952322843fbca94226ebfce87e7a6945abaa87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Gospodarek?= Date: Tue, 21 Apr 2026 16:26:56 +0200 Subject: [PATCH 765/765] Unsupported version change --- 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 497325096..d21cee4b2 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -3,7 +3,7 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML TOOLKIT_VERSION = '8.10.2' -UNSUPPORTED_VERSION = '8.8.0' +UNSUPPORTED_VERSION = '8.7.0' def read_yml_file(file):