merge master into dc-approval2024

.dockerignore

@@ -1,3 +1,4 @@
 *
 !requirements.txt
 !Dockerfile
+!bzt.tar.gz

CODEOWNERS

@@ -1,2 +1,2 @@
 # Default code owners - Atlassian Data Center App Performance Toolkit
-* @ometelytsia @SergeyMoroz0703 @OlehStefanyshyn
+* @vkavalenka80 @bgospodarek

Dockerfile

@@ -4,11 +4,12 @@
 # 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"
 
 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,12 @@ 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
+ADD . /tmp/
+
+RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \
+      tar -xzf /tmp/bzt.tar.gz -C /root && \
+      rm /tmp/bzt.tar.gz; \
+    fi
 
 WORKDIR /dc-app-performance-toolkit/app
 

README.md

@@ -5,30 +5,30 @@ 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): `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): `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): `10.3.15`, `11.3.1`
 
 * 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): `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.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.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): `6.0.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): `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.14`
 
 ## 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
 
 #### Dependencies
-* Python 3.9 - 3.12 and pip
+* Python 3.10 - 3.13 and pip
 * JDK 17 or JDK 21
 * Google Chrome web browser
 * Git client (only for Bitbucket DC)
@@ -76,6 +76,10 @@ source venv/bin/activate
 ```
 pip install -r requirements.txt
 ```
+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 uninstall -y trio trio-websocket
+```
 
 ### Linux setup
 Make sure that you have:

app/bamboo.yml

@@ -37,6 +37,11 @@ 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.
+    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
     prepare:
@@ -51,7 +56,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.25.0
+      - selenium==4.39.0
 execution:
   - scenario: jmeter
     executor: jmeter
@@ -121,7 +126,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: "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

app/bitbucket.yml

@@ -22,6 +22,11 @@ settings:
     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.
     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
     prepare:
@@ -37,7 +42,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.25.0
+      - selenium==4.39.0
 execution:
   - scenario: ${load_executor}
     concurrency: ${concurrency}
@@ -87,7 +92,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: "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

app/confluence.yml

@@ -38,6 +38,11 @@ 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.
+    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
     prepare:
@@ -52,7 +57,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.25.0
+      - selenium==4.39.0
 execution:
   - scenario: ${load_executor}
     executor: ${load_executor}
@@ -114,7 +119,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: "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

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()
 

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

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()
 

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

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,17 @@ 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)
+    #         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():
     #             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()
 

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

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

app/jira.yml

@@ -38,6 +38,11 @@ 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.
+    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
     prepare:
@@ -52,7 +57,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.25.0
+      - selenium==4.39.0
 execution:
   - scenario: ${load_executor}
     executor: ${load_executor}
@@ -115,7 +120,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: "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