Skip to content

Commit 011195b

Browse files
ometelytsiaometelytsia
authored
Merge pull request #1465 from atlassian/release/8.3.0
Release 8.3.0
2 parents 530ee72 + 011378b commit 011195b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+6828
-15856
lines changed

‎.gitattributes

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
*.sh text eol=lf
1+
*.sh text eol=lf
2+
dcapt-snapshots.json text eol=lf
3+
*.tfvars text eol=lf

‎Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# bzt run: docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt jira.yml
55
# interactive run: docker run -it --entrypoint="/bin/bash" -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt
66

7-
FROM python:3.11-slim-bullseye
7+
FROM python:3.12-slim-bookworm
88

99
ENV APT_INSTALL="apt-get -y install --no-install-recommends"
1010

@@ -14,10 +14,14 @@ ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_c
1414
ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb"
1515

1616
RUN apt-get -y update \
17-
&& $APT_INSTALL vim git openssh-server wget openjdk-11-jdk \
17+
&& $APT_INSTALL vim git openssh-server wget \
1818
&& python -m pip install --upgrade pip \
1919
&& apt-get clean
2020

21+
RUN wget https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.deb \
22+
&& $APT_INSTALL ./jdk-21_linux-x64_bin.deb \
23+
&& rm -rf ./jdk-21_linux-x64_bin.deb
24+
2125
RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_LATEST_URL; else wget -O google-chrome.deb $CHROME_VERSION_URL; fi \
2226
&& $APT_INSTALL ./google-chrome.deb \
2327
&& rm -rf ./google-chrome.deb

‎README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat
55

66
## Supported versions
77
* Supported Jira versions:
8-
* Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.4` and `9.4.17`
8+
* Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.8` and `9.4.22`
99

1010
* Supported Jira Service Management versions:
11-
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.4` and `5.4.17`
11+
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.8` and `5.4.22`
1212

1313
* Supported Confluence versions:
14-
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.6` and `7.19.19`
14+
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.9` and `7.19.22`
1515

1616
* Supported Bitbucket Server versions:
17-
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.9.10` and `7.21.22`
17+
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.4` and `8.9.14`
1818

1919
* Supported Crowd versions:
20-
* Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `5.2.3`
20+
* Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `5.3.1`
2121

2222
* Supported Bamboo versions:
23-
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.6.1`
23+
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.6.2`
2424

2525
## Support
2626
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.
2727

2828
## Installation and set up
2929

3030
#### Dependencies
31-
* Python 3.8, 3.9, 3.10 or 3.11 and pip
32-
* JDK 17
31+
* Python 3.9 - 3.12 and pip
32+
* JDK 17 or JDK 21
3333
* Google Chrome web browser
3434
* Git client (only for Bitbucket DC)
3535

‎app/bamboo.yml

+7-12
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ settings:
1818
ramp-up: 5m # time to spin all concurrent threads
1919
total_actions_per_hour: 2000 # number of total JMeter actions per hour
2020
WEBDRIVER_VISIBLE: False
21-
JMETER_VERSION: 5.5
21+
JMETER_VERSION: 5.6
2222
LANGUAGE: en_US.utf8
2323
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.
2424
environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it.
@@ -51,7 +51,7 @@ services:
5151
- python util/post_run/cleanup_results_dir.py
5252
- module: pip-install
5353
packages:
54-
- selenium==4.18.1
54+
- selenium==4.21.0
5555
execution:
5656
- scenario: jmeter
5757
executor: jmeter
@@ -105,27 +105,22 @@ modules:
105105
detect-plugins: true
106106
memory-xmx: 8G # allow JMeter to use up to 8G of memory
107107
plugins:
108-
- bzm-parallel=0.4
109-
- bzm-random-csv=0.6
110-
- jpgc-casutg=2.9
108+
- jpgc-casutg=2.10
111109
- jpgc-dummy=0.4
112110
- jpgc-ffw=2.0
113111
- jpgc-fifo=0.2
114-
- jpgc-functions=2.1
115-
- jpgc-json=2.6
112+
- jpgc-functions=2.2
113+
- jpgc-json=2.7
116114
- jpgc-perfmon=2.1
117115
- jpgc-prmctl=0.4
118-
- jpgc-tst=2.5
119-
- jpgc-wsc=0.3
120-
- tilln-sshmon=1.0
121-
- jpgc-synthesis=2.2
116+
- jpgc-tst=2.6
122117
system-properties:
123118
server.rmi.ssl.disable: true
124119
java.rmi.server.hostname: localhost
125120
httpsampler.ignore_failed_embedded_resources: "true"
126121
selenium:
127122
chromedriver:
128-
version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing
123+
version: "126.0.6478.126" # Supports Chrome version 126. You can refer to https://googlechromelabs.github.io/chrome-for-testing
129124
reporting:
130125
- data-source: sample-labels
131126
module: junit-xml

‎app/bitbucket.yml

+7-12
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ settings:
1818
ramp-up: 10m # time to spin all concurrent users
1919
total_actions_per_hour: 32700
2020
WEBDRIVER_VISIBLE: False
21-
JMETER_VERSION: 5.5
21+
JMETER_VERSION: 5.6
2222
LANGUAGE: en_US.utf8
2323
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.
2424
environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it.
@@ -37,7 +37,7 @@ services:
3737
- python util/post_run/cleanup_results_dir.py
3838
- module: pip-install
3939
packages:
40-
- selenium==4.18.1
40+
- selenium==4.21.0
4141
execution:
4242
- scenario: ${load_executor}
4343
concurrency: ${concurrency}
@@ -71,27 +71,22 @@ modules:
7171
detect-plugins: true
7272
memory-xmx: 8G # allow JMeter to use up to 8G of memory
7373
plugins:
74-
- bzm-parallel=0.4
75-
- bzm-random-csv=0.6
76-
- jpgc-casutg=2.9
74+
- jpgc-casutg=2.10
7775
- jpgc-dummy=0.4
7876
- jpgc-ffw=2.0
7977
- jpgc-fifo=0.2
80-
- jpgc-functions=2.1
81-
- jpgc-json=2.6
78+
- jpgc-functions=2.2
79+
- jpgc-json=2.7
8280
- jpgc-perfmon=2.1
8381
- jpgc-prmctl=0.4
84-
- jpgc-tst=2.5
85-
- jpgc-wsc=0.3
86-
- tilln-sshmon=1.0
87-
- jpgc-synthesis=2.2
82+
- jpgc-tst=2.6
8883
system-properties:
8984
server.rmi.ssl.disable: true
9085
java.rmi.server.hostname: localhost
9186
httpsampler.ignore_failed_embedded_resources: "true"
9287
selenium:
9388
chromedriver:
94-
version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing
89+
version: "126.0.6478.126" # Supports Chrome version 126. You can refer to https://googlechromelabs.github.io/chrome-for-testing
9590
reporting:
9691
- data-source: sample-labels
9792
module: junit-xml

‎app/confluence.yml

+7-12
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ settings:
1818
ramp-up: 5m # time to spin all concurrent users
1919
total_actions_per_hour: 20000
2020
WEBDRIVER_VISIBLE: False
21-
JMETER_VERSION: 5.5
21+
JMETER_VERSION: 5.6
2222
LANGUAGE: en_US.utf8
2323
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.
2424
environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it.
@@ -52,7 +52,7 @@ services:
5252
- python util/post_run/cleanup_results_dir.py
5353
- module: pip-install
5454
packages:
55-
- selenium==4.18.1
55+
- selenium==4.21.0
5656
execution:
5757
- scenario: ${load_executor}
5858
executor: ${load_executor}
@@ -98,27 +98,22 @@ modules:
9898
detect-plugins: true
9999
memory-xmx: 8G # allow JMeter to use up to 8G of memory
100100
plugins:
101-
- bzm-parallel=0.4
102-
- bzm-random-csv=0.6
103-
- jpgc-casutg=2.9
101+
- jpgc-casutg=2.10
104102
- jpgc-dummy=0.4
105103
- jpgc-ffw=2.0
106104
- jpgc-fifo=0.2
107-
- jpgc-functions=2.1
108-
- jpgc-json=2.6
105+
- jpgc-functions=2.2
106+
- jpgc-json=2.7
109107
- jpgc-perfmon=2.1
110108
- jpgc-prmctl=0.4
111-
- jpgc-tst=2.5
112-
- jpgc-wsc=0.3
113-
- tilln-sshmon=1.0
114-
- jpgc-synthesis=2.2
109+
- jpgc-tst=2.6
115110
system-properties:
116111
server.rmi.ssl.disable: true
117112
java.rmi.server.hostname: localhost
118113
httpsampler.ignore_failed_embedded_resources: "true"
119114
selenium:
120115
chromedriver:
121-
version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing
116+
version: "126.0.6478.126" # Supports Chrome version 126. You can refer to https://googlechromelabs.github.io/chrome-for-testing
122117
reporting:
123118
- data-source: sample-labels
124119
module: junit-xml

‎app/crowd.yml

+5-10
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ settings:
3030
# ramp-up: 5s # time to spin all concurrent threads
3131
# total_actions_per_hour: 720000 # number of total JMeter actions per hour
3232

33-
JMETER_VERSION: 5.5
33+
JMETER_VERSION: 5.6
3434
LANGUAGE: en_US.utf8
3535
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.
3636
environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it.
@@ -74,20 +74,15 @@ modules:
7474
detect-plugins: true
7575
memory-xmx: 8G # allow JMeter to use up to 8G of memory
7676
plugins:
77-
- bzm-parallel=0.4
78-
- bzm-random-csv=0.6
79-
- jpgc-casutg=2.9
77+
- jpgc-casutg=2.10
8078
- jpgc-dummy=0.4
8179
- jpgc-ffw=2.0
8280
- jpgc-fifo=0.2
83-
- jpgc-functions=2.1
84-
- jpgc-json=2.6
81+
- jpgc-functions=2.2
82+
- jpgc-json=2.7
8583
- jpgc-perfmon=2.1
8684
- jpgc-prmctl=0.4
87-
- jpgc-tst=2.5
88-
- jpgc-wsc=0.3
89-
- tilln-sshmon=1.0
90-
- jpgc-synthesis=2.2
85+
- jpgc-tst=2.6
9186
system-properties:
9287
server.rmi.ssl.disable: true
9388
java.rmi.server.hostname: localhost

‎app/jira.yml

+7-12
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ settings:
1818
ramp-up: 3m # time to spin all concurrent users
1919
total_actions_per_hour: 54500 # number of total JMeter/Locust actions per hour
2020
WEBDRIVER_VISIBLE: False
21-
JMETER_VERSION: 5.5
21+
JMETER_VERSION: 5.6
2222
LANGUAGE: en_US.utf8
2323
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.
2424
environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it.
@@ -52,7 +52,7 @@ services:
5252
- python util/post_run/cleanup_results_dir.py
5353
- module: pip-install
5454
packages:
55-
- selenium==4.18.1
55+
- selenium==4.21.0
5656
execution:
5757
- scenario: ${load_executor}
5858
executor: ${load_executor}
@@ -99,27 +99,22 @@ modules:
9999
detect-plugins: true
100100
memory-xmx: 8G # allow JMeter to use up to 8G of memory
101101
plugins:
102-
- bzm-parallel=0.4
103-
- bzm-random-csv=0.6
104-
- jpgc-casutg=2.9
102+
- jpgc-casutg=2.10
105103
- jpgc-dummy=0.4
106104
- jpgc-ffw=2.0
107105
- jpgc-fifo=0.2
108-
- jpgc-functions=2.1
109-
- jpgc-json=2.6
106+
- jpgc-functions=2.2
107+
- jpgc-json=2.7
110108
- jpgc-perfmon=2.1
111109
- jpgc-prmctl=0.4
112-
- jpgc-tst=2.5
113-
- jpgc-wsc=0.3
114-
- tilln-sshmon=1.0
115-
- jpgc-synthesis=2.2
110+
- jpgc-tst=2.6
116111
system-properties:
117112
server.rmi.ssl.disable: true
118113
java.rmi.server.hostname: localhost
119114
httpsampler.ignore_failed_embedded_resources: "true"
120115
selenium:
121116
chromedriver:
122-
version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing
117+
version: "126.0.6478.126" # Supports Chrome version 126. You can refer to https://googlechromelabs.github.io/chrome-for-testing
123118
reporting:
124119
- data-source: sample-labels
125120
module: junit-xml

0 commit comments

Comments
 (0)