Skip to content

Commit 5635c0e

Browse files
authored
Merge pull request atlassian#1366 from atlassian/release/8.2.0
Release 8.2.0
2 parents 9e3409d + 43e7ae9 commit 5635c0e

23 files changed

+121
-91
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat
2020
* Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `5.2.3`
2121

2222
* Supported Bamboo versions:
23-
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.11`
23+
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.6.1`
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.

app/bamboo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ modules:
125125
httpsampler.ignore_failed_embedded_resources: "true"
126126
selenium:
127127
chromedriver:
128-
version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing
128+
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
129129
reporting:
130130
- data-source: sample-labels
131131
module: junit-xml

app/bitbucket.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ modules:
9191
httpsampler.ignore_failed_embedded_resources: "true"
9292
selenium:
9393
chromedriver:
94-
version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing
94+
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
9595
reporting:
9696
- data-source: sample-labels
9797
module: junit-xml

app/confluence.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ modules:
118118
httpsampler.ignore_failed_embedded_resources: "true"
119119
selenium:
120120
chromedriver:
121-
version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing
121+
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
122122
reporting:
123123
- data-source: sample-labels
124124
module: junit-xml

app/jira.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ modules:
119119
httpsampler.ignore_failed_embedded_resources: "true"
120120
selenium:
121121
chromedriver:
122-
version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing
122+
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
123123
reporting:
124124
- data-source: sample-labels
125125
module: junit-xml

app/jsm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ modules:
171171
httpsampler.ignore_failed_embedded_resources: "true"
172172
selenium:
173173
chromedriver:
174-
version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing
174+
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
175175
reporting:
176176
- data-source: sample-labels
177177
module: junit-xml

app/selenium_ui/bamboo/pages/selectors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class AllBuildsLocators:
5252

5353

5454
class PlanConfigurationLocators:
55-
edit_config_button = (By.XPATH, "//span[contains(text(),'Configure plan')]")
55+
edit_config_button = (By.XPATH, "//span[@title='Configure plan']")
5656
config_plan_page = (By.ID, "config-sidebar")
5757
config_plan_page_content = (By.ID, "content")
5858

app/util/api/bamboo_clients.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,18 @@ def get_server_info(self):
159159
return r.json()
160160

161161
def get_available_processors(self):
162-
processors = None
163-
page = self.get(f'{self.host}/admin/systemInfo.action', 'Could not get Page content')
164-
tree = html.fromstring(page.content)
165162
try:
166-
processors = tree.xpath('//*[@id="systemInfo_availableProcessors"]/text()')[0]
167-
except Exception as error:
168-
print(f"Warning: Could not parse number of Bamboo available processors: {error}")
169-
return processors
163+
processors = None
164+
page = self.get(f'{self.host}/admin/systemInfo.action', 'Could not get Page content')
165+
tree = html.fromstring(page.content)
166+
try:
167+
processors = tree.xpath('//*[@id="systemInfo_availableProcessors"]/text()')[0]
168+
except Exception as e:
169+
print(f"Warning: Could not parse number of Bamboo available processors: {e}")
170+
return processors
171+
except Exception as e:
172+
print(f"Warning: Could not get Available Processors information. Error: {e}")
173+
return 'N/A'
170174

171175
def get_nodes_count(self):
172176
r = self.get(f'{self.host}/rest/api/latest/server/nodes', error_msg="Could not get Bamboo nodes count")

app/util/api/bitbucket_clients.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,18 @@ def get_bitbucket_repo_count(self):
173173
return repos_count
174174

175175
def get_available_processors(self):
176-
processors = None
177-
page = self.get_bitbucket_system_page()
178-
tree = html.fromstring(page.content)
179176
try:
180-
processors = tree.xpath('//*[@id="content-stp.properties.os-0"]/div[4]/span/text()')[0]
181-
except Exception as error:
182-
print(f"Warning: Could not parse number of Bitbucket available processors: {error}")
183-
return processors
177+
processors = None
178+
page = self.get_bitbucket_system_page()
179+
tree = html.fromstring(page.content)
180+
try:
181+
processors = tree.xpath('//*[@id="content-stp.properties.os-0"]/div[4]/span/text()')[0]
182+
except Exception as error:
183+
print(f"Warning: Could not parse number of Bitbucket available processors: {error}")
184+
return processors
185+
except Exception as e:
186+
print(f"Warning: Could not get Available Processors information. Error: {e}")
187+
return 'N/A'
184188

185189
def get_locale(self):
186190
language = None

app/util/api/jsm_clients.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def get_requests(self, start_at: int = 0, max_results: int = 100, auth: tuple =
104104
init_url = self.host + "/rest/servicedeskapi/request"
105105
while loop_count > 0:
106106

107-
api_url = init_url + f"?start={start_at}&limit={max_results}"
107+
api_url = init_url + f"?start={start_at}&limit={max_results}&requestOwnership=PARTICIPATED_REQUESTS"
108108
if status:
109109
api_url += f"&requestStatus={status}"
110110

0 commit comments

Comments
 (0)