Skip to content

Commit

Permalink
Merge pull request #1426 from atlassian/release/8.2.2
Browse files Browse the repository at this point in the history
Release 8.2.2
  • Loading branch information
ometelytsia committed Jun 4, 2024
2 parents 3b71c5a + f529a66 commit 530ee72
Show file tree
Hide file tree
Showing 14 changed files with 77 additions and 77 deletions.
8 changes: 4 additions & 4 deletions app/bamboo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions app/bitbucket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions app/confluence.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/crowd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions app/jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions app/jsm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion app/util/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'


Expand Down
20 changes: 10 additions & 10 deletions app/util/k8s/README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
```
8 changes: 4 additions & 4 deletions docs/dc-apps-performance-toolkit-user-guide-bamboo.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 %}}
Expand Down Expand Up @@ -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 %}}
Expand Down
16 changes: 8 additions & 8 deletions docs/dc-apps-performance-toolkit-user-guide-bitbucket.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down Expand Up @@ -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`.

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 %}}
Expand Down Expand Up @@ -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 %}}
Expand All @@ -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
Expand All @@ -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 %}}
Expand Down Expand Up @@ -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 %}}
Expand Down
Loading

0 comments on commit 530ee72

Please sign in to comment.