Merge pull request #1640 from atlassian/jsm/support-10-3-1/eol-10-0-a…

…nd-5-4 jsm/support-10-3-1/eol-10-0-and-5-4
atlassian · Dec 24, 2024 · e37e4ba · e37e4ba
2 parents c5b6f12 + 3bbd3d8
commit e37e4ba
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat
     * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.12`, `9.4.25` and `10.3.0` Platform release
 
 * Supported Jira Service Management versions: 
-    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12`, `5.4.25` and `10.0.1` Platform release
+    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12` and `10.3.1`
 
 * Supported Confluence versions:
     * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14` and `9.2.0`

diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars
@@ -92,7 +92,7 @@ jira_image_repository = "atlassian/jira-software"
 jira_version_tag = "9.12.12"
 # JSM version
 # ! REQUIRED for JSM !
-# jira_version_tag = "5.12.12"
+# jira_version_tag = "10.3.1"
 
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
 jira_dataset_size = "small"

diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json
@@ -226,15 +226,15 @@
         ]
       },
       {
-        "version": "5.4.25",
+        "version": "10.3.1",
         "data": [
           {
             "type": "local-home",
             "size": "large",
             "snapshots": [
               {
-                "us-east-2": "snap-047ef4054461dd0fa",
-                "us-east-1": "snap-0cd08ef369f1df34e"
+                "us-east-2": "snap-0dccf556703c13e7d",
+                "us-east-1": "snap-06b87e40b22f84c9f"
               }
             ]
           },
@@ -243,8 +243,8 @@
             "size": "large",
             "snapshots": [
               {
-                "us-east-2": "snap-0d0975b249e46ad98",
-                "us-east-1": "snap-088b77461fd57c9a2"
+                "us-east-2": "snap-0ca0574941e952446",
+                "us-east-1": "snap-0f24c67fa1a002b07"
               }
             ]
           },
@@ -253,8 +253,8 @@
             "size": "large",
             "snapshots": [
               {
-                "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-25",
-                "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-4-25"
+                "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-3-1",
+                "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-3-1"
               }
             ]
           },
@@ -263,8 +263,8 @@
             "size": "small",
             "snapshots": [
               {
-                "us-east-2": "snap-02402e9518294e486",
-                "us-east-1": "snap-048268c30f4165bae"
+                "us-east-2": "snap-033df6a68e1378d2d",
+                "us-east-1": "snap-00a99bacfb8d6932a"
               }
             ]
           },
@@ -273,63 +273,8 @@
             "size": "small",
             "snapshots": [
               {
-                "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-25",
-                "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-4-25"
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "version": "10.0.1",
-        "data": [
-          {
-            "type": "local-home",
-            "size": "large",
-            "snapshots": [
-              {
-                "us-east-2": "snap-019d79330995b9db7",
-                "us-east-1": "snap-08478133b48785725"
-              }
-            ]
-          },
-          {
-            "type": "ebs",
-            "size": "large",
-            "snapshots": [
-              {
-                "us-east-2": "snap-0f67c466251f5ead9",
-                "us-east-1": "snap-0d8a6668edce4d004"
-              }
-            ]
-          },
-          {
-            "type": "rds",
-            "size": "large",
-            "snapshots": [
-              {
-                "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-10-0-1",
-                "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-10-0-1"
-              }
-            ]
-          },
-          {
-            "type": "ebs",
-            "size": "small",
-            "snapshots": [
-              {
-                "us-east-2": "snap-0d582a31cfa7f908c",
-                "us-east-1": "snap-05b5d63ad1f2c0802"
-              }
-            ]
-          },
-          {
-            "type": "rds",
-            "size": "small",
-            "snapshots": [
-              {
-                "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-0-1",
-                "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-0-1"
+                "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-10-3-1",
+                "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-10-3-1"
               }
             ]
           }

diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars
@@ -114,7 +114,7 @@ jira_version_tag = "9.12.12"
 
 # JSM version
 # ! REQUIRED for JSM !
-# jira_version_tag = "5.12.12"
+# jira_version_tag = "10.3.1"
 
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large.
 jira_dataset_size = "large"