Skip to content

Commit 7d5959e

Browse files
vkavalenka80vkavalenka80
authored
Merge pull request #1893 from atlassian/issue/dev/ECO-1037_confluence-bump_verions
Bump confluence versions
2 parents bfcf4d4 + 938d072 commit 7d5959e

File tree

4 files changed

+3
-171
lines changed

4 files changed

+3
-171
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): `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:
1717
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21`, `9.4.9` and `10.0.0` 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 = "9.2.7"
164+
confluence_version_tag = "9.2.9"
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 & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -339,174 +339,6 @@
339339
},
340340
"confluence": {
341341
"versions": [
342-
{
343-
"version": "10.0.2",
344-
"data": [
345-
{
346-
"type": "ebs",
347-
"size": "small",
348-
"snapshots": [
349-
{
350-
"us-east-2": "snap-017dab74a941fbbeb",
351-
"us-east-1": "snap-094ed2d0367fb59a7"
352-
}
353-
]
354-
},
355-
{
356-
"type": "rds",
357-
"size": "small",
358-
"snapshots": [
359-
{
360-
"us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-10-0-2",
361-
"us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-10-0-2"
362-
}
363-
]
364-
},
365-
{
366-
"type": "ebs",
367-
"size": "large",
368-
"snapshots": [
369-
{
370-
"us-east-2": "snap-0bcc0788c941674f9",
371-
"us-east-1": "snap-091e65ed2d988152e"
372-
}
373-
]
374-
},
375-
{
376-
"type": "rds",
377-
"size": "large",
378-
"snapshots": [
379-
{
380-
"us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-10-0-2",
381-
"us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-10-0-2"
382-
}
383-
]
384-
},
385-
{
386-
"type": "local-home",
387-
"size": "large",
388-
"snapshots": [
389-
{
390-
"us-east-2": "snap-07381978e5107d22b",
391-
"us-east-1": "snap-0478bb092072029fc"
392-
}
393-
]
394-
}
395-
],
396-
"build_number": "9304"
397-
},
398-
{
399-
"version": "8.5.25",
400-
"data": [
401-
{
402-
"type": "ebs",
403-
"size": "small",
404-
"snapshots": [
405-
{
406-
"us-east-2": "snap-09f3d45f0666c5113",
407-
"us-east-1": "snap-0fcb8d0279ce0fdca"
408-
}
409-
]
410-
},
411-
{
412-
"type": "rds",
413-
"size": "small",
414-
"snapshots": [
415-
{
416-
"us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-25",
417-
"us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-25"
418-
}
419-
]
420-
},
421-
{
422-
"type": "ebs",
423-
"size": "large",
424-
"snapshots": [
425-
{
426-
"us-east-2": "snap-0267a462e98ffdaec",
427-
"us-east-1": "snap-0c7c80285157c1fe1"
428-
}
429-
]
430-
},
431-
{
432-
"type": "rds",
433-
"size": "large",
434-
"snapshots": [
435-
{
436-
"us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-25",
437-
"us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-25"
438-
}
439-
]
440-
},
441-
{
442-
"type": "local-home",
443-
"size": "large",
444-
"snapshots": [
445-
{
446-
"us-east-2": "snap-0fc33474a6932eef4",
447-
"us-east-1": "snap-088774c9ef2b58e6a"
448-
}
449-
]
450-
}
451-
],
452-
"build_number": "9012"
453-
},
454-
{
455-
"version": "9.2.7",
456-
"data": [
457-
{
458-
"type": "ebs",
459-
"size": "small",
460-
"snapshots": [
461-
{
462-
"us-east-2": "snap-03e57c101b20ed9d3",
463-
"us-east-1": "snap-06abd6daddb85ddda"
464-
}
465-
]
466-
},
467-
{
468-
"type": "rds",
469-
"size": "small",
470-
"snapshots": [
471-
{
472-
"us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-2-7",
473-
"us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-2-7"
474-
}
475-
]
476-
},
477-
{
478-
"type": "ebs",
479-
"size": "large",
480-
"snapshots": [
481-
{
482-
"us-east-2": "snap-0bc9a48fd61f74d3a",
483-
"us-east-1": "snap-060fd8cc29bddccf3"
484-
}
485-
]
486-
},
487-
{
488-
"type": "rds",
489-
"size": "large",
490-
"snapshots": [
491-
{
492-
"us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-2-7",
493-
"us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-2-7"
494-
}
495-
]
496-
},
497-
{
498-
"type": "local-home",
499-
"size": "large",
500-
"snapshots": [
501-
{
502-
"us-east-2": "snap-01bdd9c9fc5523492",
503-
"us-east-1": "snap-0be4fdf8be3458f66"
504-
}
505-
]
506-
}
507-
],
508-
"build_number": "9111"
509-
},
510342
{
511343
"version": "8.5.27",
512344
"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 = "9.2.7"
175+
confluence_version_tag = "9.2.9"
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)