Skip to content

Commit de32747

Browse files
authored
Merge pull request #1844 from atlassian/release/8.8.0
Release 8.8.0
2 parents 5db179c + e95b5d6 commit de32747

40 files changed

+755
-245
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*
22
!requirements.txt
33
!Dockerfile
4+
!bzt.tar.gz

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Default code owners - Atlassian Data Center App Performance Toolkit
2-
* @ometelytsia @SergeyMoroz0703 @OlehStefanyshyn
2+
* @vkavalenka80 @bgospodarek @ometelytsia @SergeyMoroz0703 @OlehStefanyshyn

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_
3030
COPY requirements.txt /tmp/requirements.txt
3131
RUN pip install --no-cache-dir -r /tmp/requirements.txt
3232

33-
RUN if [ "$INCLUDE_BZT" = "true" ]; then \
34-
wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \
33+
ADD . /tmp/
34+
35+
RUN if [ "$INCLUDE_BZT_TOOLS" = "true" ]; then \
3536
tar -xzf /tmp/bzt.tar.gz -C /root && \
3637
rm /tmp/bzt.tar.gz; \
3738
fi

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ 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.19` and `10.3.4`
8+
* 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
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.19` and `10.3.4`
11+
* 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
1212

1313
* Supported Confluence versions:
14-
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.20` and `9.2.2`
14+
* 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
1515

1616
* Supported Bitbucket Server versions:
17-
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.16` and `9.4.4`
17+
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21` and `9.4.9`
1818

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

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

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

2828
## Installation and set up
2929

app/bamboo.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ settings:
3737
parallel_plans_count: 40 # number of parallel plans execution
3838
start_plan_timeout: 60 # maximum timeout of plan to start
3939
default_dataset_plan_duration: 60 # expected plan execution duration
40+
local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path.
41+
4042
services:
4143
- module: shellexec
4244
prepare:
@@ -51,7 +53,7 @@ services:
5153
- python util/post_run/cleanup_results_dir.py
5254
- module: pip-install
5355
packages:
54-
- selenium==4.31.0
56+
- selenium==4.35.0
5557
execution:
5658
- scenario: jmeter
5759
executor: jmeter
@@ -121,7 +123,7 @@ modules:
121123
httpsampler.ignore_failed_embedded_resources: "true"
122124
selenium:
123125
chromedriver:
124-
version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing
126+
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
125127
reporting:
126128
- data-source: sample-labels
127129
module: junit-xml

app/bitbucket.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ settings:
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.
25+
local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path.
26+
2527
services:
2628
- module: shellexec
2729
prepare:
@@ -37,7 +39,7 @@ services:
3739
- python util/post_run/cleanup_results_dir.py
3840
- module: pip-install
3941
packages:
40-
- selenium==4.31.0
42+
- selenium==4.35.0
4143
execution:
4244
- scenario: ${load_executor}
4345
concurrency: ${concurrency}
@@ -87,7 +89,7 @@ modules:
8789
httpsampler.ignore_failed_embedded_resources: "true"
8890
selenium:
8991
chromedriver:
90-
version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing
92+
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
9193
reporting:
9294
- data-source: sample-labels
9395
module: junit-xml

app/confluence.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ settings:
3838
standalone_extension: 0 # By default disabled
3939
# Custom dataset section.
4040
custom_dataset_query: # Write CQL query to add CQL output to the app/datasets/confluence/custom_pages.csv, e.g. "title ~ 'AppPage*'"
41+
local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path.
42+
4143
services:
4244
- module: shellexec
4345
prepare:
@@ -52,7 +54,7 @@ services:
5254
- python util/post_run/cleanup_results_dir.py
5355
- module: pip-install
5456
packages:
55-
- selenium==4.31.0
57+
- selenium==4.35.0
5658
execution:
5759
- scenario: ${load_executor}
5860
executor: ${load_executor}
@@ -114,7 +116,7 @@ modules:
114116
httpsampler.ignore_failed_embedded_resources: "true"
115117
selenium:
116118
chromedriver:
117-
version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing
119+
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
118120
reporting:
119121
- data-source: sample-labels
120122
module: junit-xml

app/jira.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ settings:
3838
standalone_extension: 0 # By default disabled
3939
# Custom dataset section.
4040
custom_dataset_query: # Write JQL query to add JQL output to the app/datasets/jira/custom-issues.csv, e.g. "summary ~ 'AppIssue*'"
41+
local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path.
42+
4143
services:
4244
- module: shellexec
4345
prepare:
@@ -52,7 +54,7 @@ services:
5254
- python util/post_run/cleanup_results_dir.py
5355
- module: pip-install
5456
packages:
55-
- selenium==4.31.0
57+
- selenium==4.35.0
5658
execution:
5759
- scenario: ${load_executor}
5860
executor: ${load_executor}
@@ -115,7 +117,7 @@ modules:
115117
httpsampler.ignore_failed_embedded_resources: "true"
116118
selenium:
117119
chromedriver:
118-
version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing
120+
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
119121
reporting:
120122
- data-source: sample-labels
121123
module: junit-xml

app/jsm.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ settings:
5252
customer_create_request: 16
5353
customer_insight_view_request: 6
5454
customer_standalone_extension: 0
55+
custom_dataset_query: # Write JQL query to add JQL output to the app/datasets/jsm/custom-issues.csv, e.g. "summary ~ 'AppRequests*'"
56+
local_chrome_binary_path: # e.g. /usr/bin/google-chrome-stable. Leave it blank to use default Chrome binary path.
5557

56-
custom_dataset_query: "" # Write JQL query to add JQL output to the app/datasets/jsm/custom-issues.csv, e.g. "summary ~ 'AppRequests*'"
5758
services:
5859
- module: shellexec
5960
prepare:
@@ -68,7 +69,7 @@ services:
6869
- python util/post_run/cleanup_results_dir.py
6970
- module: pip-install
7071
packages:
71-
- selenium==4.31.0
72+
- selenium==4.35.0
7273
execution:
7374
- scenario: ${load_executor}_agents
7475
executor: ${load_executor}
@@ -167,7 +168,7 @@ modules:
167168
httpsampler.ignore_failed_embedded_resources: "true"
168169
selenium:
169170
chromedriver:
170-
version: "137.0.7151.70" # Supports Chrome version 137. You can refer to https://googlechromelabs.github.io/chrome-for-testing
171+
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
171172
reporting:
172173
- data-source: sample-labels
173174
module: junit-xml

app/locustio/confluence/http_actions.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ def view_page(locust):
129129
headers=RESOURCE_HEADERS,
130130
catch_response=True)
131131

132-
# 120 rest/helptips/1.0/tips
133-
locust.get('/rest/helptips/1.0/tips', catch_response=True)
134-
135132
# 130 rest/inlinecomments/1.0/comments
136133
r = locust.get(f'/rest/inlinecomments/1.0/comments'
137134
f'?containerId={parsed_page_id}'
@@ -313,9 +310,6 @@ def view_blog(locust):
313310
headers=RESOURCE_HEADERS,
314311
catch_response=True)
315312

316-
# 360 rest/helptips/1.0/tips
317-
locust.get('/rest/helptips/1.0/tips', catch_response=True)
318-
319313
# 370 rest/inlinecomments/1.0/comments
320314
r = locust.get(f'/rest/inlinecomments/1.0/comments'
321315
f'?containerId={blog_id}'
@@ -691,9 +685,6 @@ def create_blog():
691685
locust.get(f'/s/en_GB/{build_number}/{keyboard_hash}/_/images/icons/profilepics/add_profile_pic.svg',
692686
catch_response=True)
693687

694-
# 810 rest/helptips/1.0/tips
695-
locust.get('/rest/helptips/1.0/tips', catch_response=True)
696-
697688
# 820 rest/mywork/latest/status/notification/count
698689
locust.get(f'/rest/mywork/latest/status/notification/count'
699690
f'?pageid={content_id}'
@@ -975,9 +966,6 @@ def create_page():
975966
headers=RESOURCE_HEADERS,
976967
catch_response=True)
977968

978-
# 1190 rest/helptips/1.0/tips
979-
locust.get('/rest/helptips/1.0/tips', catch_response=True)
980-
981969
# 1200 rest/inlinecomments/1.0/comments
982970
locust.get(f'/rest/inlinecomments/1.0/comments'
983971
f'?containerId={locust.session_data_storage["content_id"]}'
@@ -1234,9 +1222,6 @@ def edit_page():
12341222
headers=RESOURCE_HEADERS,
12351223
catch_response=True)
12361224

1237-
# 1510 rest/helptips/1.0/tips
1238-
locust.get('/rest/helptips/1.0/tips', catch_response=True)
1239-
12401225
locust.get(f'/rest/inlinecomments/1.0/comments'
12411226
f'?containerId={locust.session_data_storage["content_id"]}'
12421227
f'&_={timestamp_int()}',

0 commit comments

Comments
 (0)