Skip to content

Commit 99f72f1

Browse files
authored
Merge pull request #1682 from atlassian/release/8.6.0
Release 8.6.0
2 parents ce4ccf2 + 80a8fdb commit 99f72f1

Some content is hidden

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

46 files changed

+1425
-732
lines changed

Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
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.12-slim-bookworm
7+
FROM python:3.13-slim-bookworm
88

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

1111
ARG CHROME_VERSION="latest"
12+
ARG INCLUDE_BZT_TOOLS="false"
1213

1314
ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
1415
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,11 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_
2930
COPY requirements.txt /tmp/requirements.txt
3031
RUN pip install --no-cache-dir -r /tmp/requirements.txt
3132

32-
RUN wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \
33-
tar -xzf /tmp/bzt.tar.gz -C /root && \
34-
rm /tmp/bzt.tar.gz
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 && \
35+
tar -xzf /tmp/bzt.tar.gz -C /root && \
36+
rm /tmp/bzt.tar.gz; \
37+
fi
3538

3639
WORKDIR /dc-app-performance-toolkit/app
3740

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@ 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.12`, `9.4.25` and `10.0.1` Platform release
8+
* Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.17` and `10.3.0`
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.12`, `5.4.25` and `10.0.1` Platform release
11+
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.17` and `10.3.1`
1212

1313
* Supported Confluence versions:
14-
* 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
14+
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.18` and `9.2.0`
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.7`, `8.9.18` and `9.0.0` Platform release
17+
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.14` and `9.4.1`
1818

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

2222
* Supported Bamboo versions:
23-
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.6.6` and `10.0.1` Platform release
23+
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.0`
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.9 - 3.12 and pip
31+
* Python 3.9 - 3.13 and pip
3232
* JDK 17 or JDK 21
3333
* Google Chrome web browser
3434
* Git client (only for Bitbucket DC)

app/bamboo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ services:
5151
- python util/post_run/cleanup_results_dir.py
5252
- module: pip-install
5353
packages:
54-
- selenium==4.25.0
54+
- selenium==4.27.1
5555
execution:
5656
- scenario: jmeter
5757
executor: jmeter
@@ -121,7 +121,7 @@ modules:
121121
httpsampler.ignore_failed_embedded_resources: "true"
122122
selenium:
123123
chromedriver:
124-
version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
124+
version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing
125125
reporting:
126126
- data-source: sample-labels
127127
module: junit-xml

app/bitbucket.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ services:
3737
- python util/post_run/cleanup_results_dir.py
3838
- module: pip-install
3939
packages:
40-
- selenium==4.25.0
40+
- selenium==4.27.1
4141
execution:
4242
- scenario: ${load_executor}
4343
concurrency: ${concurrency}
@@ -87,7 +87,7 @@ modules:
8787
httpsampler.ignore_failed_embedded_resources: "true"
8888
selenium:
8989
chromedriver:
90-
version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
90+
version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing
9191
reporting:
9292
- data-source: sample-labels
9393
module: junit-xml

app/confluence.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252
- python util/post_run/cleanup_results_dir.py
5353
- module: pip-install
5454
packages:
55-
- selenium==4.25.0
55+
- selenium==4.27.1
5656
execution:
5757
- scenario: ${load_executor}
5858
executor: ${load_executor}
@@ -114,7 +114,7 @@ modules:
114114
httpsampler.ignore_failed_embedded_resources: "true"
115115
selenium:
116116
chromedriver:
117-
version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
117+
version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing
118118
reporting:
119119
- data-source: sample-labels
120120
module: junit-xml

app/extension/jira/extension_ui.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from selenium_ui.base_page import BasePage
66
from selenium_ui.conftest import print_timing
7-
from selenium_ui.jira.pages.pages import Login
7+
from selenium_ui.jira.pages.pages import Login, AdminPage
88
from util.conf import JIRA_SETTINGS
99

1010

@@ -23,12 +23,17 @@ def app_specific_action(webdriver, datasets):
2323
# login_page = Login(webdriver)
2424
# login_page.delete_all_cookies()
2525
# login_page.go_to()
26+
# login_page.wait_for_login_page_loaded()
2627
# login_page.set_credentials(username=username, password=password)
28+
# login_page.wait_for_dashboard_or_first_login_loaded()
2729
# if login_page.is_first_login():
2830
# login_page.first_login_setup()
2931
# if login_page.is_first_login_second_page():
3032
# login_page.first_login_second_page_setup()
3133
# login_page.wait_for_page_loaded()
34+
# # uncomment below line to do web_sudo and authorise access to admin pages
35+
# # AdminPage(webdriver).go_to(password=password)
36+
#
3237
# app_specific_user_login(username='admin', password='admin')
3338
# measure()
3439

app/jira.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252
- python util/post_run/cleanup_results_dir.py
5353
- module: pip-install
5454
packages:
55-
- selenium==4.25.0
55+
- selenium==4.27.1
5656
execution:
5757
- scenario: ${load_executor}
5858
executor: ${load_executor}
@@ -115,7 +115,7 @@ modules:
115115
httpsampler.ignore_failed_embedded_resources: "true"
116116
selenium:
117117
chromedriver:
118-
version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
118+
version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing
119119
reporting:
120120
- data-source: sample-labels
121121
module: junit-xml

0 commit comments

Comments
 (0)