Skip to content

Commit 2d97905

Browse files
authored
Merge pull request #1996 from atlassian/issue/dev/ECO-1208_bump-confluence-10-2-2
Bump Confluence 10.2
2 parents c935188 + c88dd33 commit 2d97905

File tree

4 files changed

+3
-59
lines changed

4 files changed

+3
-59
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat
1111
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `10.3.12`, `11.3.1`
1212

1313
* Supported Confluence versions:
14-
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.13`, `10.2.1`
14+
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.2.13`, `10.2.2`
1515

1616
* Supported Bitbucket Server versions:
1717
* 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

app/util/k8s/dcapt-small.tfvars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"]
161161
################################################################################
162162

163163
# Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
164-
confluence_version_tag = "10.2.1"
164+
confluence_version_tag = "10.2.2"
165165

166166
# Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
167167
confluence_dataset_size = "small"

app/util/k8s/dcapt-snapshots.json

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -229,62 +229,6 @@
229229
},
230230
"confluence": {
231231
"versions": [
232-
{
233-
"version": "10.2.1",
234-
"data": [
235-
{
236-
"type": "ebs",
237-
"size": "small",
238-
"snapshots": [
239-
{
240-
"us-east-2": "snap-06539327a4ecaa580",
241-
"us-east-1": "snap-04810522502049ae7"
242-
}
243-
]
244-
},
245-
{
246-
"type": "rds",
247-
"size": "small",
248-
"snapshots": [
249-
{
250-
"us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-2-1",
251-
"us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-2-1"
252-
}
253-
]
254-
},
255-
{
256-
"type": "ebs",
257-
"size": "large",
258-
"snapshots": [
259-
{
260-
"us-east-2": "snap-02ffec9429d302d4f",
261-
"us-east-1": "snap-07a005f562cd9e4a4"
262-
}
263-
]
264-
},
265-
{
266-
"type": "rds",
267-
"size": "large",
268-
"snapshots": [
269-
{
270-
"us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-2-1",
271-
"us-east-1": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-2-1"
272-
}
273-
]
274-
},
275-
{
276-
"type": "local-home",
277-
"size": "large",
278-
"snapshots": [
279-
{
280-
"us-east-2": "snap-037fed47915b233dc",
281-
"us-east-1": "snap-0e69c87f7ff829af8"
282-
}
283-
]
284-
}
285-
],
286-
"build_number": "9403"
287-
},
288232
{
289233
"version": "9.2.13",
290234
"data": [

app/util/k8s/dcapt.tfvars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"]
172172
################################################################################
173173

174174
# Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
175-
confluence_version_tag = "10.2.1"
175+
confluence_version_tag = "10.2.2"
176176

177177
# Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
178178
confluence_dataset_size = "large"

0 commit comments

Comments
 (0)