From 6556525f2618d4c01821d09631a1f504a17b7b35 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 19 Aug 2024 19:34:37 +0300 Subject: [PATCH] confluence/add-902-support-and-bump-versions --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 2 +- app/util/k8s/dcapt-snapshots.json | 104 +++++++++++++++++++++++------- app/util/k8s/dcapt.tfvars | 2 +- 4 files changed, 83 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 9b7227712..99fe497ee 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.8` and `5.4.22` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.9` and `7.19.22` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14`, `7.19.26` and `9.0.2` Platform release * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.7`, `8.9.18` and `9.0.0` Platform release diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 1b0dde63a..65f6404d1 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -161,7 +161,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "8.5.9" +confluence_version_tag = "8.5.14" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "small" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 3e2ed09c2..5bf3479c9 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -230,25 +230,25 @@ "confluence": { "versions": [ { - "version": "8.5.9", + "version": "8.5.14", "data": [ { - "type": "rds", + "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-9" + "us-east-2": "snap-0ab8b4f943983c080", + "us-east-1": "snap-0b8a90c1e52f81419" } ] }, { - "type": "ebs", + "type": "rds", "size": "small", "snapshots": [ { - "us-east-2": "snap-0f50f2ea319c45d51", - "us-east-1": "snap-04e7e96e4150c9334" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-14", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-14" } ] }, @@ -257,8 +257,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-095d5bda17be963d8", - "us-east-1": "snap-0705c82ce05bcdb9f" + "us-east-2": "snap-07d8d8583822fb512", + "us-east-1": "snap-0324e1b2130be6fef" } ] }, @@ -267,8 +267,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-9", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-9" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-14", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-14" } ] }, @@ -277,8 +277,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-04f9268e11ae1edbe", - "us-east-1": "snap-087fffaf5e3d0bcbb" + "us-east-2": "snap-0f100550395f59e86", + "us-east-1": "snap-00624aeb7d3068a07" } ] } @@ -286,15 +286,15 @@ "build_number": "9012" }, { - "version": "7.19.22", + "version": "7.19.26", "data": [ { "type": "ebs", "size": "small", "snapshots": [ { - "us-east-2": "snap-0aca26e5070d87a5c", - "us-east-1": "snap-090f090fb6c143d34" + "us-east-2": "snap-0110ef301c0517b63", + "us-east-1": "snap-02790fdfa10bbb675" } ] }, @@ -303,8 +303,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-22", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-7-19-22" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-7-19-26" } ] }, @@ -313,8 +313,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-07e3f2817de852bf5", - "us-east-1": "snap-062d86bad23771488" + "us-east-2": "snap-0b5b1710dba17a851", + "us-east-1": "snap-09c20285b19c42232" } ] }, @@ -323,8 +323,8 @@ "size": "large", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-22", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-19-22" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-19-26" } ] }, @@ -333,13 +333,69 @@ "size": "large", "snapshots": [ { - "us-east-2": "snap-01b7d52aebfc5aad8", - "us-east-1": "snap-073f351d088ddeb61" + "us-east-2": "snap-054156e5c540b25fa", + "us-east-1": "snap-07b216c16361eca04" } ] } ], "build_number": "8804" + }, + { + "version": "9.0.2", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0708fe4076049b8ef", + "us-east-1": "snap-01f51febcf56e2ae5" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-9-0-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-9-0-2" + } + ] + }, + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-082ccc7959ebdc851", + "us-east-1": "snap-0f2bf3233418c8a30" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-9-0-2", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-9-0-2" + } + ] + }, + { + "type": "local-home", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-06c5d1e6a8009fefb", + "us-east-1": "snap-063e03017a826e78e" + } + ] + } + ], + "build_number": "9104" } ] }, diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 09afb2da5..ba694b5aa 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -172,7 +172,7 @@ jira_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"] ################################################################################ # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "8.5.9" +confluence_version_tag = "8.5.14" # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large confluence_dataset_size = "large"