diff --git a/README.md b/README.md index 745341aac..e0db39337 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.2.3` * Supported Bamboo versions: - * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.11` + * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.6.1` ## 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/bamboo.yml b/app/bamboo.yml index 3293bd8cb..92bfdf083 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -125,7 +125,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "124.0.6367.60" # Supports Chrome version 124. 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 1536c0c4b..6481ab32f 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -91,7 +91,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "124.0.6367.60" # Supports Chrome version 124. 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 865e6b4af..6269ffd6b 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "124.0.6367.60" # Supports Chrome version 124. 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 fda376321..ab2795f75 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -119,7 +119,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "124.0.6367.60" # Supports Chrome version 124. 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 8a65cec22..240935b91 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -171,7 +171,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "122.0.6261.128" # Supports Chrome version 122. You can refer to https://googlechromelabs.github.io/chrome-for-testing + version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/selenium_ui/bamboo/pages/selectors.py b/app/selenium_ui/bamboo/pages/selectors.py index 8902a724e..ab548bd5f 100644 --- a/app/selenium_ui/bamboo/pages/selectors.py +++ b/app/selenium_ui/bamboo/pages/selectors.py @@ -52,7 +52,7 @@ class AllBuildsLocators: class PlanConfigurationLocators: - edit_config_button = (By.XPATH, "//span[contains(text(),'Configure plan')]") + edit_config_button = (By.XPATH, "//span[@title='Configure plan']") config_plan_page = (By.ID, "config-sidebar") config_plan_page_content = (By.ID, "content") diff --git a/app/util/api/bamboo_clients.py b/app/util/api/bamboo_clients.py index 6311df673..4bea2cfd2 100644 --- a/app/util/api/bamboo_clients.py +++ b/app/util/api/bamboo_clients.py @@ -159,14 +159,18 @@ def get_server_info(self): return r.json() def get_available_processors(self): - processors = None - page = self.get(f'{self.host}/admin/systemInfo.action', 'Could not get Page content') - tree = html.fromstring(page.content) try: - processors = tree.xpath('//*[@id="systemInfo_availableProcessors"]/text()')[0] - except Exception as error: - print(f"Warning: Could not parse number of Bamboo available processors: {error}") - return processors + processors = None + page = self.get(f'{self.host}/admin/systemInfo.action', 'Could not get Page content') + tree = html.fromstring(page.content) + try: + processors = tree.xpath('//*[@id="systemInfo_availableProcessors"]/text()')[0] + except Exception as e: + print(f"Warning: Could not parse number of Bamboo available processors: {e}") + return processors + except Exception as e: + print(f"Warning: Could not get Available Processors information. Error: {e}") + return 'N/A' def get_nodes_count(self): r = self.get(f'{self.host}/rest/api/latest/server/nodes', error_msg="Could not get Bamboo nodes count") diff --git a/app/util/api/bitbucket_clients.py b/app/util/api/bitbucket_clients.py index 94e1a640b..1e182578e 100644 --- a/app/util/api/bitbucket_clients.py +++ b/app/util/api/bitbucket_clients.py @@ -173,14 +173,18 @@ def get_bitbucket_repo_count(self): return repos_count def get_available_processors(self): - processors = None - page = self.get_bitbucket_system_page() - tree = html.fromstring(page.content) try: - processors = tree.xpath('//*[@id="content-stp.properties.os-0"]/div[4]/span/text()')[0] - except Exception as error: - print(f"Warning: Could not parse number of Bitbucket available processors: {error}") - return processors + processors = None + page = self.get_bitbucket_system_page() + tree = html.fromstring(page.content) + try: + processors = tree.xpath('//*[@id="content-stp.properties.os-0"]/div[4]/span/text()')[0] + except Exception as error: + print(f"Warning: Could not parse number of Bitbucket available processors: {error}") + return processors + except Exception as e: + print(f"Warning: Could not get Available Processors information. Error: {e}") + return 'N/A' def get_locale(self): language = None diff --git a/app/util/api/jsm_clients.py b/app/util/api/jsm_clients.py index 873089ed8..a33b5d8f1 100644 --- a/app/util/api/jsm_clients.py +++ b/app/util/api/jsm_clients.py @@ -104,7 +104,7 @@ def get_requests(self, start_at: int = 0, max_results: int = 100, auth: tuple = init_url = self.host + "/rest/servicedeskapi/request" while loop_count > 0: - api_url = init_url + f"?start={start_at}&limit={max_results}" + api_url = init_url + f"?start={start_at}&limit={max_results}&requestOwnership=PARTICIPATED_REQUESTS" if status: api_url += f"&requestStatus={status}" diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 32b0988b6..e6bbe0908 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.11 + 9.6.1 @@ -62,17 +62,17 @@ com.google.guava guava - 33.0.0-jre + 33.1.0-jre com.fasterxml.jackson.core jackson-core - 2.16.1 + 2.17.0 com.fasterxml.jackson.core jackson-databind - 2.16.1 + 2.17.0 com.jayway.jsonpath @@ -82,7 +82,7 @@ net.minidev json-smart - 2.5.0 + 2.5.1 org.slf4j diff --git a/app/util/conf.py b/app/util/conf.py index 023cca033..14fedb306 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -2,8 +2,8 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML -TOOLKIT_VERSION = '8.1.0' -UNSUPPORTED_VERSION = '7.4.1' +TOOLKIT_VERSION = '8.2.0' +UNSUPPORTED_VERSION = '7.5.0' def read_yml_file(file): diff --git a/app/util/k8s/README.MD b/app/util/k8s/README.MD index 20cd882e4..968ed4c5b 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.4 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.7.7 ./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.4 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.7.7 ./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.4 ./install.sh -c conf.tfvars +-it atlassianlabs/terraform:2.7.7 ./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.4 ./uninstall.sh -c conf.tfvars +-it atlassianlabs/terraform:2.7.7 ./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.4 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs +-it atlassianlabs/terraform:2.7.7 ./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.4 bash + -it atlassianlabs/terraform:2.7.7 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.4 bash + -it atlassianlabs/terraform:2.7.7 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.4 bash + -it atlassianlabs/terraform:2.7.7 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.4 bash + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.7.7 bash bzt_on_pod.sh jira.yml ``` diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 7c81223a0..a350b70bd 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -39,7 +39,7 @@ "size": "small", "snapshots": [ { - "us-east-2": "snap-0067577f23ce694f1", + "us-east-2": "snap-0b103b4d0d75384f5", "us-east-1": "snap-0ff264d124d02af3a" } ] diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 31d8c8bee..0efea4724 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -389,8 +389,8 @@ crowd_db_master_password = "Password1!" # 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.11" -bamboo_agent_version_tag = "9.2.11" +bamboo_version_tag = "9.6.1" +bamboo_agent_version_tag = "9.6.1" # Helm chart version of Bamboo and Bamboo agent instances # bamboo_helm_chart_version = "" diff --git a/app/util/k8s/terminate_cluster.py b/app/util/k8s/terminate_cluster.py index c83632661..5bd9453ea 100644 --- a/app/util/k8s/terminate_cluster.py +++ b/app/util/k8s/terminate_cluster.py @@ -179,7 +179,7 @@ def delete_nodegroup(aws_region, cluster_name): nodegroupName=node_group)['nodegroup']['resources']['autoScalingGroups'][0]['name'] autoscaling_client.delete_auto_scaling_group(AutoScalingGroupName=autoscaling_group_name, ForceDelete=True) - except Boto3Error as e: + except (Boto3Error, KeyError) as e: logging.error(f"Deleting autoscaling group {autoscaling_group_name} failed with error: {e}") try: diff --git a/app/util/pre_run/environment_compliance_check.py b/app/util/pre_run/environment_compliance_check.py index 208da00e5..6014413be 100644 --- a/app/util/pre_run/environment_compliance_check.py +++ b/app/util/pre_run/environment_compliance_check.py @@ -1,14 +1,15 @@ +import subprocess import sys -from selenium import webdriver + from packaging import version +from selenium import webdriver -from util.common_util import get_latest_version, get_current_version, get_unsupported_version -from util.analytics.application_info import ApplicationSelector from util.analytics.analytics import MIN_DEFAULTS +from util.analytics.application_info import ApplicationSelector +from util.common_util import get_latest_version, get_current_version, get_unsupported_version from util.conf import JIRA_SETTINGS, CONFLUENCE_SETTINGS, BITBUCKET_SETTINGS, JSM_SETTINGS, BAMBOO_SETTINGS, \ CROWD_SETTINGS - APPS_SETTINGS = { "JIRA": JIRA_SETTINGS, "CONFLUENCE": CONFLUENCE_SETTINGS, @@ -18,6 +19,8 @@ "CROWD": CROWD_SETTINGS, } +SUPPORTED_JAVA_VERSIONS = [11, 17] + def check_dcapt_version(): latest_version = get_latest_version() @@ -94,10 +97,27 @@ def validate_chromedriver_version(app_name, app_settings): f'Please change `chromedriver` version in your {app_name}.yml.') +def validate_java_version(): + try: + response = subprocess.check_output(['java', '-version'], stderr=subprocess.STDOUT) + java_version = str(response.splitlines()[0]).split('"')[1] + print(f'INFO: Java version: {java_version}') + except Exception as e: + print(f"WARNING: Skipping Java version check. Failed to get java version: {e}") + return + java_version_major = int(java_version.split(".")[0]) + + if java_version_major not in SUPPORTED_JAVA_VERSIONS: + raise SystemExit( + f"ERROR: Current java version {java_version} is not supported. " + f"Supported java versions: {SUPPORTED_JAVA_VERSIONS}") + + def analyze_application_configuration(app_name): app_name_upper = app_name.upper() app = ApplicationSelector(app_name).application processors = app.processors + print(f"INFO: {app_name} processors count: {processors}") app_settings = APPS_SETTINGS[app_name_upper] try: @@ -109,13 +129,15 @@ def analyze_application_configuration(app_name): app_settings, min_defaults) except ValueError: - print("WARNING: Skipping processor count validation because.") + print("WARNING: Skipping processor count validation. Get processor count failed.") if app_name.upper() == "CROWD": print("INFO: Skipping Chromedriver check for Crowd.") else: validate_chromedriver_version(app_name, app_settings) + validate_java_version() + def main(): check_dcapt_version() diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 20f06e1f2..0bb01c353 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh bamboo.yml + -it atlassianlabs/terraform:2.7.7 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 3b25658cc..246c2d4bf 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.7.7 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh bitbucket.yml + -it atlassianlabs/terraform:2.7.7 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 95bc395d0..b0c8e1751 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.7.7 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh confluence.yml + -it atlassianlabs/terraform:2.7.7 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 c236981ec..64bdf2805 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.7.7 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh crowd.yml + -it atlassianlabs/terraform:2.7.7 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 e3e4cc790..2f44e2d58 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.7.7 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh jira.yml + -it atlassianlabs/terraform:2.7.7 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 067e8ff9f..ff7910f4e 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.7.7 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.4 ./install.sh -c conf.tfvars + -it atlassianlabs/terraform:2.7.7 ./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.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.7.7 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.4 bash bzt_on_pod.sh jsm.yml + -it atlassianlabs/terraform:2.7.7 bash bzt_on_pod.sh jsm.yml ``` {{% note %}}