Skip to content

Commit

Permalink
Merge pull request #827 from atlassian/release/6.2.0
Browse files Browse the repository at this point in the history
Release 6.2.0
  • Loading branch information
marynaalt committed May 11, 2022
2 parents a8c7151 + a72c921 commit e5b19a5
Show file tree
Hide file tree
Showing 55 changed files with 5,037 additions and 175 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 blazemeter/taurus:1.16.2
FROM blazemeter/taurus:1.16.4

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

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ 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.13.16`, `8.20.4`
* Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.13.20`, `8.20.8`

* Supported Jira Service Management versions:
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.13.16`, `4.20.4`
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.13.20`, `4.20.8`

* Supported Confluence versions:
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.3`, `7.4.14`
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.5`, `7.4.16`

* Supported Bitbucket Server versions:
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.6.13`, `7.17.5`
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.6.14`, `7.17.6`

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

* Supported Bamboo versions:
* Bamboo [release notes](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `8.1.1`
* Bamboo [release notes](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `8.1.3`

## 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.
Expand All @@ -29,7 +29,7 @@ In case of technical questions, issues or problems with DC Apps Performance Tool

#### Dependencies
* Python 3.7, 3.8 or 3.9 and pip
* JDK 8
* JDK 11
* Google Chrome web browser
* Git client (only for Bitbucket DC)

Expand Down
5 changes: 3 additions & 2 deletions app/bamboo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ settings:
artifacts-dir: results/bamboo/%Y-%m-%d_%H-%M-%S
aggregator: consolidator
verbose: false
check-updates: false # disable bzt check for updates
env:
application_hostname: test-bamboo.atlassian.com # Bamboo DC hostname without protocol and port e.g. test-bamboo.atlassian.com or localhost
application_protocol: http # http or https
Expand Down Expand Up @@ -48,7 +49,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==3.141.0
- selenium==4.1.3
execution:
- scenario: jmeter
executor: jmeter
Expand Down Expand Up @@ -122,7 +123,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "97.0.4692.71" # Supports Chrome version 97. You can refer to http://chromedriver.chromium.org/downloads
version: "101.0.4951.41" # Supports Chrome version 101. You can refer to http://chromedriver.chromium.org/downloads
reporting:
- data-source: sample-labels
module: junit-xml
5 changes: 3 additions & 2 deletions app/bitbucket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ settings:
artifacts-dir: results/bitbucket/%Y-%m-%d_%H-%M-%S
aggregator: consolidator
verbose: false
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
Expand Down Expand Up @@ -35,7 +36,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==3.141.0
- selenium==4.1.3
execution:
- scenario: ${load_executor}
concurrency: ${concurrency}
Expand Down Expand Up @@ -89,7 +90,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "97.0.4692.71" # Supports Chrome version 97. You can refer to http://chromedriver.chromium.org/downloads
version: "101.0.4951.41" # Supports Chrome version 101. You can refer to http://chromedriver.chromium.org/downloads
reporting:
- data-source: sample-labels
module: junit-xml
5 changes: 3 additions & 2 deletions app/confluence.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ settings:
artifacts-dir: results/confluence/%Y-%m-%d_%H-%M-%S
aggregator: consolidator
verbose: false
check-updates: false # disable bzt check for updates
env:
application_hostname: test_confluence_instance.atlassian.com # Confluence DC hostname without protocol and port e.g. test-confluence.atlassian.com or localhost
application_protocol: http # http or https
Expand Down Expand Up @@ -48,7 +49,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==3.141.0
- selenium==4.1.3
execution:
- scenario: ${load_executor}
executor: ${load_executor}
Expand Down Expand Up @@ -113,7 +114,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "97.0.4692.71" # Supports Chrome version 97. You can refer to http://chromedriver.chromium.org/downloads
version: "101.0.4951.41" # Supports Chrome version 101. You can refer to http://chromedriver.chromium.org/downloads
reporting:
- data-source: sample-labels
module: junit-xml
1 change: 1 addition & 0 deletions app/crowd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ settings:
artifacts-dir: results/crowd/%Y-%m-%d_%H-%M-%S
aggregator: consolidator
verbose: false
check-updates: false # disable bzt check for updates
env:
application_hostname: test_crowd_instance.atlassian.com # Crowd DC hostname without protocol and port e.g. test-crowd.atlassian.com or localhost
application_protocol: http # http or https
Expand Down
5 changes: 3 additions & 2 deletions app/jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ settings:
artifacts-dir: results/jira/%Y-%m-%d_%H-%M-%S
aggregator: consolidator
verbose: false
check-updates: false # disable bzt check for updates
env:
application_hostname: test_jira_instance.atlassian.com # Jira DC hostname without protocol and port e.g. test-jira.atlassian.com or localhost
application_protocol: http # http or https
Expand Down Expand Up @@ -50,7 +51,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==3.141.0
- selenium==4.1.3
execution:
- scenario: ${load_executor}
executor: ${load_executor}
Expand Down Expand Up @@ -117,7 +118,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "97.0.4692.71" # Supports Chrome version 97. You can refer to http://chromedriver.chromium.org/downloads
version: "101.0.4951.41" # Supports Chrome version 101. You can refer to http://chromedriver.chromium.org/downloads
reporting:
- data-source: sample-labels
module: junit-xml
Loading

0 comments on commit e5b19a5

Please sign in to comment.