Skip to content

Commit

Permalink
Merge pull request #1044 from atlassian/release/7.4.0
Browse files Browse the repository at this point in the history
Release/7.4.0
  • Loading branch information
OlehStefanyshyn committed May 29, 2023
2 parents 93e8f75 + 679607c commit 99e302e
Show file tree
Hide file tree
Showing 33 changed files with 980 additions and 693 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ 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.20` and `9.4.4`
* Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.20.22` and `9.4.6`

* Supported Jira Service Management versions:
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.20` and `5.4.4`
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.20.22` and `5.4.6`

* Supported Confluence versions:
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.6`, `7.13.14` and `8.1.1` platform release
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.9`, `7.13.17` and `8.1.4` platform release

* Supported Bitbucket Server versions:
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.10`, `7.17.15`, and `8.8.2` platform release.
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.11`, `7.17.16`, and `8.8.3` platform release.

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

* Supported Bamboo versions:
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.1`
Expand Down
4 changes: 2 additions & 2 deletions app/bamboo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==4.8.3
- selenium==4.9.0
execution:
- scenario: jmeter
executor: jmeter
Expand Down Expand Up @@ -123,7 +123,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "112.0.5615.49" # Supports Chrome version 112. You can refer to http://chromedriver.chromium.org/downloads
version: "113.0.5672.63" # Supports Chrome version 113. You can refer to http://chromedriver.chromium.org/downloads
reporting:
- data-source: sample-labels
module: junit-xml
4 changes: 2 additions & 2 deletions app/bitbucket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==4.8.3
- selenium==4.9.0
execution:
- scenario: ${load_executor}
concurrency: ${concurrency}
Expand Down Expand Up @@ -90,7 +90,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "112.0.5615.49" # Supports Chrome version 112. You can refer to http://chromedriver.chromium.org/downloads
version: "113.0.5672.63" # Supports Chrome version 113. You can refer to http://chromedriver.chromium.org/downloads
reporting:
- data-source: sample-labels
module: junit-xml
8 changes: 5 additions & 3 deletions app/confluence.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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: 35
view_page: 33
view_dashboard: 9
view_blog: 13
search_cql: 10
Expand All @@ -33,6 +33,7 @@ settings:
view_attachment: 5
upload_attachment: 6
like_page: 3
upload_emoticon: 2 # For Confluence 8.4.x+
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*'"
Expand All @@ -50,7 +51,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==4.8.3
- selenium==4.9.0
execution:
- scenario: ${load_executor}
executor: ${load_executor}
Expand Down Expand Up @@ -85,6 +86,7 @@ scenarios:
perc_view_attachment: ${view_attachment}
perc_upload_attachment: ${upload_attachment}
perc_like_page: ${like_page}
perc_upload_emoticon: ${upload_emoticon}
perc_standalone_extension: ${standalone_extension}
modules:
consolidator:
Expand Down Expand Up @@ -115,7 +117,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "112.0.5615.49" # Supports Chrome version 112. You can refer to http://chromedriver.chromium.org/downloads
version: "113.0.5672.63" # Supports Chrome version 113. You can refer to http://chromedriver.chromium.org/downloads
reporting:
- data-source: sample-labels
module: junit-xml
Expand Down
5 changes: 5 additions & 0 deletions app/datasets/confluence/static-content/emojis_upload.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
datasets/confluence/static-content/upload/emoji1.jpg,image/jpeg,emoji1.jpg
datasets/confluence/static-content/upload/emoji2.png,image/png,emoji2.png
datasets/confluence/static-content/upload/emoji3.gif,image/gif,emoji3.gif
datasets/confluence/static-content/upload/emoji4.gif,image/gif,emoji4.gif
datasets/confluence/static-content/upload/emoji5.gif,image/gif,emoji5.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==4.8.3
- selenium==4.9.0
execution:
- scenario: ${load_executor}
executor: ${load_executor}
Expand Down Expand Up @@ -118,7 +118,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "112.0.5615.49" # Supports Chrome version 112. You can refer to http://chromedriver.chromium.org/downloads
version: "113.0.5672.63" # Supports Chrome version 113. You can refer to http://chromedriver.chromium.org/downloads
reporting:
- data-source: sample-labels
module: junit-xml
2 changes: 1 addition & 1 deletion app/jmeter/bamboo.jmx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.2.1">
<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.4.3">
<hashTree>
<TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
<stringProp name="TestPlan.comments"></stringProp>
Expand Down
2 changes: 1 addition & 1 deletion app/jmeter/bitbucket.jmx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.2.1">
<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.4.3">
<hashTree>
<TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
<stringProp name="TestPlan.comments">This test plan was created by the BlazeMeter converter v.2.3.14. Please contact support@blazemeter.com for further support.</stringProp>
Expand Down

0 comments on commit 99e302e

Please sign in to comment.