From a99561a871559dce84d69a573b4a8d6556b6d6d3 Mon Sep 17 00:00:00 2001 From: opopovss <86659792+opopovss@users.noreply.github.com> Date: Thu, 9 Feb 2023 15:48:47 +0200 Subject: [PATCH] Bump bitbucket version to 8.8.0 (new snapshot) and TF version to 2.3.1 (#986) --- app/util/k8s/dcapt-small.tfvars | 6 +++--- app/util/k8s/dcapt.tfvars | 10 +++++----- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 2 +- ...dc-apps-performance-toolkit-user-guide-bitbucket.md | 4 ++-- ...c-apps-performance-toolkit-user-guide-confluence.md | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 2fea6e693..d061f322e 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -161,7 +161,7 @@ bitbucket_version_tag = "7.21.7" # # 7.21.7 DCAPT small dataset EBS snapshot bitbucket_shared_home_snapshot_id = "snap-014e88755f53c2284" -# 8.0.5 DCAPT small dataset EBS snapshot +# 8.8.0 DCAPT small dataset EBS snapshot #bitbucket_shared_home_snapshot_id = "snap-04f8cce571e8ff53b" # 7.17.13 DCAPT small dataset EBS snapshot #bitbucket_shared_home_snapshot_id = "snap-0291604b41056ad4e" @@ -171,8 +171,8 @@ bitbucket_shared_home_snapshot_id = "snap-014e88755f53c2284" # # 7.21.7 DCAPT small dataset RDS snapshot bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-x" -# 8.0.5 DCAPT small dataset RDS snapshot -#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-0-x" +# 8.8.0 DCAPT small dataset RDS snapshot +#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-8-x" # 7.17.13 DCAPT small dataset RDS snapshot #bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-17-x" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index cdd69e981..588fc5b1f 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -162,7 +162,7 @@ bitbucket_version_tag = "7.21.7" # # 7.21.7 DCAPT large dataset EBS snapshot bitbucket_shared_home_snapshot_id = "snap-0f7780c62a76f5ea0" -# 8.0.5 DCAPT large dataset EBS snapshot +# 8.8.0 DCAPT large dataset EBS snapshot #bitbucket_shared_home_snapshot_id = "snap-053b73fd8765b8cd0" # 7.17.13 DCAPT large dataset EBS snapshot #bitbucket_shared_home_snapshot_id = "snap-068dc6b69b67ee535" @@ -172,8 +172,8 @@ bitbucket_shared_home_snapshot_id = "snap-0f7780c62a76f5ea0" # # 7.21.7 DCAPT large dataset RDS snapshot bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-21-x" -# 8.0.5 DCAPT large dataset RDS snapshot -#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-0-x" +# 8.8.0 DCAPT large dataset RDS snapshot +#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-8-x" # 7.17.13 DCAPT large dataset RDS snapshot #bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-17-x" @@ -294,8 +294,8 @@ bamboo_admin_email_address = "admin@example.com" # Bamboo instance resource configuration bamboo_cpu = "4" bamboo_mem = "16Gi" -bamboo_min_heap = "256m" -bamboo_max_heap = "512m" +bamboo_min_heap = "2048m" +bamboo_max_heap = "4096m" # Bamboo Agent instance resource configuration bamboo_agent_cpu = "200m" diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 2ef99cc39..ce68c15f2 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -43,7 +43,7 @@ specifically for performance testing during the DC app review process. {{% /warning %}} 4. Clone the project repo: ```bash - git clone -b 2.3.0 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform + git clone -b 2.3.1 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform ``` 5. Copy [`dcapt.tfvars`](https://raw.githubusercontent.com/atlassian/dc-app-performance-toolkit/master/app/util/k8s/dcapt.tfvars) file to the `data-center-terraform` folder. ``` bash diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 1e5acdbc1..93b82e9f1 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -92,7 +92,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase {{% /warning %}} 4. Clone the project repo: ```bash - git clone -b 2.3.0 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform + git clone -b 2.3.1 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform ``` 5. Copy [`dcapt-small.tfvars`](https://raw.githubusercontent.com/atlassian/dc-app-performance-toolkit/master/app/util/k8s/dcapt-small.tfvars) file to the `data-center-terraform` folder. ``` bash @@ -252,7 +252,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large {{% /warning %}} 4. Clone the project repo: ```bash - git clone -b 2.3.0 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform + git clone -b 2.3.1 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform ``` 5. Copy [`dcapt.tfvars`](https://raw.githubusercontent.com/atlassian/dc-app-performance-toolkit/master/app/util/k8s/dcapt.tfvars) file to the `data-center-terraform` folder. ``` bash diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index 67205f339..2d097be1c 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -92,7 +92,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas {{% /warning %}} 4. Clone the project repo: ```bash - git clone -b 2.3.0 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform + git clone -b 2.3.1 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform ``` 5. Copy [`dcapt-small.tfvars`](https://raw.githubusercontent.com/atlassian/dc-app-performance-toolkit/master/app/util/k8s/dcapt-small.tfvars) file to the `data-center-terraform` folder. ``` bash @@ -328,7 +328,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg {{% /warning %}} 4. Clone the project repo: ```bash - git clone -b 2.3.0 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform + git clone -b 2.3.1 https://github.com/atlassian-labs/data-center-terraform.git && cd data-center-terraform ``` 5. Copy [`dcapt.tfvars`](https://raw.githubusercontent.com/atlassian/dc-app-performance-toolkit/master/app/util/k8s/dcapt.tfvars) file to the `data-center-terraform` folder. ``` bash