Merge pull request #997 from atlassian/release/7.2.0

Release/7.2.0

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.10-slim
+FROM python:3.11-slim
 
 ENV APT_INSTALL="apt-get -y install --no-install-recommends"
 

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): `8.20.15` and `9.4.0`
+    * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.20.17` and `9.4.2`
 
 * Supported Jira Service Management versions: 
-    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.15` and `5.4.0`
+    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.17` and `5.4.2`
 
 * Supported Confluence versions:
-    * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.2`, `7.13.7` 
+    * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.5`, `7.13.7`  and `8.0.3` platform release
 
 * Supported Bitbucket Server versions:
-    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.5`, `7.17.11`, and `8.0.4` platform release.
+    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.7`, `7.17.13`, and `8.0.5` platform release.
 
 * Supported Crowd versions:
     * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `5.0.2`
 
 * Supported Bamboo versions:
-    * Bamboo [release notes](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `8.1.3`
+    * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.1`
 
 ## 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.
 
 ## Installation and set up
 
 #### Dependencies
-* Python 3.8, 3.9 or 3.10 and pip
+* Python 3.8, 3.9, 3.10 or 3.11 and pip
 * JDK 11
 * Google Chrome web browser
 * Git client (only for Bitbucket DC)
@@ -66,7 +66,7 @@ pip install virtualenv
 ```
 2. Create new virtual env with python3:
 ```
-virtualenv venv -p full_path_to_python # e.g. use `which python3.10` to find the path
+virtualenv venv -p full_path_to_python # e.g. use `which python3.11` to find the path
 ```
 3. Activate virtual env:
 ```

app/bamboo.yml

@@ -9,7 +9,7 @@ settings:
     application_protocol: http         # http or https
     application_port: 80               # 80, 443, 8085, etc
     secure: True                       # Set False to allow insecure connections, e.g. when using self-signed SSL certificate
-    application_postfix:               # e.g. /bamboo in case of url like http://localhost/bamboo
+    application_postfix: /bamboo       # e.g. /bamboo in case of url like http://localhost/bamboo
     admin_login: admin
     admin_password: admin
     load_executor: jmeter
@@ -123,7 +123,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "108.0.5359.71" # Supports Chrome version 108. You can refer to http://chromedriver.chromium.org/downloads
+      version: "110.0.5481.77" # Supports Chrome version 110. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/bitbucket.yml

@@ -6,21 +6,21 @@ settings:
   check-updates: false    # disable bzt check for updates
   env:
     application_hostname: test_bitbucket_instance.atlassian.com   # Bitbucket DC hostname without protocol and port e.g. test-bitbucket.atlassian.com or localhost
-    application_protocol: http      # http or https
-    application_port: 80            # 80, 443, 8080, 7990 etc
-    secure: True                    # Set False to allow insecure connections, e.g. when using self-signed SSL certificate
-    application_postfix:            # e.g. /bitbucket in case of url like http://localhost:7990/bitbucket
+    application_protocol: http        # http or https
+    application_port: 80              # 80, 443, 8080, 7990 etc
+    secure: True                      # Set False to allow insecure connections, e.g. when using self-signed SSL certificate
+    application_postfix: /bitbucket   # e.g. /bitbucket for TerraForm deployment url like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. Leave this value blank for url without postfix.
     admin_login: admin
     admin_password: admin
-    load_executor: jmeter           # only jmeter executor is supported
-    concurrency: 20                 # number of concurrent virtual users for jmeter scenario
+    load_executor: jmeter             # only jmeter executor is supported
+    concurrency: 20                   # number of concurrent virtual users for jmeter scenario
     test_duration: 50m
-    ramp-up: 10m                    # time to spin all concurrent users
+    ramp-up: 10m                      # time to spin all concurrent users
     total_actions_per_hour: 32700
     WEBDRIVER_VISIBLE: False
     JMETER_VERSION: 5.4.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.
 services:
   - module: shellexec
     prepare:
@@ -90,7 +90,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "108.0.5359.71" # Supports Chrome version 108. You can refer to http://chromedriver.chromium.org/downloads
+      version: "110.0.5481.77" # Supports Chrome version 110. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/confluence.yml

@@ -115,7 +115,10 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "108.0.5359.71" # Supports Chrome version 108. You can refer to http://chromedriver.chromium.org/downloads
+      version: "110.0.5481.77" # Supports Chrome version 110. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml
+- module: passfail
+  criteria:
+  - failures>25% over 300s, stop as failed

app/jira.yml

@@ -118,7 +118,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "108.0.5359.71" # Supports Chrome version 108. You can refer to http://chromedriver.chromium.org/downloads
+      version: "110.0.5481.77" # Supports Chrome version 110. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/jmeter/confluence.jmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.4.3">
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.5">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="upload_attachments" enabled="true">
       <stringProp name="TestPlan.comments">This test plan was created by the BlazeMeter converter v.2.4.18. Please contact support@blazemeter.com for further support.</stringProp>
@@ -554,7 +554,7 @@
                 <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="x_editable" enabled="true">
                   <stringProp name="RegexExtractor.useHeaders">false</stringProp>
                   <stringProp name="RegexExtractor.refname">x_editable</stringProp>
-                  <stringProp name="RegexExtractor.regex">id=\&quot;editPageLink\&quot; href=(.+?)\?pageId=(.+?)\&quot;</stringProp>
+                  <stringProp name="RegexExtractor.regex">id=\&quot;editPageLink\&quot;\s+href=(.+?)\?pageId=(.+?)\&quot;</stringProp>
                   <stringProp name="RegexExtractor.template">$1$</stringProp>
                   <stringProp name="RegexExtractor.default"></stringProp>
                   <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -3446,7 +3446,7 @@ vars.put(&quot;page_text&quot;, &quot;jmeter_create_and_edit_page:edit_page - &q
                 <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="x_editable" enabled="false">
                   <stringProp name="RegexExtractor.useHeaders">false</stringProp>
                   <stringProp name="RegexExtractor.refname">x_editable</stringProp>
-                  <stringProp name="RegexExtractor.regex">id=\&quot;editPageLink\&quot; href=(.+?)\?pageId=(.+?)\&quot;</stringProp>
+                  <stringProp name="RegexExtractor.regex">id=\&quot;editPageLink\&quot;\s+href=(.+?)\?pageId=(.+?)\&quot;</stringProp>
                   <stringProp name="RegexExtractor.template">$1$</stringProp>
                   <stringProp name="RegexExtractor.default"></stringProp>
                   <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -3560,7 +3560,7 @@ vars.put(&quot;page_text&quot;, &quot;jmeter_create_and_edit_page:edit_page - &q
                 <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="x_editable" enabled="false">
                   <stringProp name="RegexExtractor.useHeaders">false</stringProp>
                   <stringProp name="RegexExtractor.refname">x_editable</stringProp>
-                  <stringProp name="RegexExtractor.regex">id=\&quot;editPageLink\&quot; href=(.+?)\?pageId=(.+?)\&quot;</stringProp>
+                  <stringProp name="RegexExtractor.regex">id=\&quot;editPageLink\&quot;\s+href=(.+?)\?pageId=(.+?)\&quot;</stringProp>
                   <stringProp name="RegexExtractor.template">$1$</stringProp>
                   <stringProp name="RegexExtractor.default"></stringProp>
                   <stringProp name="RegexExtractor.match_number">1</stringProp>

app/jsm.yml

@@ -170,7 +170,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "108.0.5359.71" # Supports Chrome version 108. You can refer to http://chromedriver.chromium.org/downloads
+      version: "110.0.5481.77" # Supports Chrome version 110. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
   - data-source: sample-labels
     module: junit-xml

app/util/analytics/analytics.py

@@ -183,7 +183,7 @@ def is_compliant(self):
                     err_msg.append(f"The actual test duration {self.actual_duration} is less than "
                                    f"required value {MIN_DEFAULTS[self.app_type]['test_duration']}")
                 if self.concurrency < MIN_DEFAULTS[self.app_type]['concurrency']:
-                    err_msg.append(f"The run concurrency {self.total_actions_per_hour} is less "
+                    err_msg.append(f"The run concurrency {self.concurrency} is less "
                                    f"than minimum concurrency "
                                    f"required {MIN_DEFAULTS[self.app_type]['concurrency']}")
                 if self.parallel_plans_count < MIN_DEFAULTS[self.app_type]['parallel_plans_count']:

app/util/analytics/bamboo_post_run_collector.py

@@ -6,7 +6,7 @@
 from util.conf import BAMBOO_SETTINGS
 from multiprocessing import cpu_count
 
-pool = ThreadPool(processes=cpu_count() * 3)
+pool = ThreadPool(processes=min(cpu_count() * 3, 12))
 
 
 class BambooPostRunCollector:

app/util/bamboo/bamboo_dataset_generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.atlassian.bamboo</groupId>
         <artifactId>bamboo-specs-parent</artifactId>
-        <version>8.1.3</version>
+        <version>9.2.1</version>
         <relativePath/>
     </parent>
 

app/util/conf.py

@@ -2,7 +2,7 @@
 
 from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML
 
-TOOLKIT_VERSION = '7.1.0'
+TOOLKIT_VERSION = '7.2.0'
 UNSUPPORTED_VERSION = '6.0.0'
 
 

app/util/jira/populate_db.sh

@@ -43,8 +43,8 @@ JIRA_DB_PASS="Password1!"
 
 # Jira/JSM supported versions
 
-SUPPORTED_JIRA_VERSIONS=(8.20.15 9.4.0)
-SUPPORTED_JSM_VERSIONS=(4.20.15 5.4.0)
+SUPPORTED_JIRA_VERSIONS=(8.20.17 9.4.2)
+SUPPORTED_JSM_VERSIONS=(4.20.17 5.4.2)
 
 SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}")
 # JSM section

app/util/jira/upload_attachments.sh

@@ -29,8 +29,8 @@ JIRA_VERSION_FILE="/media/atl/jira/shared/jira-software.version"
 
 # Jira/JSM supported versions
 
-SUPPORTED_JIRA_VERSIONS=(8.20.15 9.4.0)
-SUPPORTED_JSM_VERSIONS=(4.20.15 5.4.0)
+SUPPORTED_JIRA_VERSIONS=(8.20.17 9.4.2)
+SUPPORTED_JSM_VERSIONS=(4.20.17 5.4.2)
 
 SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}")
 if [[ ${jsm} == 1 ]]; then

app/util/jmeter/start_jmeter_ui.py

@@ -6,7 +6,7 @@
 
 import yaml
 
-SUPPORTED_PYTHON_VERSIONS = ["3.8", "3.9", "3.10"]
+SUPPORTED_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11"]
 
 python_full_version = '.'.join(map(str, version_info[0:3]))
 python_short_version = '.'.join(map(str, version_info[0:2]))