From d5f1f2e6f98d9243c6409f8918a149703d39cb97 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Mon, 12 Aug 2024 15:15:47 +0300 Subject: [PATCH 1/3] added BB large 9.0.0 --- README.md | 2 +- app/util/k8s/dcapt-snapshots.json | 45 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 721d537ed..48d4d9a81 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.9` and `7.19.22` * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.4` and `8.9.14` + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.0.0` and `8.19.4` and `8.9.14` * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.0.0` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index a06e93549..22aa340bd 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -434,6 +434,51 @@ ] } ] + }, + { + "version": "9.0.0", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0ac664e91507f0e9d", + "us-east-1": "snap-0961da714ef84fa67" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-9-0-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-9-0-0" + } + ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0e91bbe8ae07948f4", + "us-east-1": "snap-079d4c5f2e28b0f09" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-4", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-4" + } + ] + } + ] } ] }, From 0f875886e8b6dd18d501ba7ae4d88dbeafc22e49 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Tue, 13 Aug 2024 11:45:36 +0300 Subject: [PATCH 2/3] add small bb 9-0-0 --- app/util/api/bitbucket_clients.py | 2 ++ app/util/k8s/dcapt-snapshots.json | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/util/api/bitbucket_clients.py b/app/util/api/bitbucket_clients.py index 859d23181..2d74173ff 100644 --- a/app/util/api/bitbucket_clients.py +++ b/app/util/api/bitbucket_clients.py @@ -151,11 +151,13 @@ def get_bitbucket_nodes_count(self): nodes_count = "Server" return nodes_count + @retry() def get_bitbucket_system_page(self): response = self.get(f"{self.host}/plugins/servlet/troubleshooting/view/system-info/view", error_msg="Could not get system page info") return response + @retry() def get_bitbucket_repo_count(self): repos_count = None page = self.get_bitbucket_system_page() diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 22aa340bd..f7b25a24e 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -463,8 +463,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-0e91bbe8ae07948f4", - "us-east-1": "snap-079d4c5f2e28b0f09" + "us-east-2": "snap-04268cd0703e449ae", + "us-east-1": "snap-0e7c7b549b51011ed" } ] }, @@ -473,8 +473,8 @@ "size": "small", "snapshots": [ { - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-19-4", - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-19-4" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-9-0-0", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-9-0-0" } ] } From ffcfceaee6117dc8d8ed3dc6eaa22e3d58950bfa Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Thu, 15 Aug 2024 13:13:33 +0300 Subject: [PATCH 3/3] fix comments --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 48d4d9a81..79ebd3607 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.9` and `7.19.22` * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.0.0` and `8.19.4` and `8.9.14` + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.4`, `8.9.14` and `9.0.0` Platform release * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.0.0`