Merge pull request #962 from atlassian/release/7.1.0

Release 7.1.0

Dockerfile

@@ -4,15 +4,13 @@
 # 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 blazemeter/taurus:1.16.3
+FROM python:3.10-slim
 
 ENV APT_INSTALL="apt-get -y install --no-install-recommends"
 
 RUN apt-get -y update \
-  && $APT_INSTALL vim git openssh-server python3.9-dev python3-pip wget \
-  && update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 \
+  && $APT_INSTALL vim git openssh-server wget openjdk-11-jdk \
   && python -m pip install --upgrade pip \
-  && python -m pip install --upgrade setuptools \
   && apt-get clean
 
 RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \

README.md

@@ -5,10 +5,10 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat
 
 ## Supported versions
 * Supported Jira versions: 
-    * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.20.13` and `9.1.0` platform release
+    * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.20.15` and `9.4.0`
 
 * Supported Jira Service Management versions: 
-    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.13` and `5.1.0` platform release
+    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.15` and `5.4.0`
 
 * Supported Confluence versions:
     * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.2`, `7.13.7` 
@@ -28,7 +28,7 @@ In case of technical questions, issues or problems with DC Apps Performance Tool
 ## Installation and set up
 
 #### Dependencies
-* Python 3.8 or 3.9 and pip
+* Python 3.8, 3.9 or 3.10 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.9` to find the path
+virtualenv venv -p full_path_to_python # e.g. use `which python3.10` to find the path
 ```
 3. Activate virtual env:
 ```

app/bamboo.yml

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

app/bitbucket.yml

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

app/confluence.yml

@@ -23,16 +23,16 @@ settings:
     allow_analytics: Yes              # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README.
     # Action percentage for JMeter and Locust load executors
     extended_metrics: False
-    view_page: 46
-    view_dashboard: 8
-    view_blog: 10
-    search_cql: 9
-    create_blog: 3
-    create_and_edit_page: 7
-    comment_page: 6
-    view_attachment: 4
-    upload_attachment: 5
-    like_page: 2
+    view_page: 35
+    view_dashboard: 9
+    view_blog: 13
+    search_cql: 10
+    create_blog: 4
+    create_and_edit_page: 8
+    comment_page: 7
+    view_attachment: 5
+    upload_attachment: 6
+    like_page: 3
     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*'"
@@ -115,7 +115,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "107.0.5304.62" # Supports Chrome version 107. You can refer to http://chromedriver.chromium.org/downloads
+      version: "108.0.5359.71" # Supports Chrome version 108. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/jira.yml

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

app/jmeter/bamboo.jmx

@@ -469,8 +469,9 @@ def delay_between_transactions = (1000 * 3600) / (vars.get("total_actions_p
 //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
 
-log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time)
+log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time + ", jmeter_view_all_builds action_time: " + action_time)
 
 if ( sleep_time > 0 ) {
     return sleep_time
@@ -584,8 +585,9 @@ def delay_between_transactions = (1000 * 3600) / (vars.get("total_actions_p
 //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
 
-log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time)
+log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time + ", jmeter_view_build_summary action_time: " + action_time)
 
 if ( sleep_time > 0 ) {
     return sleep_time
@@ -799,8 +801,10 @@ def delay_between_transactions = (1000 * 3600) / (vars.get("total_actions_p
 //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
+
+log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time + ", jmeter_view_build_result action_time: " + action_time)
 
-log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time)
 
 if ( sleep_time > 0 ) {
     return sleep_time
@@ -976,8 +980,10 @@ def delay_between_transactions = (1000 * 3600) / (vars.get("total_actions_p
 //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
+
+log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time + ", jmeter_view_build_configuration action_time: " + action_time)
 
-log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time)
 
 if ( sleep_time > 0 ) {
     return sleep_time
@@ -1092,8 +1098,10 @@ def delay_between_transactions = (1000 * 3600) / (vars.get("total_actions_p
 //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
+
+log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time + ", jmeter_view_job_configuration action_time: " + action_time)
 
-log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time)
 
 if ( sleep_time > 0 ) {
     return sleep_time
@@ -1207,8 +1215,10 @@ def delay_between_transactions = (1000 * 3600) / (vars.get("total_actions_p
 //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
+
+log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time + ", jmeter_view_projects_list action_time: " + action_time)
 
-log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time)
 
 if ( sleep_time > 0 ) {
     return sleep_time
@@ -1678,8 +1688,10 @@ def delay_between_transactions = (1000 * 3600) / (vars.get("total_actions_p
 //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
+
+log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time + ", jmeter_standalone_extension action_time: " + action_time)
 
-log.info("concurrency: " + concurrency + ", delay_between_transactions: " + delay_between_transactions + ", thread_sleep: " + sleep_time)
 
 if ( sleep_time > 0 ) {
     return sleep_time

app/jmeter/bitbucket.jmx

@@ -982,8 +982,9 @@ def delay_between_transactions = ((1000 * 3600) / (vars.get("total.actions.
 //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
 
-log.info("concurrency: ${concurrency}, delay_between_transactions: ${delay_between_transactions}, thread_sleep: ${sleep_time}")
+log.info("concurrency: ${concurrency}, delay_between_transactions: ${delay_between_transactions}, thread_sleep: ${sleep_time}, loop_controller_jmeter_git action_time: ${action_time}")
 
 if ( sleep_time > 0 ) {
     return sleep_time