Updated missing configuration to enable Java 21 testing for Storage. (#…

…38480)
Azure · Jan 25, 2024 · 45678f7 · 45678f7
1 parent d3505c7
commit 45678f7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/sdk/storage/platform-matrix-ci.json b/sdk/storage/platform-matrix-ci.json
@@ -7,6 +7,8 @@
       "Agent": { "windows-2022": { "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general" } },
       "JavaTestVersion": "1.21",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
+      "TestFromSource": false,
+      "RunAggregateReports": false,
       "TestGoals": "surefire:test",
       "TestOptions": ""
     }

diff --git a/sdk/storage/platform-matrix.json b/sdk/storage/platform-matrix.json
@@ -24,11 +24,17 @@
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "TestFromSource": false
     },
+    {
+      "Agent": { "windows-2022": { "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general" } },
+      "JavaTestVersion": "1.21",
+      "AZURE_TEST_HTTP_CLIENTS": "netty",
+      "TestFromSource": false
+    },
     {
       "Agent": {
         "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
       },
-      "JavaTestVersion": ["1.8", "1.11"],
+      "JavaTestVersion": ["1.8", "1.21"],
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "TestFromSource": false,
       "StorageRunStressScenarios" : "true",

diff --git a/sdk/storage/tests-template.yml b/sdk/storage/tests-template.yml
@@ -78,8 +78,8 @@ stages:
             targetType: 'filePath'
             filePath: sdk/storage/azure-storage-perf/memory-stress-scenarios.ps1
           env:
-            ${{ if eq(variables['JavaTestVersion'], '1.11') }}:
-              JAVA_HOME: $(JAVA_HOME_11_X64)
+            ${{ if eq(variables['JavaTestVersion'], '1.21') }}:
+              JAVA_HOME: $(JAVA_HOME_21_X64)
             ${{ if eq(variables['JavaTestVersion'], '1.8') }}:
               JAVA_HOME: $(JAVA_HOME_8_X64)
           condition: and(succeeded(), eq(variables['StorageRunStressScenarios'], 'true'))