From cab7f78565bdd574c63ae65a7395d8679cd56632 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 16 Aug 2023 15:06:34 +0200 Subject: [PATCH 01/64] Bump toolkit version 7.6.0 --- app/util/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/conf.py b/app/util/conf.py index db0c93623..446cd862b 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -2,7 +2,7 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML -TOOLKIT_VERSION = '7.5.0' +TOOLKIT_VERSION = '7.6.0' UNSUPPORTED_VERSION = '6.3.0' From 45ff5980eb33a67b2f66b29d511d2c3c1f3dd857 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:28:43 +0000 Subject: [PATCH 02/64] Update dependency com.atlassian.buildeng:bamboo-pbc-specs to v1.4.7 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 823c8fab9..a94769143 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -55,7 +55,7 @@ com.atlassian.buildeng bamboo-pbc-specs - 1.4.0 + 1.4.7 From fece94e244e53e9dc124e25f85c2ac4eb378c101 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:28:47 +0000 Subject: [PATCH 03/64] Update dependency com.atlassian.buildeng:bamboo-plan-ownership-specs to v1.4.7 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 823c8fab9..ad6668975 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -49,7 +49,7 @@ com.atlassian.buildeng bamboo-plan-ownership-specs - 1.4.0 + 1.4.7 From 382ae52acc032ba53da4ef0cb755e531171a3eb6 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Wed, 16 Aug 2023 18:31:41 +0300 Subject: [PATCH 04/64] Added Crowd EBS snapshots --- app/util/k8s/dcapt-snapshots.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 51e46840f..2f89b9e5a 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -514,10 +514,10 @@ "size": "large", "snapshots": [ { - "us-east-1": "", + "us-east-1": "snap-08c6dc6abc75fe2b4", "us-east-2": "snap-0a8e229690be9ae30", - "us-west-1": "", - "us-west-2": "" + "us-west-1": "snap-0206b022c6880fe67", + "us-west-2": "snap-07a9b523b316aeb32" } ] } @@ -526,5 +526,3 @@ ] } } - - From 5424ff5f2dfd999ca56761e04a926783c1085e10 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 17 Aug 2023 13:08:02 +0200 Subject: [PATCH 05/64] Pin chrome version in docker 115 --- Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6eb75064f..eb707541b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,14 +8,20 @@ FROM python:3.11-slim-bullseye ENV APT_INSTALL="apt-get -y install --no-install-recommends" +ARG CHROME_VERSION="115.0.5790.170-1" +#ARG CHROME_VERSION="latest" + +ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" +ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb" + RUN apt-get -y update \ && $APT_INSTALL vim git openssh-server wget openjdk-11-jdk \ && python -m pip install --upgrade pip \ && apt-get clean -RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ - && $APT_INSTALL ./google-chrome-stable_current_amd64.deb \ - && rm -rf ./google-chrome-stable_current_amd64.deb +RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_LATEST_URL; else wget -O google-chrome.deb $CHROME_VERSION_URL; fi \ + && $APT_INSTALL ./google-chrome.deb \ + && rm -rf ./google-chrome.deb COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt From 9c074e94afbefa30ee6296a42af873d0e1486d6c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 11:08:34 +0000 Subject: [PATCH 06/64] Update dependency com.fasterxml.jackson.core:jackson-core to v2.15.2 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 823c8fab9..99cac57cc 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -67,7 +67,7 @@ com.fasterxml.jackson.core jackson-core - 2.12.4 + 2.15.2 com.fasterxml.jackson.core From 9096f7e3c3210c89de51152e63265dbed3639af1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 11:08:38 +0000 Subject: [PATCH 07/64] Update dependency com.fasterxml.jackson.core:jackson-databind to v2.15.2 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 823c8fab9..6d7d2094c 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -72,7 +72,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.4.2 + 2.15.2 com.jayway.jsonpath From ad297be9e8fc139ac3681f32c2c01066234ef395 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 02:38:44 +0000 Subject: [PATCH 08/64] Update dependency boto3 to v1.28.29 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 798691b5d..a9e6e51db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,4 @@ filelock==3.12.2 packaging==23.1 prettytable==3.8.0 bzt==1.16.23 -boto3==1.28.11 +boto3==1.28.29 From d65a0a7d67143ccdff765e307bf07072af1f97bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 02:38:48 +0000 Subject: [PATCH 09/64] Update dependency scipy to v1.11.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 798691b5d..d045a9161 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ matplotlib==3.7.2 pandas==2.0.3 numpy==1.25.1 -scipy==1.11.1 +scipy==1.11.2 pytest==7.4.0 locust==2.15.1 selenium==4.10.0 From 518a5942f09f9ebfab05c4c7dc9722a7bb6b13da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 02:38:59 +0000 Subject: [PATCH 10/64] Update dependency com.jayway.jsonpath:json-path to v2.8.0 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 823c8fab9..3853a45a7 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -77,7 +77,7 @@ com.jayway.jsonpath json-path - 2.4.0 + 2.8.0 commons-codec From f4b96f3d006f8ac3453db82c518f38c6632e57cd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 10:01:01 +0000 Subject: [PATCH 11/64] Update dependency commons-codec:commons-codec to v1.16.0 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 3853a45a7..f60cc9486 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -82,7 +82,7 @@ commons-codec commons-codec - 1.10 + 1.16.0 From 35cbd7036dcf21b98d8d8ed84e414a71aaf41a72 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 10:01:26 +0000 Subject: [PATCH 12/64] Update dependency numpy to v1.25.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d045a9161..73f40bfeb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ matplotlib==3.7.2 pandas==2.0.3 -numpy==1.25.1 +numpy==1.25.2 scipy==1.11.2 pytest==7.4.0 locust==2.15.1 From d6f2ccdc4d4733d59069f8a66a7a67fae8fb1a43 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 10:01:31 +0000 Subject: [PATCH 13/64] Update dependency locust to v2.16.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d045a9161..346147995 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pandas==2.0.3 numpy==1.25.1 scipy==1.11.2 pytest==7.4.0 -locust==2.15.1 +locust==2.16.1 selenium==4.10.0 filelock==3.12.2 packaging==23.1 From 6cb30af28d548e64108fdfbf2aadabae4e602277 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:27:40 +0000 Subject: [PATCH 14/64] Update dependency org.apache.logging.log4j:log4j-api to v2.20.0 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 8ddbe183f..697ced5e5 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-api - 2.17.1 + 2.20.0 org.apache.logging.log4j From e0666c9ca8655f2023a4c711173755b66e87ae53 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:27:44 +0000 Subject: [PATCH 15/64] Update dependency org.apache.logging.log4j:log4j-core to v2.20.0 --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 8ddbe183f..8954fecda 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.20.0 org.apache.logging.log4j From 5102a69253f1004ef005770f03e9f5562b23b74b Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 12 Sep 2023 10:22:10 +0300 Subject: [PATCH 16/64] confluence/add-8-5-1-support --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 12 +++++------ app/util/k8s/dcapt-snapshots.json | 34 +++++++++++++++---------------- app/util/k8s/dcapt.tfvars | 12 +++++------ 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 2286db13e..be5eaeacb 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.4.8` and `4.20.24` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.11`, `7.13.18` and `8.1.4` platform release + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.11`, `7.13.18` and `8.5.1` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.14` and `8.9.2` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index c50270074..8e9166f1a 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -184,8 +184,8 @@ confluence_replica_count = 1 confluence_version_tag = "7.19.11" # Shared home restore configuration. -# 8.1.4 DCAPT small dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-0815ada397b953b93" +# 8.5.1 DCAPT small dataset EBS snapshot +# confluence_shared_home_snapshot_id = "snap-008cc496f440198de" # 7.19.11 DCAPT small dataset EBS snapshot confluence_shared_home_snapshot_id = "snap-00ede7dca448a6243" # 7.13.18 DCAPT small dataset EBS snapshot @@ -193,8 +193,8 @@ confluence_shared_home_snapshot_id = "snap-00ede7dca448a6243" # Database restore configuration. # Build number stored within the snapshot and Confluence license are also required, so that Confluence can be fully setup prior to start. -# 8.1.4 DCAPT small dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-1-4" +# 8.5.1 DCAPT small dataset RDS snapshot +# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-1" # 7.19.11 DCAPT small dataset RDS snapshot confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-11" # 7.13.18 DCAPT small dataset RDS snapshot @@ -202,8 +202,8 @@ confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-c # Build number for a specific Confluence version can be found in the link below: # https://developer.atlassian.com/server/confluence/confluence-build-information -# 8.1.4 -# confluence_db_snapshot_build_number = "9003" +# 8.5.1 +# confluence_db_snapshot_build_number = "9012" # 7.19.11 confluence_db_snapshot_build_number = "8804" # 7.13.18 diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 2f89b9e5a..3cb432bc9 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -328,17 +328,17 @@ ] }, { - "version": "8.1.4", + "version": "8.5.1", "data": [ { "type": "rds", "size": "large", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-1-4", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-1-4", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-8-1-4", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-8-1-4" + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-1", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-1", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-8-5-1", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-8-5-1" } ] }, @@ -347,10 +347,10 @@ "size": "small", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-1-4", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-1-4", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-8-1-4", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-8-1-4" + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-1", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-1", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-8-5-1", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-8-5-1" } ] }, @@ -359,10 +359,10 @@ "size": "large", "snapshots": [ { - "us-east-1": "snap-05ef2adcab5114c74", - "us-east-2": "snap-0125fdfcf37dabef5", - "us-west-1": "snap-03bc324c9a6de2295", - "us-west-2": "snap-0ec08b4c302b42b95" + "us-east-1": "snap-099a9ce9e9c902815", + "us-east-2": "snap-074a2fdca0497b6b6", + "us-west-1": "snap-01b07710d49b113b2", + "us-west-2": "snap-031dad82fa7367921" } ] }, @@ -371,10 +371,10 @@ "size": "small", "snapshots": [ { - "us-east-1": "snap-055cb419abdb154e3", - "us-east-2": "snap-0815ada397b953b93", - "us-west-1": "snap-08339c9a4eac5fbb1", - "us-west-2": "snap-07a38cca1ce0aa26b" + "us-east-1": "snap-09d97f19261bd463e", + "us-east-2": "snap-008cc496f440198de", + "us-west-1": "snap-02b3a229b530c8a87", + "us-west-2": "snap-01d8ebf9701613c4c" } ] } diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 4d59db180..7fc777c95 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -179,8 +179,8 @@ confluence_version_tag = "7.19.11" # Shared home restore configuration. # Make sure confluence version set in `confluence_version_tag` match the snapshot version. # -# 8.1.4 DCAPT large dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-0125fdfcf37dabef5" +# 8.5.1 DCAPT large dataset EBS snapshot +# confluence_shared_home_snapshot_id = "snap-074a2fdca0497b6b6" # 7.19.11 DCAPT large dataset EBS snapshot confluence_shared_home_snapshot_id = "snap-09365c581a158a979" # 7.13.18 DCAPT large dataset EBS snapshot @@ -190,8 +190,8 @@ confluence_shared_home_snapshot_id = "snap-09365c581a158a979" # Make sure confluence version set in `confluence_version_tag` match the snapshot version. # Build number stored within the snapshot and Confluence license are also required, so that Confluence can be fully setup prior to start. # -# 8.1.4 DCAPT large dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-1-4" +# 8.5.1 DCAPT large dataset RDS snapshot +# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-1" # 7.19.11 DCAPT large dataset RDS snapshot confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-11" # 7.13.18 DCAPT large dataset RDS snapshot @@ -199,8 +199,8 @@ confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-c # Build number for a specific Confluence version can be found in the link below: # https://developer.atlassian.com/server/confluence/confluence-build-information -# 8.1.4 -# confluence_db_snapshot_build_number = "9003" +# 8.5.1 +# confluence_db_snapshot_build_number = "9012" # 7.19.11 confluence_db_snapshot_build_number = "8804" # 7.13.18 From 38ea91f2be31a8da055f4839f816fc6c4964673d Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 14 Sep 2023 18:44:56 +0200 Subject: [PATCH 17/64] DCA-2090 chromedriver 117 --- Dockerfile | 3 +-- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- requirements.txt | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb707541b..a260b9810 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,7 @@ FROM python:3.11-slim-bullseye ENV APT_INSTALL="apt-get -y install --no-install-recommends" -ARG CHROME_VERSION="115.0.5790.170-1" -#ARG CHROME_VERSION="latest" +ARG CHROME_VERSION="latest" ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb" diff --git a/app/bamboo.yml b/app/bamboo.yml index ff6c8e26d..f5205b807 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ reporting: - data-source: sample-labels module: junit-xml diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 87bb74395..158c938c9 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -90,7 +90,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ reporting: - data-source: sample-labels module: junit-xml diff --git a/app/confluence.yml b/app/confluence.yml index dbc5fc68e..1b34ee9a7 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jira.yml b/app/jira.yml index 02f8b2ecc..d74234793 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jsm.yml b/app/jsm.yml index d6c7cb2d4..bd88d81b9 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -170,7 +170,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ reporting: - data-source: sample-labels module: junit-xml diff --git a/requirements.txt b/requirements.txt index 4e8ce78f7..46415bd44 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,5 @@ selenium==4.10.0 filelock==3.12.2 packaging==23.1 prettytable==3.8.0 -bzt==1.16.23 +bzt==1.16.25 boto3==1.28.29 From 4257f59ef3fcf6a972d64603dc9a393d69477c35 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 20 Sep 2023 12:36:27 +0200 Subject: [PATCH 18/64] Bump chromedriver version to 117.0.5938.88 --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index f5205b807..1ddb107d3 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ + version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 158c938c9..3ef31acd6 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -90,7 +90,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ + version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/confluence.yml b/app/confluence.yml index 1b34ee9a7..f44dcf096 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ + version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jira.yml b/app/jira.yml index d74234793..e34be00ce 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ + version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jsm.yml b/app/jsm.yml index bd88d81b9..3053e90c5 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -170,7 +170,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.62" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing/ + version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 14b0d7ba97a10a20caf1d77888674c0e2d54c9e8 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Wed, 20 Sep 2023 14:24:27 +0300 Subject: [PATCH 19/64] added build_number --- app/util/k8s/dcapt-snapshots.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 3cb432bc9..38bc5f475 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -223,6 +223,7 @@ "versions": [ { "version": "7.19.11", + "build_number": "8804", "data": [ { "type": "rds", @@ -276,6 +277,7 @@ }, { "version": "7.13.18", + "build_number": "8703", "data": [ { "type": "rds", @@ -329,6 +331,7 @@ }, { "version": "8.5.1", + "build_number": "9012", "data": [ { "type": "rds", @@ -496,6 +499,7 @@ "versions": [ { "version": "5.1.4", + "build_number": "1893", "data": [ { "type": "rds", From 0e04be9beb01f0af2f6f64e8c007809e6c16cc1f Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 20 Sep 2023 14:36:45 +0200 Subject: [PATCH 20/64] update requirements.txt --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- requirements.txt | 16 ++++++++-------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 1ddb107d3..b79b295d5 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -49,7 +49,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.12.0 execution: - scenario: jmeter executor: jmeter diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 3ef31acd6..670fd612a 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -36,7 +36,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.12.0 execution: - scenario: ${load_executor} concurrency: ${concurrency} diff --git a/app/confluence.yml b/app/confluence.yml index f44dcf096..79e02b0a8 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -51,7 +51,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.12.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jira.yml b/app/jira.yml index e34be00ce..7f28e2c46 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -51,7 +51,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.12.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jsm.yml b/app/jsm.yml index 3053e90c5..1aa7697d4 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -67,7 +67,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.12.0 execution: - scenario: ${load_executor}_agents executor: ${load_executor} diff --git a/requirements.txt b/requirements.txt index 46415bd44..48947fb07 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ -matplotlib==3.7.2 -pandas==2.0.3 -numpy==1.25.2 +matplotlib==3.8.0 +pandas==2.1.0 +numpy==1.26.0 scipy==1.11.2 -pytest==7.4.0 +pytest==7.4.2 locust==2.16.1 -selenium==4.10.0 -filelock==3.12.2 +selenium==4.12.0 +filelock==3.12.4 packaging==23.1 -prettytable==3.8.0 +prettytable==3.9.0 bzt==1.16.25 -boto3==1.28.29 +boto3==1.28.51 From a3a77dc6199dff030f40ade7d06478e2e195a0b7 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 20 Sep 2023 14:49:34 +0200 Subject: [PATCH 21/64] Update docs for 760 --- ...s-performance-toolkit-user-guide-bamboo.md | 2 +- ...erformance-toolkit-user-guide-bitbucket.md | 27 +------------------ ...rformance-toolkit-user-guide-confluence.md | 27 +------------------ ...ps-performance-toolkit-user-guide-crowd.md | 2 +- ...-performance-toolkit-user-guide-jira-cf.md | 7 ++++- ...pps-performance-toolkit-user-guide-jira.md | 2 +- ...s-performance-toolkit-user-guide-jsm-cf.md | 7 ++++- ...apps-performance-toolkit-user-guide-jsm.md | 2 +- 8 files changed, 18 insertions(+), 58 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 0842c9316..c62877a7a 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Bamboo diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 91fc257ea..6097a561b 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Bitbucket @@ -33,31 +33,6 @@ It'll also provide you with a lightweight and less expensive environment for dev Once you're ready to generate test results for the Marketplace Data Center Apps Approval process, run the toolkit in an **enterprise-scale environment**. ---- - -{{% note %}} -In case you are in the middle of Bitbucket DC app performance testing with the CloudFormation deployment option, -the process can be continued after switching to the `7.1.0` DCAPT version. -{{% /note %}} - -* Checkout release `7.1.0` of the `dc-app-performance-toolkit` repository: - - ``` - git checkout release-7.1.0 - ``` -* Use the docker container with the `7.1.0` release tag to run performance tests from docker: - - ``` - cd dc-app-performance-toolkit - docker pull atlassian/dcapt:7.1.0 - docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt:7.1.0 bitbucket.yml - ``` -* The corresponding version of the user guide could be found in the `dc-app-performance-toolkit/docs` folder or by this -[link](https://github.com/atlassian/dc-app-performance-toolkit/blob/release-7.1.0/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md). -* If specific version of the Bitbucket DC is required, please contact support in the [community Slack](http://bit.ly/dcapt_slack). - ---- - ### 1. Setting up Bitbucket Data Center development environment #### AWS cost estimation for the development environment diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index d5b37bce9..2d2d49cf6 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -33,31 +33,6 @@ It'll also provide you with a lightweight and less expensive environment for dev Once you're ready to generate test results for the Marketplace Data Center Apps Approval process, run the toolkit in an **enterprise-scale environment**. ---- - -{{% note %}} -In case you are in the middle of Confluence DC app performance testing with the CloudFormation deployment option, -the process can be continued after switching to the `6.3.0` DCAPT version. -{{% /note %}} - -* Checkout release `6.3.0` of the `dc-app-performance-toolkit` repository: - - ``` - git checkout release-6.3.0 - ``` -* Use the docker container with the `6.3.0` release tag to run performance tests from docker: - - ``` - cd dc-app-performance-toolkit - docker pull atlassian/dcapt:6.3.0 - docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt:6.3.0 confluence.yml - ``` -* The corresponding version of the user guide could be found in the `dc-app-performance-toolkit/docs` folder or by this -[link](https://github.com/atlassian/dc-app-performance-toolkit/blob/release-6.3.0/docs/dc-apps-performance-toolkit-user-guide-confluence.md). -* If specific version of the Confluence DC is required, please contact support in the [community Slack](http://bit.ly/dcapt_slack). - ---- - ### 1. Setting up Confluence Data Center development environment #### AWS cost estimation for the development environment diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 98c63c59b..25b61d41f 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Crowd diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md b/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md index b1b5547c7..55a28f4ac 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md @@ -4,10 +4,15 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Jira (CloudFormation deployment) +{{% warning %}} +CloudFormation deployment option will be no longer supported starting from January 2024. +It is recommended to use TerraForm deployment. More details could be found in [User Guide](https://developer.atlassian.com/platform/marketplace/dc-apps-performance-toolkit-user-guide-jira/). +{{% /warning %}} + This document walks you through the process of testing your app on Jira using the Data Center App Performance Toolkit. These instructions focus on producing the required [performance and scale benchmarks for your Data Center app](/platform/marketplace/dc-apps-performance-and-scale-testing/). {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index c851159f7..f4e4bfe19 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Jira diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md b/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md index 93310e73a..e1568b7da 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md @@ -4,10 +4,15 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Jira Service Management (CloudFormation deployment) +{{% warning %}} +CloudFormation deployment option will be no longer supported starting from January 2024. +It is recommended to use TerraForm deployment. More details could be found in [User Guide](https://developer.atlassian.com/platform/marketplace/dc-apps-performance-toolkit-user-guide-jsm/). +{{% /warning %}} + This document walks you through the process of testing your app on Jira Service Management using the Data Center App Performance Toolkit. These instructions focus on producing the required [performance and scale benchmarks for your Data Center app](/platform/marketplace/dc-apps-performance-and-scale-testing/): If your application relays or extends the functionality of **Insight** ([What is Insight?](https://confluence.atlassian.com/servicemanagementserver/what-is-insight-1044784313.html)): diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 5f6693251..1bc0f5853 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Jira Service Management From aa09ae3bb27ca7ba6df4f6f2ec45677545233637 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 20 Sep 2023 14:56:10 +0200 Subject: [PATCH 22/64] Remove mapping of local state .terraform folder --- docs/dc-apps-performance-toolkit-user-guide-bamboo.md | 1 - docs/dc-apps-performance-toolkit-user-guide-bitbucket.md | 3 --- docs/dc-apps-performance-toolkit-user-guide-confluence.md | 3 --- docs/dc-apps-performance-toolkit-user-guide-crowd.md | 2 -- docs/dc-apps-performance-toolkit-user-guide-jira.md | 3 --- docs/dc-apps-performance-toolkit-user-guide-jsm.md | 3 --- 6 files changed, 15 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index c62877a7a..98ae79ad0 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -70,7 +70,6 @@ specifically for performance testing during the DC app review process. ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 6097a561b..5ad5d2d83 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -82,7 +82,6 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase ``` bash docker run --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` @@ -244,7 +243,6 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large ``` bash docker run --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` @@ -441,7 +439,6 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index 2d2d49cf6..edbcc6fcd 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -81,7 +81,6 @@ Below process describes how to install low-tier Confluence DC with "small" datas ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` @@ -328,7 +327,6 @@ Below process describes how to install enterprise-scale Confluence DC with "larg ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` @@ -516,7 +514,6 @@ To receive scalability benchmark results for two-node Confluence DC **with** app ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 25b61d41f..51cf9af7b 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -68,7 +68,6 @@ specifically for performance testing during the DC app review process. ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` @@ -295,7 +294,6 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index f4e4bfe19..1a59a5c7e 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -92,7 +92,6 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` @@ -359,7 +358,6 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` @@ -571,7 +569,6 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 1bc0f5853..cae8e16e8 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -94,7 +94,6 @@ Below process describes how to install low-tier Jira Service Management DC with ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` @@ -391,7 +390,6 @@ Below process describes how to install enterprise-scale Jira Service Management ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` @@ -609,7 +607,6 @@ To receive scalability benchmark results for two-node Jira Service Management DC ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` From 44bdec3b99c388c66bed0ea35e129e6ea649e9d1 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 20 Sep 2023 15:52:37 +0200 Subject: [PATCH 23/64] pom.xml updates --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 34f2e1da7..abfb4de98 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 9.2.1 + 9.3.3 @@ -18,7 +18,7 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 + 3.1.0 @@ -49,13 +49,13 @@ com.atlassian.buildeng bamboo-plan-ownership-specs - 1.4.7 + 2.1.7 com.atlassian.buildeng bamboo-pbc-specs - 1.4.7 + 2.1.7 @@ -98,7 +98,7 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.1 + 2.20.0 From 2e43f66bc59e18d6156b03c4d136e22457beed25 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 20 Sep 2023 18:00:00 +0200 Subject: [PATCH 24/64] update pom after retesting --- app/util/bamboo/bamboo_dataset_generator/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index abfb4de98..b6af6e2af 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 9.3.3 + 9.2.3 @@ -77,7 +77,7 @@ com.jayway.jsonpath json-path - 2.8.0 + 2.7.0 commons-codec @@ -115,4 +115,4 @@ https://packages.atlassian.com/mvn/maven-external/ - + \ No newline at end of file From d14d58e33e5892f6bd324f52919d095eb7f3d268 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Fri, 22 Sep 2023 13:18:20 +0300 Subject: [PATCH 25/64] confluence/eol-conf-7-13 --- README.md | 2 +- app/util/confluence/populate_db.sh | 2 +- app/util/confluence/upload_attachments.sh | 2 +- app/util/k8s/dcapt-small.tfvars | 20 +++------ app/util/k8s/dcapt-snapshots.json | 54 ----------------------- app/util/k8s/dcapt.tfvars | 20 +++------ 6 files changed, 17 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index be5eaeacb..1e13e6b44 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.4.8` and `4.20.24` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.11`, `7.13.18` and `8.5.1` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.11` and `8.5.1` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.14` and `8.9.2` diff --git a/app/util/confluence/populate_db.sh b/app/util/confluence/populate_db.sh index 809a2555f..ebb678d77 100644 --- a/app/util/confluence/populate_db.sh +++ b/app/util/confluence/populate_db.sh @@ -20,7 +20,7 @@ CONFLUENCE_DB_PASS="Password1!" SELECT_CONFLUENCE_SETTING_SQL="select BANDANAVALUE from BANDANA where BANDANACONTEXT = '_GLOBAL' and BANDANAKEY = 'atlassian.confluence.settings';" # Confluence version variables -SUPPORTED_CONFLUENCE_VERSIONS=(7.13.7 7.19.2) +SUPPORTED_CONFLUENCE_VERSIONS=(7.19.2) if [[ ! $(systemctl status confluence) ]]; then echo "The Confluence service was not found on this host." \ diff --git a/app/util/confluence/upload_attachments.sh b/app/util/confluence/upload_attachments.sh index 3d45f0588..47fd0b199 100644 --- a/app/util/confluence/upload_attachments.sh +++ b/app/util/confluence/upload_attachments.sh @@ -4,7 +4,7 @@ ################### Variables section ################### # Confluence version variables CONFLUENCE_VERSION_FILE="/media/atl/confluence/shared-home/confluence.version" -SUPPORTED_CONFLUENCE_VERSIONS=(7.13.7 7.19.2) +SUPPORTED_CONFLUENCE_VERSIONS=(7.19.2) CONFLUENCE_VERSION=$(sudo su confluence -c "cat ${CONFLUENCE_VERSION_FILE}") if [[ -z "$CONFLUENCE_VERSION" ]]; then echo The $CONFLUENCE_VERSION_FILE file does not exists or emtpy. Please check if CONFLUENCE_VERSION_FILE variable \ diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 8e9166f1a..09f3597f6 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -181,33 +181,27 @@ confluence_license = "confluence-license" confluence_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "7.19.11" +confluence_version_tag = "8.5.1" # Shared home restore configuration. # 8.5.1 DCAPT small dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-008cc496f440198de" +confluence_shared_home_snapshot_id = "snap-008cc496f440198de" # 7.19.11 DCAPT small dataset EBS snapshot -confluence_shared_home_snapshot_id = "snap-00ede7dca448a6243" -# 7.13.18 DCAPT small dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-055811dae848f13ae" +# confluence_shared_home_snapshot_id = "snap-00ede7dca448a6243" # Database restore configuration. # Build number stored within the snapshot and Confluence license are also required, so that Confluence can be fully setup prior to start. # 8.5.1 DCAPT small dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-1" +confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-1" # 7.19.11 DCAPT small dataset RDS snapshot -confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-11" -# 7.13.18 DCAPT small dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-13-18" +# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-11" # Build number for a specific Confluence version can be found in the link below: # https://developer.atlassian.com/server/confluence/confluence-build-information # 8.5.1 -# confluence_db_snapshot_build_number = "9012" +confluence_db_snapshot_build_number = "9012" # 7.19.11 -confluence_db_snapshot_build_number = "8804" -# 7.13.18 -# confluence_db_snapshot_build_number = "8703" +# confluence_db_snapshot_build_number = "8804" # Helm chart version of Confluence #confluence_helm_chart_version = "" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 38bc5f475..84d500870 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -275,60 +275,6 @@ } ] }, - { - "version": "7.13.18", - "build_number": "8703", - "data": [ - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-13-18", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-13-18", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-7-13-18", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-7-13-18" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-7-13-18", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-13-18", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-7-13-18", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-7-13-18" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-1": "snap-08156f8bb0099942f", - "us-east-2": "snap-04cc3d8455b1ef6e9", - "us-west-1": "snap-039e3a985cf126fc0", - "us-west-2": "snap-0ce8a0947cd581752" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-1": "snap-01df9653b5c8f9f64", - "us-east-2": "snap-055811dae848f13ae", - "us-west-1": "snap-058e37561a1cce3e9", - "us-west-2": "snap-0bb261f0b3266d136" - } - ] - } - ] - }, { "version": "8.5.1", "build_number": "9012", diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 7fc777c95..6dcadf87a 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -174,37 +174,31 @@ confluence_license = "confluence-license" confluence_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "7.19.11" +confluence_version_tag = "8.5.1" # Shared home restore configuration. # Make sure confluence version set in `confluence_version_tag` match the snapshot version. # # 8.5.1 DCAPT large dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-074a2fdca0497b6b6" +confluence_shared_home_snapshot_id = "snap-074a2fdca0497b6b6" # 7.19.11 DCAPT large dataset EBS snapshot -confluence_shared_home_snapshot_id = "snap-09365c581a158a979" -# 7.13.18 DCAPT large dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-04cc3d8455b1ef6e9" +# confluence_shared_home_snapshot_id = "snap-09365c581a158a979" # Database restore configuration. # Make sure confluence version set in `confluence_version_tag` match the snapshot version. # Build number stored within the snapshot and Confluence license are also required, so that Confluence can be fully setup prior to start. # # 8.5.1 DCAPT large dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-1" +confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-1" # 7.19.11 DCAPT large dataset RDS snapshot -confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-11" -# 7.13.18 DCAPT large dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-13-18" +# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-11" # Build number for a specific Confluence version can be found in the link below: # https://developer.atlassian.com/server/confluence/confluence-build-information # 8.5.1 -# confluence_db_snapshot_build_number = "9012" +confluence_db_snapshot_build_number = "9012" # 7.19.11 -confluence_db_snapshot_build_number = "8804" -# 7.13.18 -# confluence_db_snapshot_build_number = "8703" +# confluence_db_snapshot_build_number = "8804" # Helm chart version of Confluence # confluence_helm_chart_version = "" From 72ca2e37a0ff5db5adeca20d0fe8693c78d1ece0 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Tue, 26 Sep 2023 10:05:47 +0300 Subject: [PATCH 26/64] bamboo/bump-to-9-2-5 --- README.md | 2 +- app/util/bamboo/bamboo_dataset_generator/pom.xml | 2 +- app/util/k8s/dcapt.tfvars | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index be5eaeacb..73fc35a41 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `5.1.4` * Supported Bamboo versions: - * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.3` + * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.5` ## Support In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index b6af6e2af..766cd6679 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 9.2.3 + 9.2.5 diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 7fc777c95..4eacfa0b7 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -473,8 +473,8 @@ bamboo_license = "bamboo-license" # By default, latest supported by DCAPT version is set. # https://hub.docker.com/r/atlassian/bamboo/tags # https://hub.docker.com/r/atlassian/bamboo-agent-base/tags -bamboo_version_tag = "9.2.3" -bamboo_agent_version_tag = "9.2.3" +bamboo_version_tag = "9.2.5" +bamboo_agent_version_tag = "9.2.5" # Helm chart version of Bamboo and Bamboo agent instances # bamboo_helm_chart_version = "" From 201c1f94d651120af88d70a09e134ea1db18d131 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Tue, 26 Sep 2023 12:51:20 +0200 Subject: [PATCH 27/64] bump chromedriver up to 117.0.5938.92 --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index b79b295d5..5904d540d 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 670fd612a..0afa21ec4 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -90,7 +90,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/confluence.yml b/app/confluence.yml index 79e02b0a8..59b1e1c65 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jira.yml b/app/jira.yml index 7f28e2c46..aa5b6f35d 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jsm.yml b/app/jsm.yml index 1aa7697d4..daddbd057 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -170,7 +170,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.88" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c424fa11c6b63cd01ee44a45c779e3941d958c73 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 28 Sep 2023 00:44:05 +0200 Subject: [PATCH 28/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 32 ++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 84d500870..b169a4d3c 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -328,6 +328,36 @@ ] } ] + }, + { + "version": "7.19.14", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-00f5e8147604a017e", + "us-west-2": "snap-0e8cda8b822c13483", + "us-west-1": "snap-00ec3df2af108617f", + "us-east-1": "snap-02132c2d6b67b6a87" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-14", + "us-west-2": "dcapt-confluence-7-19-14", + "us-west-1": "dcapt-confluence-7-19-14", + "us-east-1": "dcapt-confluence-7-19-14" + } + ] + } + ], + "build_number": "8804" } ] }, @@ -475,4 +505,4 @@ } ] } -} +} \ No newline at end of file From 774f3ee68ba74d0e220a5ec3eab0693938bfe665 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Thu, 28 Sep 2023 11:02:43 +0300 Subject: [PATCH 29/64] fixed rds snapshot types --- app/util/k8s/dcapt-snapshots.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index b169a4d3c..6d9dc532c 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -350,9 +350,9 @@ "snapshots": [ { "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-14", - "us-west-2": "dcapt-confluence-7-19-14", - "us-west-1": "dcapt-confluence-7-19-14", - "us-east-1": "dcapt-confluence-7-19-14" + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-7-19-14", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-7-19-14", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-19-14" } ] } From 91910ea885960e935a92ff7e39c4bb31ad7eb668 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Thu, 28 Sep 2023 15:43:19 +0200 Subject: [PATCH 30/64] update dependencies --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 48947fb07..5cf936ecc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ matplotlib==3.8.0 -pandas==2.1.0 +pandas==2.1.1 numpy==1.26.0 -scipy==1.11.2 +scipy==1.11.3 pytest==7.4.2 locust==2.16.1 selenium==4.12.0 filelock==3.12.4 packaging==23.1 prettytable==3.9.0 -bzt==1.16.25 -boto3==1.28.51 +bzt==1.16.26 +boto3==1.28.56 From 0f971f811c69185e07d798ef9bd741b51463f98a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Thu, 28 Sep 2023 22:56:23 +0200 Subject: [PATCH 31/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 6d9dc532c..ef9c0b6e6 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -355,6 +355,30 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-19-14" } ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0a175c4fd76039985", + "us-west-2": "snap-09b197387bd1b013f", + "us-west-1": "snap-0f50de55b7ebc1a2f", + "us-east-1": "snap-002beb3b098f557f2" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-14", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-7-19-14", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-7-19-14", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-7-19-14" + } + ] } ], "build_number": "8804" From 03c91fbe017ccf3330631e5bd6b1a63c31cfeaeb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 3 Oct 2023 15:36:47 +0200 Subject: [PATCH 32/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef9c0b6e6..3eeb0cb04 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -492,6 +492,35 @@ ] } ] + }, + { + "version": "7.21.16", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-04351bd6779e3ee76", + "us-west-2": "snap-0bebe8f1c94590199", + "us-west-1": "snap-0ce49affbc7cc1b07", + "us-east-1": "snap-06eb9677c8467e578" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-16", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-16", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-small-7-21-16", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-7-21-16" + } + ] + } + ] } ] }, From dd97107ef2afce9557449cb6e3c515cc7fd8b8c6 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Tue, 3 Oct 2023 15:42:46 +0200 Subject: [PATCH 33/64] DCA-2104 add checkout command into docs --- ...s-performance-toolkit-user-guide-bamboo.md | 15 +++++---- ...erformance-toolkit-user-guide-bitbucket.md | 28 ++++++++-------- ...rformance-toolkit-user-guide-confluence.md | 28 ++++++++-------- ...ps-performance-toolkit-user-guide-crowd.md | 13 ++++---- ...pps-performance-toolkit-user-guide-jira.md | 32 ++++++++++--------- ...apps-performance-toolkit-user-guide-jsm.md | 30 +++++++++-------- 6 files changed, 78 insertions(+), 68 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 98ae79ad0..3ef7f1a7c 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-09-20" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Bamboo @@ -51,11 +51,12 @@ specifically for performance testing during the DC app review process. {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-bamboo` - `products` - `bamboo` - `bamboo_license` - one-liner of valid bamboo license without spaces and new line symbols @@ -66,15 +67,15 @@ specifically for performance testing during the DC app review process. Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. From local terminal (Git bash terminal for Windows) start the installation (~40min): +6. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -6. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. -7. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. +7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. +8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 5ad5d2d83..e68aeabd8 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-09-20" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Bitbucket @@ -59,11 +59,12 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt-small.tfvars` file: +5. Set **required** variables in `dcapt-small.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-bitbucket-small` - `products` - `bitbucket` - `bitbucket_license` - one-liner of valid bitbucket license without spaces and new line symbols @@ -75,17 +76,17 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `bitbucket_version_tag` - Bitbucket version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Bitbucket version specified in **bitbucket_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -226,27 +227,28 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-bitbucket-large` - `products` - `bitbucket` - `bitbucket_license` - one-liner of valid bitbucket license without spaces and new line symbols - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** - `instance_types` - `["m5.4xlarge"]` -5. Optional variables to override: +6. Optional variables to override: - `bitbucket_version_tag` - Bitbucket version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Bitbucket version specified in **bitbucket_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~40min): +7. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. {{% note %}} New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index edbcc6fcd..52e86610e 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-09-20" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -59,11 +59,12 @@ Below process describes how to install low-tier Confluence DC with "small" datas {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt-small.tfvars` file: +5. Set **required** variables in `dcapt-small.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-confluence-small` - `products` - `confluence` - `confluence_license` - one-liner of valid confluence license without spaces and new line symbols @@ -74,17 +75,17 @@ Below process describes how to install low-tier Confluence DC with "small" datas Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `confluence_version_tag` - Confluence version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Confluence version specified in **confluence_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -305,11 +306,12 @@ Below process describes how to install enterprise-scale Confluence DC with "larg {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-confluence-large` - `products` - `confluence` - `confluence_license` - one-liner of valid confluence license without spaces and new line symbols @@ -320,17 +322,17 @@ Below process describes how to install enterprise-scale Confluence DC with "larg Use this server id for generation `BX02-9YO1-IN86-LO5G`. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `confluence_version_tag` - Confluence version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Confluence version specified in **confluence_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~40min): +7. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 51cf9af7b..0f13b4f80 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-09-20" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Crowd @@ -48,11 +48,12 @@ specifically for performance testing during the DC app review process. {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-crowd` - `products` - `crowd` - `crowd_license` - one-liner of valid crowd license without spaces and new line symbols @@ -64,14 +65,14 @@ specifically for performance testing during the DC app review process. Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. From local terminal (Git bash terminal for Windows) start the installation (~40min): +6. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -6. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. +7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. --- diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 1a59a5c7e..7bfdf33b6 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-09-20" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Jira @@ -41,7 +41,7 @@ run the toolkit in an **enterprise-scale environment**. --- {{% note %}} -DCAPT has fully transitioned to Terraform deployment. If you still wish to use CloudFormation deployment, refer to the [Jira Data Center app testing [CloudFormation]](/platform/marketplace/dc-apps-performance-toolkit-user-guide-jira-cf/) +DCAPT has fully transitioned to Terraform deployment. CloudFormation deployment option will be no longer supported starting from January 2024. {{% /note %}} ### 1. Setting up Jira Data Center development environment @@ -70,11 +70,12 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt-small.tfvars` file: +5. Set **required** variables in `dcapt-small.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-jira-small` - `products` - `jira` - `jira_license` - one-liner of valid jira license without spaces and new line symbols @@ -85,22 +86,22 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `jira_version_tag` - Jira version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Jira version specified in **jira_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Re-index (only for Jira 8.x, for Jira 9.x skip this step): +8. Re-index (only for Jira 8.x, for Jira 9.x skip this step): - Go to **![cog icon](/platform/marketplace/images/cog.png) > System > Indexing**. - Select the **Full re-index** option. - Click **Re-Index** and wait until re-indexing is completed (~2s). -8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +9. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -336,11 +337,12 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-jira` - `products` - `jira` - `jira_license` - one-liner of valid jira license without spaces and new line symbols @@ -351,17 +353,17 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `jira_version_tag` - Jira version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Jira version specified in **jira_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -9. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index cae8e16e8..c3561a77e 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-09-20" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Jira Service Management @@ -42,7 +42,7 @@ run the toolkit in an **enterprise-scale environment**. --- {{% note %}} -DCAPT has fully transitioned to Terraform deployment. If you still wish to use CloudFormation deployment, refer to the [Jira Service Management Data Center app testing [CloudFormation]](/platform/marketplace/dc-apps-performance-toolkit-user-guide-jsm-cf/) +DCAPT has fully transitioned to Terraform deployment. CloudFormation deployment option will be no longer supported starting from January 2024. {{% /note %}} ### 1. Setting up Jira Service Management Data Center development environment @@ -71,11 +71,12 @@ Below process describes how to install low-tier Jira Service Management DC with {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-apps-peformance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-apps-peformance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt-small.tfvars` file: +5. Set **required** variables in `dcapt-small.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-jsm-small`. - `products` - `jira` - `jira_image_repository` - `atlassian/jira-servicemanagement` - make sure to select the **Jira Service Management** application. @@ -87,17 +88,17 @@ Below process describes how to install low-tier Jira Service Management DC with Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `jira_version_tag` - Jira Service Management version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Jira Service Management version specified in **jira_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -367,11 +368,12 @@ Below process describes how to install enterprise-scale Jira Service Management {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-perfrormance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-perfrormance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-jsm-large`. - `products` - `jira` - `jira_image_repository` - `atlassian/jira-servicemanagement` - make sure to select the **Jira Service Management** application. @@ -383,17 +385,17 @@ Below process describes how to install enterprise-scale Jira Service Management Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `jira_version_tag` - Jira Service Management version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Jira Service Management version specified in **jira_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~40min): +7. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. From 3827ab8de190f7bd80cf27ce11f57d839ab09472 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:12:52 +0200 Subject: [PATCH 34/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef9c0b6e6..545101c59 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -492,6 +492,35 @@ ] } ] + }, + { + "version": "7.21.16", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0d4bbe0cf3056c0ee", + "us-west-2": "snap-011517fb12a96d7f6", + "us-west-1": "snap-0a7ef1f68ad32c5a0", + "us-east-1": "snap-0f86be2be1f2f4ddf" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-21-16", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-7-21-16", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-7-21-16", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-7-21-16" + } + ] + } + ] } ] }, From e2c6858be9ae3c0def228a0232c055e16cffd0a5 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Tue, 3 Oct 2023 19:44:05 +0200 Subject: [PATCH 35/64] improve steps order --- docs/dc-apps-performance-toolkit-user-guide-jira.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 7bfdf33b6..446c05a71 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -96,13 +96,13 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -8. Re-index (only for Jira 8.x, for Jira 9.x skip this step): - - Go to **![cog icon](/platform/marketplace/images/cog.png) > System > Indexing**. - - Select the **Full re-index** option. - - Click **Re-Index** and wait until re-indexing is completed (~2s). -9. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +9. Re-index (only for Jira 8.x, for Jira 9.x skip this step): + - Go to **![cog icon](/platform/marketplace/images/cog.png) > System > Indexing**. + - Select the **Full re-index** option. + - Click **Re-Index** and wait until re-indexing is completed (~2s). {{% note %}} All the datasets use the standard `admin`/`admin` credentials. {{% /note %}} From bf2960a7016af03497085cbdf4623edf7ccd3638 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:30:30 +0200 Subject: [PATCH 36/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef9c0b6e6..0bd46f408 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -216,6 +216,35 @@ ] } ] + }, + { + "version": "4.20.26", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-096d1185a5fee02ea", + "us-west-2": "snap-0e8f9a8451a8a5471", + "us-west-1": "snap-0ef9883afd1b1c4c8", + "us-east-1": "snap-0b53ebf533e7497fc" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-4-20-26", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-small-4-20-26", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-small-4-20-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-4-20-26" + } + ] + } + ] } ] }, From e2da6476201585bfd87ed56d05be124e9d7b6e09 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:33:04 +0200 Subject: [PATCH 37/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef9c0b6e6..caa5cf3d6 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -106,6 +106,35 @@ ] } ] + }, + { + "version": "8.20.26", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0592bc60820536611", + "us-west-2": "snap-09c303e2256c39750", + "us-west-1": "snap-009f8618111b0df8a", + "us-east-1": "snap-0e54d81f7913b7519" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-8-20-26", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-small-8-20-26", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-small-8-20-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-8-20-26" + } + ] + } + ] } ] }, From d85c922abc55b13bfcdf83a3ddd63ecfd9697a8e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:34:04 +0200 Subject: [PATCH 38/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef9c0b6e6..e4e6b3b14 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -216,6 +216,35 @@ ] } ] + }, + { + "version": "4.20.26", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0f7aa03eea37f3304", + "us-west-2": "snap-0db2080204c6af65b", + "us-west-1": "snap-0e59b22bdf8afc48a", + "us-east-1": "snap-0039e3761f9a41435" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-4-20-26", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-4-20-26", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-4-20-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-4-20-26" + } + ] + } + ] } ] }, From 9d36f4ab8ff8a9625b1612e5471dc23be4fb72af Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:36:16 +0200 Subject: [PATCH 39/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef9c0b6e6..32c6f7b5f 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -106,6 +106,35 @@ ] } ] + }, + { + "version": "8.20.26", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0c0c388d53cd4153b", + "us-west-2": "snap-04c97a366b279c0c8", + "us-west-1": "snap-0c4828c55fb868c85", + "us-east-1": "snap-0ed5739736a819039" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-8-20-26", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-8-20-26", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-8-20-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-8-20-26" + } + ] + } + ] } ] }, From e647a77ffd0a0383375193d991f73babeb2376c7 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:40:03 +0200 Subject: [PATCH 40/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef9c0b6e6..34e902487 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -492,6 +492,35 @@ ] } ] + }, + { + "version": "8.9.5", + "data": [ + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-01806166c1afe8bd5", + "us-west-2": "snap-0b274a971cccb6a27", + "us-west-1": "snap-07a647d51a0b5028f", + "us-east-1": "snap-035b01bc7520af6fb" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-5", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-5", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-small-8-9-5", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-9-5" + } + ] + } + ] } ] }, From cabaed1f14d5a9395c2dc4e85ff47ddcb229dde6 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 4 Oct 2023 12:18:47 +0200 Subject: [PATCH 41/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ef9c0b6e6..155033316 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -492,6 +492,35 @@ ] } ] + }, + { + "version": "8.9.5", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0261a9130a9fd7618", + "us-west-2": "snap-0562a2bce19b8da31", + "us-west-1": "snap-0af7263fa69303a6c", + "us-east-1": "snap-0acd7f844242a09ee" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-9-5", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-8-9-5", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-8-9-5", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-9-5" + } + ] + } + ] } ] }, From 9fa2a42a3b10d0369a69f487be73de1d8fa167cd Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Wed, 4 Oct 2023 12:34:56 +0200 Subject: [PATCH 42/64] Update Bitbucket versions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e570548e..240c432d9 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): `7.19.11` and `8.5.1` * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.14` and `8.9.2` + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.16` and `8.9.5` * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `5.1.4` From 805916c8cd2af969997f7f35cddb85df9414ef5a Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:42:26 +0200 Subject: [PATCH 43/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 5904d540d..86f4de45c 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From e02efbb1f5837b56b38ce00beb02f3a39234e138 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:42:27 +0200 Subject: [PATCH 44/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 59b1e1c65..38af9800b 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1e980c486b569c3781333280a0fae640813c384e Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:42:27 +0200 Subject: [PATCH 45/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 0afa21ec4..fb16f5cf1 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -90,7 +90,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From fca9429ca0749cd91727ef7d1fe78caa1d3c7ab2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:42:28 +0200 Subject: [PATCH 46/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index aa5b6f35d..b456f2ecf 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 1bd052c37a579f2df24e6680389ec476586166d3 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:42:28 +0200 Subject: [PATCH 47/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index daddbd057..e57c252f2 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -170,7 +170,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.92" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From bb79ed9f4d9b639b23eb495a6c3709a155d3010f Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Fri, 6 Oct 2023 15:05:16 +0300 Subject: [PATCH 48/64] Update selenium to 4.13.0 --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 5904d540d..54275fc33 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -49,7 +49,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.12.0 + - selenium==4.13.0 execution: - scenario: jmeter executor: jmeter diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 0afa21ec4..e54ee4a0f 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -36,7 +36,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.12.0 + - selenium==4.13.0 execution: - scenario: ${load_executor} concurrency: ${concurrency} diff --git a/app/confluence.yml b/app/confluence.yml index 59b1e1c65..ee099aaaa 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -51,7 +51,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.12.0 + - selenium==4.13.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jira.yml b/app/jira.yml index aa5b6f35d..7e2bf1be7 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -51,7 +51,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.12.0 + - selenium==4.13.0 execution: - scenario: ${load_executor} executor: ${load_executor} diff --git a/app/jsm.yml b/app/jsm.yml index daddbd057..564b47781 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -67,7 +67,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.12.0 + - selenium==4.13.0 execution: - scenario: ${load_executor}_agents executor: ${load_executor} From 13ea7962797e467dc76e385cbb8f129b0f64f3f8 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Fri, 6 Oct 2023 16:58:54 +0300 Subject: [PATCH 49/64] Update dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 2fee4ec19..a8abda750 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -258,6 +258,10 @@ "us-west-2": "snap-0db2080204c6af65b", "us-west-1": "snap-0e59b22bdf8afc48a", "us-east-1": "snap-0039e3761f9a41435" + } + ] + }, + { "size": "small", "snapshots": [ { @@ -277,6 +281,10 @@ "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-4-20-26", "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-4-20-26", "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-4-20-26" + } + ] + }, + { "size": "small", "snapshots": [ { @@ -707,4 +715,4 @@ } ] } -} \ No newline at end of file +} From ec1c3b46b8b50c497ed21bee6fad3355e06b133b Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Fri, 6 Oct 2023 17:21:56 +0300 Subject: [PATCH 50/64] jira/jsm/bump-versions-7-6-0 --- README.md | 4 +-- app/util/jira/populate_db.sh | 4 +-- app/util/jira/upload_attachments.sh | 4 +-- app/util/k8s/dcapt-small.tfvars | 32 +++++++++---------- app/util/k8s/dcapt.tfvars | 32 +++++++++---------- ...-performance-toolkit-user-guide-jira-cf.md | 16 +++++----- ...s-performance-toolkit-user-guide-jsm-cf.md | 16 +++++----- 7 files changed, 54 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index 240c432d9..84f5f08d4 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat ## Supported versions * Supported Jira versions: - * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.4.8` and `8.20.24` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.4.10` and `8.20.26` * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.4.8` and `4.20.24` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.4.10` and `4.20.26` * Supported Confluence versions: * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.11` and `8.5.1` diff --git a/app/util/jira/populate_db.sh b/app/util/jira/populate_db.sh index 1ee377dc5..e61ef3716 100644 --- a/app/util/jira/populate_db.sh +++ b/app/util/jira/populate_db.sh @@ -43,8 +43,8 @@ JIRA_DB_PASS="Password1!" # Jira/JSM supported versions -SUPPORTED_JIRA_VERSIONS=(8.20.24 9.4.8) -SUPPORTED_JSM_VERSIONS=(4.20.24 5.4.8) +SUPPORTED_JIRA_VERSIONS=(8.20.26 9.4.10) +SUPPORTED_JSM_VERSIONS=(4.20.26 5.4.10) SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") # JSM section diff --git a/app/util/jira/upload_attachments.sh b/app/util/jira/upload_attachments.sh index 695289770..6bf03ce87 100644 --- a/app/util/jira/upload_attachments.sh +++ b/app/util/jira/upload_attachments.sh @@ -29,8 +29,8 @@ JIRA_VERSION_FILE="/media/atl/jira/shared/jira-software.version" # Jira/JSM supported versions -SUPPORTED_JIRA_VERSIONS=(8.20.24 9.4.8) -SUPPORTED_JSM_VERSIONS=(4.20.24 5.4.8) +SUPPORTED_JIRA_VERSIONS=(8.20.26 9.4.10) +SUPPORTED_JSM_VERSIONS=(4.20.26 5.4.10) SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") if [[ ${jsm} == 1 ]]; then diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 09f3597f6..33e731725 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -85,34 +85,34 @@ jira_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # # Jira version -jira_version_tag = "9.4.8" +jira_version_tag = "9.4.10" # JSM version -# jira_version_tag = "5.4.8" +# jira_version_tag = "5.4.10" # Shared home restore configuration. # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # -# Jira 9.4.8 DCAPT small dataset EBS snapshot +# Jira 9.4.10 DCAPT small dataset EBS snapshot jira_shared_home_snapshot_id = "snap-0005a8c3cc297b294" -# Jira 8.20.24 DCAPT small dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0c3cb60ddc50c1136" -# JSM 5.4.8 DCAPT small dataset EBS snapshot +# Jira 8.20.26 DCAPT small dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-0592bc60820536611" +# JSM 5.4.10 DCAPT small dataset EBS snapshot # jira_shared_home_snapshot_id = "snap-02f299ef7f1f524b2" -# JSM 4.20.24 DCAPT small dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0971e128b8d1d2af9" +# JSM 4.20.26 DCAPT small dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-096d1185a5fee02ea" # Database restore configuration. # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # Build number stored within the snapshot and Jira license are also required, so that Jira can be fully setup prior to start. # -# Jira 9.4.8 DCAPT small dataset RDS snapshot - jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-8" -# Jira 8.20.24 DCAPT small dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-8-20-24" -# JSM 5.4.8 DCAPT small dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-8" -# JSM 4.20.24 DCAPT small dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-4-20-24" +# Jira 9.4.10 DCAPT small dataset RDS snapshot + jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-10" +# Jira 8.20.26 DCAPT small dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-8-20-26" +# JSM 5.4.10 DCAPT small dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-10" +# JSM 4.20.26 DCAPT small dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-4-20-26" # Helm chart version of Jira # jira_helm_chart_version = "" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 23dc88cf4..e8d7ca802 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -84,34 +84,34 @@ jira_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # # Jira version -jira_version_tag = "9.4.8" +jira_version_tag = "9.4.10" # JSM version -# jira_version_tag = "5.4.8" +# jira_version_tag = "5.4.10" # Shared home restore configuration. # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # -# Jira 9.4.8 DCAPT large dataset EBS snapshot +# Jira 9.4.10 DCAPT large dataset EBS snapshot jira_shared_home_snapshot_id = "snap-0d619095feaa2eca5" -# Jira 8.20.24 DCAPT large dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0b5f4473954e6d959" -# JSM 5.4.8 DCAPT large dataset EBS snapshot +# Jira 8.20.26 DCAPT large dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-0c0c388d53cd4153b" +# JSM 5.4.10 DCAPT large dataset EBS snapshot # jira_shared_home_snapshot_id = "snap-0fb58e8d005edeb32" -# JSM 4.20.24 DCAPT large dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0cae5febc8127250b" +# JSM 4.20.26 DCAPT large dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-0f7aa03eea37f3304" # Database restore configuration. # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # Build number stored within the snapshot and Jira license are also required, so that Jira can be fully setup prior to start. # -# Jira 9.4.8 DCAPT large dataset RDS snapshot -jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-8" -# Jira 8.20.24 DCAPT large dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-8-20-24" -# JSM 5.4.8 DCAPT large dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-8" -# JSM 4.20.24 DCAPT large dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-4-20-24" +# Jira 9.4.10 DCAPT large dataset RDS snapshot +jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-10" +# Jira 8.20.26 DCAPT large dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-8-20-26" +# JSM 5.4.10 DCAPT large dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-10" +# JSM 4.20.26 DCAPT large dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-4-20-26" # Helm chart version of Jira # jira_helm_chart_version = "" diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md b/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md index 55a28f4ac..698c5750f 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md @@ -73,10 +73,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended value | -| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | Software | -| Version | The Data Center App Performance Toolkit officially supports `8.20.24`, `9.4.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended value | +| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | Software | +| Version | The Data Center App Performance Toolkit officially supports `8.20.26`, `9.4.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** @@ -394,10 +394,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended Value | -| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | Software | -| Version | The Data Center App Performance Toolkit officially supports `8.20.24`, `9.4.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended Value | +| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | Software | +| Version | The Data Center App Performance Toolkit officially supports `8.20.26`, `9.4.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md b/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md index e1568b7da..f04322a03 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md @@ -73,10 +73,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended value | -| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | ServiceManagement | -| Version | The Data Center App Performance Toolkit officially supports `4.20.24`, `5.4.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended value | +| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | ServiceManagement | +| Version | The Data Center App Performance Toolkit officially supports `4.20.26`, `5.4.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** @@ -555,10 +555,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended Value | -| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | ServiceManagement | -| Version | The Data Center App Performance Toolkit officially supports `4.20.24`, `5.4.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended Value | +| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | ServiceManagement | +| Version | The Data Center App Performance Toolkit officially supports `4.20.26`, `5.4.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** From 8cd590c2bd3144d7608dce041a44b83128a89c1d Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Sat, 7 Oct 2023 21:38:38 +0300 Subject: [PATCH 51/64] remove 7.19.11 support --- README.md | 2 +- app/util/k8s/dcapt-small.tfvars | 10 +++--- app/util/k8s/dcapt-snapshots.json | 54 ------------------------------- app/util/k8s/dcapt.tfvars | 10 +++--- 4 files changed, 11 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index 240c432d9..ea6d49357 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.4.8` and `4.20.24` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.11` and `8.5.1` + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.14` and `8.5.1` * Supported Bitbucket Server versions: * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.16` and `8.9.5` diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 09f3597f6..5941debe1 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -186,21 +186,21 @@ confluence_version_tag = "8.5.1" # Shared home restore configuration. # 8.5.1 DCAPT small dataset EBS snapshot confluence_shared_home_snapshot_id = "snap-008cc496f440198de" -# 7.19.11 DCAPT small dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-00ede7dca448a6243" +# 7.19.14 DCAPT small dataset EBS snapshot +# confluence_shared_home_snapshot_id = "snap-0a175c4fd76039985" # Database restore configuration. # Build number stored within the snapshot and Confluence license are also required, so that Confluence can be fully setup prior to start. # 8.5.1 DCAPT small dataset RDS snapshot confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-1" -# 7.19.11 DCAPT small dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-11" +# 7.19.14 DCAPT small dataset RDS snapshot +# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-14" # Build number for a specific Confluence version can be found in the link below: # https://developer.atlassian.com/server/confluence/confluence-build-information # 8.5.1 confluence_db_snapshot_build_number = "9012" -# 7.19.11 +# 7.19.14 # confluence_db_snapshot_build_number = "8804" # Helm chart version of Confluence diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f604e4538..8eaf0f5c0 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -327,60 +327,6 @@ }, "confluence": { "versions": [ - { - "version": "7.19.11", - "build_number": "8804", - "data": [ - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-19-11", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-11", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-7-19-11", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-7-19-11" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-7-19-11", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-11", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-7-19-11", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-7-19-11" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-1": "snap-03b3a8541b7466ec3", - "us-east-2": "snap-09365c581a158a979", - "us-west-1": "snap-01bc9fdb49bc6641e", - "us-west-2": "snap-061919924738ea4c3" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-1": "snap-0dad75f94da7f317b", - "us-east-2": "snap-00ede7dca448a6243", - "us-west-1": "snap-0f72ad2146e3a19c3", - "us-west-2": "snap-09ff2c4be549518a0" - } - ] - } - ] - }, { "version": "8.5.1", "build_number": "9012", diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 23dc88cf4..98514ae62 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -181,8 +181,8 @@ confluence_version_tag = "8.5.1" # # 8.5.1 DCAPT large dataset EBS snapshot confluence_shared_home_snapshot_id = "snap-074a2fdca0497b6b6" -# 7.19.11 DCAPT large dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-09365c581a158a979" +# 7.19.14 DCAPT large dataset EBS snapshot +# confluence_shared_home_snapshot_id = "snap-00f5e8147604a017e" # Database restore configuration. # Make sure confluence version set in `confluence_version_tag` match the snapshot version. @@ -190,14 +190,14 @@ confluence_shared_home_snapshot_id = "snap-074a2fdca0497b6b6" # # 8.5.1 DCAPT large dataset RDS snapshot confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-1" -# 7.19.11 DCAPT large dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-11" +# 7.19.14 DCAPT large dataset RDS snapshot +# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-14" # Build number for a specific Confluence version can be found in the link below: # https://developer.atlassian.com/server/confluence/confluence-build-information # 8.5.1 confluence_db_snapshot_build_number = "9012" -# 7.19.11 +# 7.19.14 # confluence_db_snapshot_build_number = "8804" # Helm chart version of Confluence From a013a22ce02995d1c5cabd7c31292018cd3bda7f Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Mon, 9 Oct 2023 01:44:41 +0200 Subject: [PATCH 52/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/util/k8s/dcapt-snapshots.json --- app/util/k8s/dcapt-snapshots.json | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index f604e4538..04b73d656 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -159,6 +159,35 @@ ] } ] + }, + { + "version": "9.4.10", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-084e99e384dcfbe31", + "us-west-2": "snap-08202454ed728b840", + "us-west-1": "snap-05ec9d6216ead357c", + "us-east-1": "snap-00b18b7028faaefb5" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-10", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-9-4-10", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-9-4-10", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-4-10" + } + ] + } + ] } ] }, @@ -741,4 +770,4 @@ } ] } -} +} \ No newline at end of file From 570f3218362d7b2a2e62c2057d943a73b9aa990f Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 9 Oct 2023 03:25:32 +0300 Subject: [PATCH 53/64] conflicts --- app/util/k8s/dcapt-snapshots.json | 77 +++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 04b73d656..6983a1dd2 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -175,6 +175,18 @@ } ] }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-019fd367ec397b1f3", + "us-west-2": "snap-04b680cf28fd7a8c2", + "us-west-1": "snap-00d008f66bb5e7f35", + "us-east-1": "snap-0d9855f9597b68de9" + } + ] + }, { "type": "rds", "size": "large", @@ -186,6 +198,18 @@ "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-4-10" } ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-10", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-small-9-4-10", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-small-9-4-10", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-4-10" + } + ] } ] } @@ -351,6 +375,59 @@ ] } ] + }, + { + "version": "5.4.10", + "data": [ + { + "type": "ebs", + "size": "large", + "snapshots": [ + { + "us-east-2": "snap-0381cc00e37231565", + "us-west-2": "snap-0b1fd6df7f4edf2cb", + "us-west-1": "snap-0d50a4c16236384a8", + "us-east-1": "snap-08622b061a708cca0" + } + ] + }, + { + "type": "ebs", + "size": "small", + "snapshots": [ + { + "us-east-2": "snap-0e340e980918e45f6", + "us-west-2": "snap-0f717ad41f9234b17", + "us-west-1": "snap-0040e1af99841ae15", + "us-east-1": "snap-0052087e82b1cfe82" + } + ] + }, + { + "type": "rds", + "size": "large", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-10", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-5-4-10", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-5-4-10", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-4-10" + } + ] + }, + { + "type": "rds", + "size": "small", + "snapshots": [ + { + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-10", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-small-5-4-10", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-small-5-4-10", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-4-10" + } + ] + } + ] } ] }, From 4ce8692f1c7ad5444a620d5ce63e07234dbd405a Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 9 Oct 2023 03:26:50 +0300 Subject: [PATCH 54/64] empty line --- app/util/k8s/dcapt-snapshots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 6983a1dd2..96d26b26f 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -847,4 +847,4 @@ } ] } -} \ No newline at end of file +} From 1afa59ef2e753efc20f5f7ea92478643c3c4b6e9 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 9 Oct 2023 03:38:11 +0300 Subject: [PATCH 55/64] add missed snapshots --- app/util/k8s/dcapt-small.tfvars | 4 ++-- app/util/k8s/dcapt.tfvars | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 33e731725..9f98de32d 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -93,11 +93,11 @@ jira_version_tag = "9.4.10" # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # # Jira 9.4.10 DCAPT small dataset EBS snapshot - jira_shared_home_snapshot_id = "snap-0005a8c3cc297b294" + jira_shared_home_snapshot_id = "snap-019fd367ec397b1f3" # Jira 8.20.26 DCAPT small dataset EBS snapshot # jira_shared_home_snapshot_id = "snap-0592bc60820536611" # JSM 5.4.10 DCAPT small dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-02f299ef7f1f524b2" +# jira_shared_home_snapshot_id = "snap-0e340e980918e45f6" # JSM 4.20.26 DCAPT small dataset EBS snapshot # jira_shared_home_snapshot_id = "snap-096d1185a5fee02ea" diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index e8d7ca802..a903881c3 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -92,11 +92,11 @@ jira_version_tag = "9.4.10" # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # # Jira 9.4.10 DCAPT large dataset EBS snapshot -jira_shared_home_snapshot_id = "snap-0d619095feaa2eca5" +jira_shared_home_snapshot_id = "snap-084e99e384dcfbe31" # Jira 8.20.26 DCAPT large dataset EBS snapshot # jira_shared_home_snapshot_id = "snap-0c0c388d53cd4153b" # JSM 5.4.10 DCAPT large dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0fb58e8d005edeb32" +# jira_shared_home_snapshot_id = "snap-0381cc00e37231565" # JSM 4.20.26 DCAPT large dataset EBS snapshot # jira_shared_home_snapshot_id = "snap-0f7aa03eea37f3304" From 4fd6d80dc23b43a549c75f3d6bf811e9102d631e Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Mon, 9 Oct 2023 15:06:41 +0300 Subject: [PATCH 56/64] update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5cf936ecc..137b2d299 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ numpy==1.26.0 scipy==1.11.3 pytest==7.4.2 locust==2.16.1 -selenium==4.12.0 +selenium==4.13.0 filelock==3.12.4 packaging==23.1 prettytable==3.9.0 From ffb51a28c88b8561536d760ffde2a97a946906e2 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Mon, 9 Oct 2023 14:59:04 +0200 Subject: [PATCH 57/64] Cleanup for 760 release --- app/util/k8s/dcapt-small.tfvars | 18 +- app/util/k8s/dcapt-snapshots.json | 318 ------------------------------ app/util/k8s/dcapt.tfvars | 18 +- 3 files changed, 18 insertions(+), 336 deletions(-) diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index 148034748..aa4069387 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -277,23 +277,23 @@ bitbucket_license = "bitbucket-license" bitbucket_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "7.21.14" +bitbucket_version_tag = "7.21.16" # Shared home restore configuration. # Make sure Bitbucket version set in `bitbucket_version_tag` match the snapshot version. # -# 7.21.14 DCAPT small dataset EBS snapshot -bitbucket_shared_home_snapshot_id = "snap-03893c494ba7edcf4" -# 8.9.2 DCAPT small dataset EBS snapshot -#bitbucket_shared_home_snapshot_id = "snap-0fb8cd6bf387057c0" +# 7.21.16 DCAPT small dataset EBS snapshot +bitbucket_shared_home_snapshot_id = "snap-04351bd6779e3ee76" +# 8.9.5 DCAPT small dataset EBS snapshot +#bitbucket_shared_home_snapshot_id = "snap-01806166c1afe8bd5" # Database restore configuration. # Make sure Bitbucket version set in `bitbucket_version_tag` match the snapshot version. # -# 7.21.14 DCAPT small dataset RDS snapshot -bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-14" -# 8.9.2 DCAPT small dataset RDS snapshot -#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-2" +# 7.21.16 DCAPT small dataset RDS snapshot +bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-16" +# 8.9.5 DCAPT small dataset RDS snapshot +#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-5" # Helm chart version of Bitbucket #bitbucket_helm_chart_version = "" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index ce0ebaed6..3c3bec259 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -1,112 +1,6 @@ { "jira": { "versions": [ - { - "version": "9.4.8", - "data": [ - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-4-8", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-8", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-9-4-8", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-9-4-8" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-4-8", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-8", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-small-9-4-8", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-small-9-4-8" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-1": "snap-0640210f62a262aaf", - "us-east-2": "snap-0d619095feaa2eca5", - "us-west-1": "snap-00f6a0fc8ba4c4cce", - "us-west-2": "snap-0d23a05be5f527030" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-1": "snap-05a61b57dbb4f9834", - "us-east-2": "snap-0005a8c3cc297b294", - "us-west-1": "snap-0dfb346bb01f4709a", - "us-west-2": "snap-0c17be9ae98bbd1ed" - } - ] - } - ] - }, - { - "version": "8.20.24", - "data": [ - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-8-20-24", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-8-20-24", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-8-20-24", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-8-20-24" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-8-20-24", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-8-20-24", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-small-8-20-24", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-small-8-20-24" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-1": "snap-029edbed07ab594e0", - "us-east-2": "snap-0b5f4473954e6d959", - "us-west-1": "snap-0ffaa992ba449a53d", - "us-west-2": "snap-01e69efc1d8943038" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-1": "snap-083d2d8f5797f907e", - "us-east-2": "snap-0c3cb60ddc50c1136", - "us-west-1": "snap-07de609e058d28a03", - "us-west-2": "snap-01fa045458071eda5" - } - ] - } - ] - }, { "version": "8.20.26", "data": [ @@ -217,112 +111,6 @@ }, "jsm": { "versions": [ - { - "version": "5.4.8", - "data": [ - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-4-8", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-8", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-5-4-8", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-5-4-8" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-4-8", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-8", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-small-5-4-8", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-small-5-4-8" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-1": "snap-0a13271b63872a2a6", - "us-east-2": "snap-0fb58e8d005edeb32", - "us-west-1": "snap-05d6aa53717fb3c6c", - "us-west-2": "snap-043842d9319f25659" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-1": "snap-08bc969471d0ee11f", - "us-east-2": "snap-02f299ef7f1f524b2", - "us-west-1": "snap-0fa5b8bd27f66e6c3", - "us-west-2": "snap-063211f90e6d81bbd" - } - ] - } - ] - }, - { - "version": "4.20.24", - "data": [ - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-4-20-24", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-4-20-24", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-4-20-24", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-4-20-24" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-4-20-24", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-4-20-24", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-small-4-20-24", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-small-4-20-24" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-1": "snap-0c95405b316f28ec8", - "us-east-2": "snap-0cae5febc8127250b", - "us-west-1": "snap-081f548dda005c97e", - "us-west-2": "snap-08e23754ddc402ec4" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-1": "snap-0d933d20b989beb7b", - "us-east-2": "snap-0971e128b8d1d2af9", - "us-west-1": "snap-0c6d8b6aa53b93e78", - "us-west-2": "snap-0734518fb7d55f7ce" - } - ] - } - ] - }, { "version": "4.20.26", "data": [ @@ -545,59 +333,6 @@ }, "bitbucket": { "versions": [ - { - "version": "7.21.14", - "data": [ - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-7-21-14", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-21-14", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-7-21-14", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-7-21-14" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-7-21-14", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-14", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-small-7-21-14", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-14" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-1": "snap-01873c2840b4dd3c3", - "us-east-2": "snap-0ccb8c3d34ff171f1", - "us-west-1": "snap-0cde4bd0ed0358d0e", - "us-west-2": "snap-0f8b60b668f3bbb66" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-1": "snap-0a869d88cb2829bc4", - "us-east-2": "snap-03893c494ba7edcf4", - "us-west-1": "snap-020733b644be01f62", - "us-west-2": "snap-07e784e26a282e18c" - } - ] - } - ] - }, { "version": "7.21.16", "data": [ @@ -651,59 +386,6 @@ } ] }, - { - "version": "8.9.2", - "data": [ - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-9-2", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-9-2", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-8-9-2", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-8-9-2" - } - ] - }, - { - "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-9-2", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-2", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-small-8-9-2", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-2" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-1": "snap-0c5d82e754dd8f536", - "us-east-2": "snap-0d933f3d40000e877", - "us-west-1": "snap-039620171723e6e2c", - "us-west-2": "snap-01a121265b13ee758" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-1": "snap-039acd2608c3bce3f", - "us-east-2": "snap-0fb8cd6bf387057c0", - "us-west-1": "snap-012dc94feaaa30490", - "us-west-2": "snap-0a0f1b03ec0e8bf36" - } - ] - } - ] - }, { "version": "8.9.5", "data": [ diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 5bb691bc6..6ffe95ad0 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -272,23 +272,23 @@ bitbucket_license = "bitbucket-license" bitbucket_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "7.21.14" +bitbucket_version_tag = "7.21.16" # Shared home restore configuration. # Make sure Bitbucket version set in `bitbucket_version_tag` match the snapshot version. # -# 7.21.14 DCAPT large dataset EBS snapshot -bitbucket_shared_home_snapshot_id = "snap-0ccb8c3d34ff171f1" -# 8.9.2 DCAPT large dataset EBS snapshot -#bitbucket_shared_home_snapshot_id = "snap-0d933f3d40000e877" +# 7.21.16 DCAPT large dataset EBS snapshot +bitbucket_shared_home_snapshot_id = "snap-0d4bbe0cf3056c0ee" +# 8.9.5 DCAPT large dataset EBS snapshot +#bitbucket_shared_home_snapshot_id = "snap-0261a9130a9fd7618" # Database restore configuration. # Make sure Bitbucket version set in `bitbucket_version_tag` match the snapshot version. # -# 7.21.14 DCAPT large dataset RDS snapshot -bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-21-14" -# 8.9.2 DCAPT large dataset RDS snapshot -#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-9-2" +# 7.21.16 DCAPT large dataset RDS snapshot +bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-21-16" +# 8.9.5 DCAPT large dataset RDS snapshot +#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-9-5" # Helm chart version of Bitbucket #bitbucket_helm_chart_version = "" From 96289c482120ec5b7ba263af56e29d89fb3c73a4 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Oct 2023 07:01:00 +0200 Subject: [PATCH 58/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bamboo.yml --- app/bamboo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 47ea64dcc..251343ba9 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 3ea701e4e313976174427551dce6a2ebe4e16512 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Oct 2023 07:01:00 +0200 Subject: [PATCH 59/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/confluence.yml --- app/confluence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/confluence.yml b/app/confluence.yml index 3f4f5a6e0..ab2f7f73b 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 8a5ed9656decc10b5fe7642b1c4b535974f738cb Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Oct 2023 07:01:01 +0200 Subject: [PATCH 60/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/bitbucket.yml --- app/bitbucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 1a51f016a..6d530420a 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -90,7 +90,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From b08dff7fa489d99883b3a1ba175342d1ed9a00f2 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Oct 2023 07:01:01 +0200 Subject: [PATCH 61/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jira.yml --- app/jira.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jira.yml b/app/jira.yml index 41dcfdcf5..263184401 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From 223e4d2a9f41df6b8c808db7f34d5198643a49a5 Mon Sep 17 00:00:00 2001 From: bot-dcapt <56587558+bot-dcapt@users.noreply.github.com> Date: Wed, 11 Oct 2023 07:01:02 +0200 Subject: [PATCH 62/64] Python commit, changes to the /dcapt/dc-app-performance-toolkit/app/jsm.yml --- app/jsm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jsm.yml b/app/jsm.yml index e262bf89e..0a99988d3 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -170,7 +170,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "117.0.5938.149" # Supports Chrome version 117. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml From c1a4a585207be20722539cf4ca53730b76578a02 Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Wed, 11 Oct 2023 15:05:00 +0300 Subject: [PATCH 63/64] popup_7 locators --- app/selenium_ui/jsm/pages/agent_pages.py | 2 +- app/selenium_ui/jsm/pages/agent_selectors.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index 0110d8b93..5e1c8b277 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -11,7 +11,7 @@ class PopupManager(BasePage): def dismiss_default_popup(self): return self.dismiss_popup(PopupLocators.default_popup, PopupLocators.popup_1, PopupLocators.popup_2, PopupLocators.popup_3, PopupLocators.popup_4, - PopupLocators.popup_5, PopupLocators.popup_6) + PopupLocators.popup_5, PopupLocators.popup_6, PopupLocators.popup_7) class Login(BasePage): diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index 9cf05ed6a..b0729f6c2 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -10,6 +10,7 @@ class PopupLocators: popup_4 = '.aui-button aui-button-link' popup_5 = '.buttons-container > div > a' popup_6 = '.css-19r5em7' + popup_7 = '.css-178ag6o' class UrlManager: From 62d5258afef910b44c5cabeb4edcd256767fb774 Mon Sep 17 00:00:00 2001 From: Serhii Moroz Date: Wed, 11 Oct 2023 17:52:00 +0300 Subject: [PATCH 64/64] Release 7.6.0 --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/crowd.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 251343ba9..332753761 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.5 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. # Action percentage for JMeter load executor view_all_builds: 15 view_build_result: 15 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 6d530420a..e30bef4c3 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.5 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. services: - module: shellexec prepare: diff --git a/app/confluence.yml b/app/confluence.yml index ab2f7f73b..afbe3a62c 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.5 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. # Action percentage for JMeter and Locust load executors extended_metrics: False view_page: 33 diff --git a/app/crowd.yml b/app/crowd.yml index 056f02626..4493a48de 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -32,7 +32,7 @@ settings: JMETER_VERSION: 5.5 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. services: - module: shellexec prepare: diff --git a/app/jira.yml b/app/jira.yml index 263184401..287614a96 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -20,7 +20,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.5 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. # Action percentage for Jmeter and Locust load executors create_issue: 4 search_jql: 11 diff --git a/app/jsm.yml b/app/jsm.yml index 0a99988d3..9a586636d 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -23,7 +23,7 @@ settings: WEBDRIVER_VISIBLE: False JMETER_VERSION: 5.5 LANGUAGE: en_US.utf8 - allow_analytics: No # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. + allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README. # Action percentage for Jmeter and Locust load executors agent_browse_projects: 10 agent_view_request: 24