From 5ef23623ac9a1c0da7ddff24bf5dfc0de604c837 Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Tue, 4 Jun 2024 12:44:04 +0200 Subject: [PATCH 1/3] Bump TF version --- app/util/k8s/README.MD | 20 +++++++++---------- ...s-performance-toolkit-user-guide-bamboo.md | 8 ++++---- ...erformance-toolkit-user-guide-bitbucket.md | 16 +++++++-------- ...rformance-toolkit-user-guide-confluence.md | 16 +++++++-------- ...ps-performance-toolkit-user-guide-crowd.md | 14 ++++++------- ...pps-performance-toolkit-user-guide-jira.md | 16 +++++++-------- ...apps-performance-toolkit-user-guide-jsm.md | 16 +++++++-------- 7 files changed, 53 insertions(+), 53 deletions(-) diff --git a/app/util/k8s/README.MD b/app/util/k8s/README.MD index 7bc0a80bc..1a8eb584a 100644 --- a/app/util/k8s/README.MD +++ b/app/util/k8s/README.MD @@ -30,7 +30,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` ### Terminate development environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -42,7 +42,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.7.9 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.1 ./uninstall.sh -c conf.tfvars ``` # Enterprise-scale environment @@ -59,7 +59,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` ### Terminate enterprise-scale environment Note: install and uninstall commands have to use the same `atlassianlabs/terraform:TAG` image tag. @@ -71,7 +71,7 @@ docker run --pull=always --env-file aws_envs \ -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.7.9 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.9.1 ./uninstall.sh -c conf.tfvars ``` # Collect detailed k8s logs @@ -91,7 +91,7 @@ export REGION=us-east-2 docker run --pull=always --env-file aws_envs \ -v "/$PWD/k8s_logs:/data-center-terraform/k8s_logs" \ -v "/$PWD/logs:/data-center-terraform/logs" \ --it atlassianlabs/terraform:2.7.9 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs +-it atlassianlabs/terraform:2.9.1 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs ``` # Force terminate cluster @@ -124,7 +124,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.7.9 bash + -it atlassianlabs/terraform:2.9.1 bash ``` 5. Connect to the product pod. Example below for jira pod with number 0. For other product or pod number change `PRODUCT_POD` accordingly. @@ -148,7 +148,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ - -it atlassianlabs/terraform:2.7.9 bash + -it atlassianlabs/terraform:2.9.1 bash ``` 5. Copy code base and connect to the execution environment pod: ``` bash @@ -176,7 +176,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus -e REGION=$REGION \ -e PRODUCT=$PRODUCT \ -v "/$PWD/script-runner.yml:/data-center-terraform/script-runner.yml" \ - -it atlassianlabs/terraform:2.7.9 bash + -it atlassianlabs/terraform:2.9.1 bash ``` 5. Run following commands one by one inside docker container: ``` bash @@ -204,7 +204,7 @@ To enable detailed CPU/Memory monitoring and Grafana dashboards for visualisatio docker run --pull=always --env-file aws_envs \ -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -e REGION=$REGION \ - -it atlassianlabs/terraform:2.7.9 bash + -it atlassianlabs/terraform:2.9.1 bash ``` ``` bash aws eks update-kubeconfig --name atlas-$ENVIRONMENT_NAME-cluster --region $REGION @@ -240,5 +240,5 @@ Note: this option is **not** suitable for full-scale performance runs as local n -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jira.yml ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 60d8c2a99..4faf70777 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -71,7 +71,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 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`. @@ -272,7 +272,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bamboo.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bamboo/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -303,7 +303,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} @@ -337,7 +337,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bamboo.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index c4f039044..c101428b4 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -84,7 +84,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -248,7 +248,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. @@ -323,7 +323,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/bitbucket/YY-MM-DD-hh-mm-ss` folder: @@ -354,7 +354,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -404,7 +404,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -429,7 +429,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -442,7 +442,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} @@ -471,7 +471,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index f42a5a000..b2aad065b 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -83,7 +83,7 @@ Below process describes how to install low-tier Confluence DC with "small" datas -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -328,7 +328,7 @@ Below process describes how to install enterprise-scale Confluence DC with "larg -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. @@ -403,7 +403,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh confluence.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/confluence/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -433,7 +433,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -494,7 +494,7 @@ To receive scalability benchmark results for one-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -519,7 +519,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -532,7 +532,7 @@ To receive scalability benchmark results for two-node Confluence DC **with** app -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} @@ -561,7 +561,7 @@ To receive scalability benchmark results for four-node Confluence DC with app-sp -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh confluence.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index ab303ebf5..ce1ac0b18 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -66,7 +66,7 @@ specifically for performance testing during the DC app review process. -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. @@ -177,7 +177,7 @@ To receive performance baseline results **without** an app installed and **witho -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh crowd.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/crowd/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -206,7 +206,7 @@ To receive performance results with an app installed (still use master branch): -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -265,7 +265,7 @@ To receive scalability benchmark results for one-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -289,7 +289,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 1. Edit **run parameters** for 2 nodes run. To do it, left uncommented only 2 nodes scenario parameters in `crowd.yml` file. ``` @@ -316,7 +316,7 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} @@ -359,7 +359,7 @@ To receive scalability benchmark results for four-node Crowd DC with app-specifi -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh crowd.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index 2b72f0403..6359e2eff 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -95,7 +95,7 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -356,7 +356,7 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -431,7 +431,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jira.yml ``` 1. View the results files of the run in the local `dc-app-performance-toolkit/app/results/jira/YY-MM-DD-hh-mm-ss` folder: - `results_summary.log`: detailed run summary @@ -483,7 +483,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -544,7 +544,7 @@ To receive scalability benchmark results for one-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -569,7 +569,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -582,7 +582,7 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jira.yml ``` {{% note %}} @@ -611,7 +611,7 @@ To receive scalability benchmark results for four-node Jira DC with app-specific -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jira.yml ``` {{% note %}} diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index cc9956b68..bf4fb015e 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -97,7 +97,7 @@ Below process describes how to install low-tier Jira Service Management DC with -v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -392,7 +392,7 @@ Below process describes how to install enterprise-scale Jira Service Management -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. @@ -472,7 +472,7 @@ To receive performance baseline results **without** an app installed: -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jsm.yml ``` 1. View the following main results of the run in the `dc-app-performance-toolkit/app/results/jsm/YY-MM-DD-hh-mm-ss` folder: @@ -527,7 +527,7 @@ Re-index information window is displayed on the **Indexing page**. If the window -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -587,7 +587,7 @@ To receive scalability benchmark results for one-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -612,7 +612,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \ -v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \ -v "/$PWD/logs:/data-center-terraform/logs" \ - -it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars ``` 1. Navigate to `dc-app-performance-toolkit` folder and start tests execution: ``` bash @@ -625,7 +625,7 @@ To receive scalability benchmark results for two-node Jira Service Management DC -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} @@ -654,7 +654,7 @@ To receive scalability benchmark results for four-node Jira Service Management D -e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \ -v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \ -v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \ - -it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jsm.yml ``` {{% note %}} From 12224b4500aaf08edc72a63d53c27d110f50fa5b Mon Sep 17 00:00:00 2001 From: OlehStefanyshyn Date: Mon, 3 Jun 2024 13:55:31 +0300 Subject: [PATCH 2/3] jmeter/bump-plugins-versions --- app/bamboo.yml | 6 +++--- app/bitbucket.yml | 6 +++--- app/confluence.yml | 6 +++--- app/crowd.yml | 6 +++--- app/jira.yml | 6 +++--- app/jsm.yml | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index 92bfdf083..abb20283a 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -107,15 +107,15 @@ modules: plugins: - bzm-parallel=0.4 - bzm-random-csv=0.6 - - jpgc-casutg=2.5 - - jpgc-dummy=0.2 + - jpgc-casutg=2.9 + - jpgc-dummy=0.4 - jpgc-ffw=2.0 - jpgc-fifo=0.2 - jpgc-functions=2.1 - jpgc-json=2.6 - jpgc-perfmon=2.1 - jpgc-prmctl=0.4 - - jpgc-tst=2.4 + - jpgc-tst=2.5 - jpgc-wsc=0.3 - tilln-sshmon=1.0 - jpgc-synthesis=2.2 diff --git a/app/bitbucket.yml b/app/bitbucket.yml index 6481ab32f..bcba05fc2 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -73,15 +73,15 @@ modules: plugins: - bzm-parallel=0.4 - bzm-random-csv=0.6 - - jpgc-casutg=2.5 - - jpgc-dummy=0.2 + - jpgc-casutg=2.9 + - jpgc-dummy=0.4 - jpgc-ffw=2.0 - jpgc-fifo=0.2 - jpgc-functions=2.1 - jpgc-json=2.6 - jpgc-perfmon=2.1 - jpgc-prmctl=0.4 - - jpgc-tst=2.4 + - jpgc-tst=2.5 - jpgc-wsc=0.3 - tilln-sshmon=1.0 - jpgc-synthesis=2.2 diff --git a/app/confluence.yml b/app/confluence.yml index 6269ffd6b..1176d331c 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -100,15 +100,15 @@ modules: plugins: - bzm-parallel=0.4 - bzm-random-csv=0.6 - - jpgc-casutg=2.5 - - jpgc-dummy=0.2 + - jpgc-casutg=2.9 + - jpgc-dummy=0.4 - jpgc-ffw=2.0 - jpgc-fifo=0.2 - jpgc-functions=2.1 - jpgc-json=2.6 - jpgc-perfmon=2.1 - jpgc-prmctl=0.4 - - jpgc-tst=2.4 + - jpgc-tst=2.5 - jpgc-wsc=0.3 - tilln-sshmon=1.0 - jpgc-synthesis=2.2 diff --git a/app/crowd.yml b/app/crowd.yml index 33c6de9d7..b56f0662d 100644 --- a/app/crowd.yml +++ b/app/crowd.yml @@ -76,15 +76,15 @@ modules: plugins: - bzm-parallel=0.4 - bzm-random-csv=0.6 - - jpgc-casutg=2.5 - - jpgc-dummy=0.2 + - jpgc-casutg=2.9 + - jpgc-dummy=0.4 - jpgc-ffw=2.0 - jpgc-fifo=0.2 - jpgc-functions=2.1 - jpgc-json=2.6 - jpgc-perfmon=2.1 - jpgc-prmctl=0.4 - - jpgc-tst=2.4 + - jpgc-tst=2.5 - jpgc-wsc=0.3 - tilln-sshmon=1.0 - jpgc-synthesis=2.2 diff --git a/app/jira.yml b/app/jira.yml index ab2795f75..b99998a3a 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -101,15 +101,15 @@ modules: plugins: - bzm-parallel=0.4 - bzm-random-csv=0.6 - - jpgc-casutg=2.5 - - jpgc-dummy=0.2 + - jpgc-casutg=2.9 + - jpgc-dummy=0.4 - jpgc-ffw=2.0 - jpgc-fifo=0.2 - jpgc-functions=2.1 - jpgc-json=2.6 - jpgc-perfmon=2.1 - jpgc-prmctl=0.4 - - jpgc-tst=2.4 + - jpgc-tst=2.5 - jpgc-wsc=0.3 - tilln-sshmon=1.0 - jpgc-synthesis=2.2 diff --git a/app/jsm.yml b/app/jsm.yml index 240935b91..c54c0e6b9 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -153,15 +153,15 @@ modules: plugins: - bzm-parallel=0.4 - bzm-random-csv=0.6 - - jpgc-casutg=2.5 - - jpgc-dummy=0.2 + - jpgc-casutg=2.9 + - jpgc-dummy=0.4 - jpgc-ffw=2.0 - jpgc-fifo=0.2 - jpgc-functions=2.1 - jpgc-json=2.6 - jpgc-perfmon=2.1 - jpgc-prmctl=0.4 - - jpgc-tst=2.4 + - jpgc-tst=2.5 - jpgc-wsc=0.3 - tilln-sshmon=1.0 - jpgc-synthesis=2.2 From f529a663ff4cba4264835ad224c8153a52178efd Mon Sep 17 00:00:00 2001 From: Oleksandr Metelytsia Date: Tue, 4 Jun 2024 18:07:38 +0200 Subject: [PATCH 3/3] DCAPT Release 8.2.2 --- app/bamboo.yml | 2 +- app/bitbucket.yml | 2 +- app/confluence.yml | 2 +- app/jira.yml | 2 +- app/jsm.yml | 2 +- app/util/conf.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/bamboo.yml b/app/bamboo.yml index abb20283a..d42bd3bfb 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -125,7 +125,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "125.0.6422.141" # Supports Chrome version 125. 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 bcba05fc2..a0b59e290 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -91,7 +91,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "125.0.6422.141" # Supports Chrome version 125. 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 1176d331c..7abf7c486 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "125.0.6422.141" # Supports Chrome version 125. 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 b99998a3a..3e90fd0b6 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -119,7 +119,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "125.0.6422.141" # Supports Chrome version 125. 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 c54c0e6b9..2439e7c1d 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -171,7 +171,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/util/conf.py b/app/util/conf.py index 0e862b5ba..bb1abb088 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 = '8.2.1' +TOOLKIT_VERSION = '8.2.2' UNSUPPORTED_VERSION = '7.5.0'