Skip to content

Commit 530ee72

Browse files
authoredJun 4, 2024
Merge pull request #1426 from atlassian/release/8.2.2
Release 8.2.2
2 parents 3b71c5a + f529a66 commit 530ee72

14 files changed

+77
-77
lines changed
 

‎app/bamboo.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ modules:
107107
plugins:
108108
- bzm-parallel=0.4
109109
- bzm-random-csv=0.6
110-
- jpgc-casutg=2.5
111-
- jpgc-dummy=0.2
110+
- jpgc-casutg=2.9
111+
- jpgc-dummy=0.4
112112
- jpgc-ffw=2.0
113113
- jpgc-fifo=0.2
114114
- jpgc-functions=2.1
115115
- jpgc-json=2.6
116116
- jpgc-perfmon=2.1
117117
- jpgc-prmctl=0.4
118-
- jpgc-tst=2.4
118+
- jpgc-tst=2.5
119119
- jpgc-wsc=0.3
120120
- tilln-sshmon=1.0
121121
- jpgc-synthesis=2.2
@@ -125,7 +125,7 @@ modules:
125125
httpsampler.ignore_failed_embedded_resources: "true"
126126
selenium:
127127
chromedriver:
128-
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
128+
version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing
129129
reporting:
130130
- data-source: sample-labels
131131
module: junit-xml

‎app/bitbucket.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ modules:
7373
plugins:
7474
- bzm-parallel=0.4
7575
- bzm-random-csv=0.6
76-
- jpgc-casutg=2.5
77-
- jpgc-dummy=0.2
76+
- jpgc-casutg=2.9
77+
- jpgc-dummy=0.4
7878
- jpgc-ffw=2.0
7979
- jpgc-fifo=0.2
8080
- jpgc-functions=2.1
8181
- jpgc-json=2.6
8282
- jpgc-perfmon=2.1
8383
- jpgc-prmctl=0.4
84-
- jpgc-tst=2.4
84+
- jpgc-tst=2.5
8585
- jpgc-wsc=0.3
8686
- tilln-sshmon=1.0
8787
- jpgc-synthesis=2.2
@@ -91,7 +91,7 @@ modules:
9191
httpsampler.ignore_failed_embedded_resources: "true"
9292
selenium:
9393
chromedriver:
94-
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
94+
version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing
9595
reporting:
9696
- data-source: sample-labels
9797
module: junit-xml

‎app/confluence.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ modules:
100100
plugins:
101101
- bzm-parallel=0.4
102102
- bzm-random-csv=0.6
103-
- jpgc-casutg=2.5
104-
- jpgc-dummy=0.2
103+
- jpgc-casutg=2.9
104+
- jpgc-dummy=0.4
105105
- jpgc-ffw=2.0
106106
- jpgc-fifo=0.2
107107
- jpgc-functions=2.1
108108
- jpgc-json=2.6
109109
- jpgc-perfmon=2.1
110110
- jpgc-prmctl=0.4
111-
- jpgc-tst=2.4
111+
- jpgc-tst=2.5
112112
- jpgc-wsc=0.3
113113
- tilln-sshmon=1.0
114114
- jpgc-synthesis=2.2
@@ -118,7 +118,7 @@ modules:
118118
httpsampler.ignore_failed_embedded_resources: "true"
119119
selenium:
120120
chromedriver:
121-
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
121+
version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing
122122
reporting:
123123
- data-source: sample-labels
124124
module: junit-xml

‎app/crowd.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ modules:
7676
plugins:
7777
- bzm-parallel=0.4
7878
- bzm-random-csv=0.6
79-
- jpgc-casutg=2.5
80-
- jpgc-dummy=0.2
79+
- jpgc-casutg=2.9
80+
- jpgc-dummy=0.4
8181
- jpgc-ffw=2.0
8282
- jpgc-fifo=0.2
8383
- jpgc-functions=2.1
8484
- jpgc-json=2.6
8585
- jpgc-perfmon=2.1
8686
- jpgc-prmctl=0.4
87-
- jpgc-tst=2.4
87+
- jpgc-tst=2.5
8888
- jpgc-wsc=0.3
8989
- tilln-sshmon=1.0
9090
- jpgc-synthesis=2.2

‎app/jira.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ modules:
101101
plugins:
102102
- bzm-parallel=0.4
103103
- bzm-random-csv=0.6
104-
- jpgc-casutg=2.5
105-
- jpgc-dummy=0.2
104+
- jpgc-casutg=2.9
105+
- jpgc-dummy=0.4
106106
- jpgc-ffw=2.0
107107
- jpgc-fifo=0.2
108108
- jpgc-functions=2.1
109109
- jpgc-json=2.6
110110
- jpgc-perfmon=2.1
111111
- jpgc-prmctl=0.4
112-
- jpgc-tst=2.4
112+
- jpgc-tst=2.5
113113
- jpgc-wsc=0.3
114114
- tilln-sshmon=1.0
115115
- jpgc-synthesis=2.2
@@ -119,7 +119,7 @@ modules:
119119
httpsampler.ignore_failed_embedded_resources: "true"
120120
selenium:
121121
chromedriver:
122-
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
122+
version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing
123123
reporting:
124124
- data-source: sample-labels
125125
module: junit-xml

‎app/jsm.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@ modules:
153153
plugins:
154154
- bzm-parallel=0.4
155155
- bzm-random-csv=0.6
156-
- jpgc-casutg=2.5
157-
- jpgc-dummy=0.2
156+
- jpgc-casutg=2.9
157+
- jpgc-dummy=0.4
158158
- jpgc-ffw=2.0
159159
- jpgc-fifo=0.2
160160
- jpgc-functions=2.1
161161
- jpgc-json=2.6
162162
- jpgc-perfmon=2.1
163163
- jpgc-prmctl=0.4
164-
- jpgc-tst=2.4
164+
- jpgc-tst=2.5
165165
- jpgc-wsc=0.3
166166
- tilln-sshmon=1.0
167167
- jpgc-synthesis=2.2
@@ -171,7 +171,7 @@ modules:
171171
httpsampler.ignore_failed_embedded_resources: "true"
172172
selenium:
173173
chromedriver:
174-
version: "124.0.6367.60" # Supports Chrome version 124. You can refer to https://googlechromelabs.github.io/chrome-for-testing
174+
version: "125.0.6422.141" # Supports Chrome version 125. You can refer to https://googlechromelabs.github.io/chrome-for-testing
175175
reporting:
176176
- data-source: sample-labels
177177
module: junit-xml

‎app/util/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML
44

5-
TOOLKIT_VERSION = '8.2.1'
5+
TOOLKIT_VERSION = '8.2.2'
66
UNSUPPORTED_VERSION = '7.5.0'
77

88

‎app/util/k8s/README.MD

+10-10
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ docker run --pull=always --env-file aws_envs \
3030
-v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \
3131
-v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
3232
-v "/$PWD/logs:/data-center-terraform/logs" \
33-
-it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars
33+
-it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars
3434
```
3535
### Terminate development environment
3636
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 \
4242
-v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \
4343
-v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
4444
-v "/$PWD/logs:/data-center-terraform/logs" \
45-
-it atlassianlabs/terraform:2.7.9 ./uninstall.sh -c conf.tfvars
45+
-it atlassianlabs/terraform:2.9.1 ./uninstall.sh -c conf.tfvars
4646
```
4747

4848
# Enterprise-scale environment
@@ -59,7 +59,7 @@ docker run --pull=always --env-file aws_envs \
5959
-v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
6060
-v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
6161
-v "/$PWD/logs:/data-center-terraform/logs" \
62-
-it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars
62+
-it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars
6363
```
6464
### Terminate enterprise-scale environment
6565
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 \
7171
-v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
7272
-v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
7373
-v "/$PWD/logs:/data-center-terraform/logs" \
74-
-it atlassianlabs/terraform:2.7.9 ./uninstall.sh -c conf.tfvars
74+
-it atlassianlabs/terraform:2.9.1 ./uninstall.sh -c conf.tfvars
7575
```
7676

7777
# Collect detailed k8s logs
@@ -91,7 +91,7 @@ export REGION=us-east-2
9191
docker run --pull=always --env-file aws_envs \
9292
-v "/$PWD/k8s_logs:/data-center-terraform/k8s_logs" \
9393
-v "/$PWD/logs:/data-center-terraform/logs" \
94-
-it atlassianlabs/terraform:2.7.9 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs
94+
-it atlassianlabs/terraform:2.9.1 ./scripts/collect_k8s_logs.sh atlas-$ENVIRONMENT_NAME-cluster $REGION k8s_logs
9595
```
9696

9797
# Force terminate cluster
@@ -124,7 +124,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus
124124
docker run --pull=always --env-file aws_envs \
125125
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
126126
-e REGION=$REGION \
127-
-it atlassianlabs/terraform:2.7.9 bash
127+
-it atlassianlabs/terraform:2.9.1 bash
128128
```
129129

130130
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
148148
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
149149
-e REGION=$REGION \
150150
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
151-
-it atlassianlabs/terraform:2.7.9 bash
151+
-it atlassianlabs/terraform:2.9.1 bash
152152
```
153153
5. Copy code base and connect to the execution environment pod:
154154
``` bash
@@ -176,7 +176,7 @@ atlassian/dcapt terminate_cluster.py --cluster_name atlas-$ENVIRONMENT_NAME-clus
176176
-e REGION=$REGION \
177177
-e PRODUCT=$PRODUCT \
178178
-v "/$PWD/script-runner.yml:/data-center-terraform/script-runner.yml" \
179-
-it atlassianlabs/terraform:2.7.9 bash
179+
-it atlassianlabs/terraform:2.9.1 bash
180180
```
181181
5. Run following commands one by one inside docker container:
182182
``` bash
@@ -204,7 +204,7 @@ To enable detailed CPU/Memory monitoring and Grafana dashboards for visualisatio
204204
docker run --pull=always --env-file aws_envs \
205205
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
206206
-e REGION=$REGION \
207-
-it atlassianlabs/terraform:2.7.9 bash
207+
-it atlassianlabs/terraform:2.9.1 bash
208208
```
209209
``` bash
210210
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
240240
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
241241
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
242242
-v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
243-
-it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh jira.yml
243+
-it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh jira.yml
244244
```

‎docs/dc-apps-performance-toolkit-user-guide-bamboo.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ specifically for performance testing during the DC app review process.
7171
-v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
7272
-v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
7373
-v "/$PWD/logs:/data-center-terraform/logs" \
74-
-it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars
74+
-it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars
7575
```
7676
7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`.
7777
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
272272
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
273273
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
274274
-v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
275-
-it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bamboo.yml
275+
-it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bamboo.yml
276276
```
277277
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:
278278
- `results_summary.log`: detailed run summary
@@ -303,7 +303,7 @@ To receive performance results with an app installed (still use master branch):
303303
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
304304
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
305305
-v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
306-
-it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bamboo.yml
306+
-it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bamboo.yml
307307
```
308308
309309
{{% note %}}
@@ -337,7 +337,7 @@ To receive results for Bamboo DC **with app** and **with app-specific actions**:
337337
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
338338
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
339339
-v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
340-
-it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bamboo.yml
340+
-it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bamboo.yml
341341
```
342342
343343
{{% note %}}

‎docs/dc-apps-performance-toolkit-user-guide-bitbucket.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase
8484
-v "/$PWD/dcapt-small.tfvars:/data-center-terraform/conf.tfvars" \
8585
-v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
8686
-v "/$PWD/logs:/data-center-terraform/logs" \
87-
-it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars
87+
-it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars
8888
```
8989
8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`.
9090

@@ -248,7 +248,7 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large
248248
-v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
249249
-v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
250250
-v "/$PWD/logs:/data-center-terraform/logs" \
251-
-it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars
251+
-it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars
252252
```
253253
8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`.
254254
@@ -323,7 +323,7 @@ To receive performance baseline results **without** an app installed:
323323
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
324324
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
325325
-v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
326-
-it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml
326+
-it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml
327327
```
328328
329329
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):
354354
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
355355
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
356356
-v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
357-
-it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml
357+
-it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml
358358
```
359359
360360
{{% note %}}
@@ -404,7 +404,7 @@ To receive scalability benchmark results for one-node Bitbucket DC **with** app-
404404
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
405405
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
406406
-v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
407-
-it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml
407+
-it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml
408408
```
409409
410410
{{% note %}}
@@ -429,7 +429,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app-
429429
-v "/$PWD/dcapt.tfvars:/data-center-terraform/conf.tfvars" \
430430
-v "/$PWD/dcapt-snapshots.json:/data-center-terraform/dcapt-snapshots.json" \
431431
-v "/$PWD/logs:/data-center-terraform/logs" \
432-
-it atlassianlabs/terraform:2.7.9 ./install.sh -c conf.tfvars
432+
-it atlassianlabs/terraform:2.9.1 ./install.sh -c conf.tfvars
433433
```
434434
1. Navigate to `dc-app-performance-toolkit` folder and start tests execution:
435435
``` bash
@@ -442,7 +442,7 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app-
442442
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
443443
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
444444
-v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
445-
-it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml
445+
-it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml
446446
```
447447
448448
{{% note %}}
@@ -471,7 +471,7 @@ To receive scalability benchmark results for four-node Bitbucket DC with app-spe
471471
-e ENVIRONMENT_NAME=$ENVIRONMENT_NAME \
472472
-v "/$PWD:/data-center-terraform/dc-app-performance-toolkit" \
473473
-v "/$PWD/app/util/k8s/bzt_on_pod.sh:/data-center-terraform/bzt_on_pod.sh" \
474-
-it atlassianlabs/terraform:2.7.9 bash bzt_on_pod.sh bitbucket.yml
474+
-it atlassianlabs/terraform:2.9.1 bash bzt_on_pod.sh bitbucket.yml
475475
```
476476
477477
{{% note %}}

0 commit comments

Comments
 (0)
Failed to load comments.