Skip to content

Commit a3d79d7

Browse files
authored
Merge pull request #1930 from atlassian/release/8.9.0
Release/8.9.0
2 parents c86a282 + cd77fb1 commit a3d79d7

27 files changed

+517
-301
lines changed

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-
* @vkavalenka80 @bgospodarek @ometelytsia @SergeyMoroz0703 @OlehStefanyshyn
2+
* @vkavalenka80 @bgospodarek

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ 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.26`, `10.3.9` and `11.0.0` Platform release
8+
* Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.28`, `10.3.12` and `11.0.1` 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.26`, `10.3.9` and `11.0.0` Platform release
11+
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.28`, `10.3.12` and `11.0.1` 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.25`, `9.2.7` and `10.0.2` Platform release
14+
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.27`, `9.2.9` and `10.0.3` 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.21` and `9.4.9`
17+
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.24`, `9.4.12` and `10.0.1` Platform release
1818

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

2222
* Supported Bamboo versions:
23-
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.7`
23+
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.9`
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](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel.

app/bamboo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ services:
5353
- python util/post_run/cleanup_results_dir.py
5454
- module: pip-install
5555
packages:
56-
- selenium==4.35.0
56+
- selenium==4.38.0
5757
execution:
5858
- scenario: jmeter
5959
executor: jmeter
@@ -123,7 +123,7 @@ modules:
123123
httpsampler.ignore_failed_embedded_resources: "true"
124124
selenium:
125125
chromedriver:
126-
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
126+
version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
127127
reporting:
128128
- data-source: sample-labels
129129
module: junit-xml

app/bitbucket.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ services:
3939
- python util/post_run/cleanup_results_dir.py
4040
- module: pip-install
4141
packages:
42-
- selenium==4.35.0
42+
- selenium==4.38.0
4343
execution:
4444
- scenario: ${load_executor}
4545
concurrency: ${concurrency}
@@ -89,7 +89,7 @@ modules:
8989
httpsampler.ignore_failed_embedded_resources: "true"
9090
selenium:
9191
chromedriver:
92-
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
92+
version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
9393
reporting:
9494
- data-source: sample-labels
9595
module: junit-xml

app/confluence.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ services:
5454
- python util/post_run/cleanup_results_dir.py
5555
- module: pip-install
5656
packages:
57-
- selenium==4.35.0
57+
- selenium==4.38.0
5858
execution:
5959
- scenario: ${load_executor}
6060
executor: ${load_executor}
@@ -116,7 +116,7 @@ modules:
116116
httpsampler.ignore_failed_embedded_resources: "true"
117117
selenium:
118118
chromedriver:
119-
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
119+
version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
120120
reporting:
121121
- data-source: sample-labels
122122
module: junit-xml

app/jira.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ services:
5454
- python util/post_run/cleanup_results_dir.py
5555
- module: pip-install
5656
packages:
57-
- selenium==4.35.0
57+
- selenium==4.38.0
5858
execution:
5959
- scenario: ${load_executor}
6060
executor: ${load_executor}
@@ -117,7 +117,7 @@ modules:
117117
httpsampler.ignore_failed_embedded_resources: "true"
118118
selenium:
119119
chromedriver:
120-
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
120+
version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
121121
reporting:
122122
- data-source: sample-labels
123123
module: junit-xml

app/jsm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ services:
6969
- python util/post_run/cleanup_results_dir.py
7070
- module: pip-install
7171
packages:
72-
- selenium==4.35.0
72+
- selenium==4.38.0
7373
execution:
7474
- scenario: ${load_executor}_agents
7575
executor: ${load_executor}
@@ -168,7 +168,7 @@ modules:
168168
httpsampler.ignore_failed_embedded_resources: "true"
169169
selenium:
170170
chromedriver:
171-
version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
171+
version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
172172
reporting:
173173
- data-source: sample-labels
174174
module: junit-xml

app/reports_generation/scripts/results_archivator.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,34 @@
11
from pathlib import Path
22
from shutil import make_archive
3+
import re
34

45
from scripts.utils import validate_config, clean_str, resolve_relative_path
56

67

78
def __zip_folder(folder_path: Path, destination_path: Path) -> Path:
9+
yml_files = list(folder_path.glob("*.yml"))
10+
if len(yml_files) > 0:
11+
__hide_sensitive_info(yml_files)
812
archive_path = make_archive(destination_path, 'zip', folder_path)
913
return Path(archive_path)
1014

1115

16+
def __hide_sensitive_info(files: list[Path]) -> None:
17+
for file in files:
18+
with file.open('r') as f:
19+
lines = f.readlines()
20+
new_lines = []
21+
file_edited = False
22+
for line in lines:
23+
if re.match(r'\s*admin_password\s*:', line):
24+
line = re.sub(r'(:\s*).+', r'\1****', line)
25+
file_edited = True
26+
new_lines.append(line)
27+
if file_edited:
28+
with file.open('w') as f:
29+
f.writelines(new_lines)
30+
31+
1232
def archive_results(config: dict, results_dir: Path):
1333
validate_config(config)
1434
for run in config['runs']:

app/selenium_ui/base_page.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import time
55

66
from packaging import version
7-
from selenium.common.exceptions import WebDriverException
7+
from selenium.common.exceptions import WebDriverException, TimeoutException
88
from selenium.webdriver.common.action_chains import ActionChains
99
from selenium.webdriver.common.by import By
1010
from selenium.webdriver.support import expected_conditions as ec
@@ -79,6 +79,14 @@ def wait_until_visible(self, selector, timeout=timeout):
7979
return self.__wait_until(expected_condition=ec.visibility_of_element_located(selector), locator=selector,
8080
time_out=timeout)
8181

82+
def became_visible_in_time(self, selector, timeout):
83+
try:
84+
self.__wait_until(expected_condition=ec.visibility_of_element_located(selector), locator=selector,
85+
time_out=timeout)
86+
return True
87+
except TimeoutException:
88+
return False
89+
8290
def wait_until_available_to_switch(self, selector):
8391
return self.__wait_until(expected_condition=ec.frame_to_be_available_and_switch_to_it(selector),
8492
locator=selector,

app/selenium_ui/bitbucket/modules.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ def measure():
186186
PopupManager(webdriver).dismiss_default_popup()
187187
pull_request_page.dismiss_updates_info_popup()
188188
pull_request_page.click_inline_comment_button_js()
189+
PopupManager(webdriver).dismiss_default_popup()
189190
pull_request_page.dismiss_updates_info_popup()
190191
pull_request_page.add_code_comment()
191192
measure()
@@ -239,12 +240,15 @@ def sub_measure():
239240
branch_from = datasets['current_session']['pull_request_branch_from']
240241
branch_to = datasets['current_session']['pull_request_branch_to']
241242
repository_branches_page.open_base_branch(base_branch_name=branch_from)
243+
PopupManager(webdriver).dismiss_default_popup()
242244
fork_branch_from = repository_branches_page.create_branch_fork_rnd_name(base_branch_name=branch_from)
243245
navigation_panel.wait_for_navigation_panel()
246+
PopupManager(webdriver).dismiss_default_popup()
244247
repository_branches_page.open_base_branch(base_branch_name=branch_to)
245248
fork_branch_to = repository_branches_page.create_branch_fork_rnd_name(base_branch_name=branch_to)
246249
datasets['pull_request_fork_branch_to'] = fork_branch_to
247250
navigation_panel.wait_for_navigation_panel()
251+
PopupManager(webdriver).dismiss_default_popup()
248252
repo_pull_requests_page.create_new_pull_request(from_branch=fork_branch_from, to_branch=fork_branch_to)
249253
pull_request_page.dismiss_updates_info_popup()
250254
PopupManager(webdriver).dismiss_default_popup()

0 commit comments

Comments
 (0)