Move CI version overrides to matrix based approach (Azure#43913)

Author: benbp

eng/pipelines/templates/jobs/ci.yml

@@ -422,7 +422,11 @@ jobs:
       OsVmImage: $(LINUXVMIMAGE)
       Pool: $(LINUXPOOL)
       Os: linux
-      MatrixConfigs: ${{ parameters.MatrixConfigs }}
+      MatrixConfigs:
+        - ${{ each config in parameters.MatrixConfigs }}:
+          - ${{ config }}
+        - ${{ each config in parameters.AdditionalMatrixConfigs }}:
+          - ${{ config }}
       MatrixFilters: ${{ parameters.MatrixFilters }}
       MatrixReplace: ${{ parameters.MatrixReplace }}
       CloudConfig:

sdk/core/ci.yml

@@ -170,32 +170,14 @@ extends:
         # required by the above perf library
       - name: perf-test-core
         groupId: com.azure
-    AdditionalStagesAfterBuild:
-      - stage: DependencyVersionOverridesTests
-        displayName: 'Dependency Version Overrides'
-        dependsOn: []
-        jobs:
-          - template: /eng/pipelines/templates/jobs/ci.versions.tests.yml
-            parameters:
-              Artifacts:
-                - name: azure-core-version-tests
-                  groupId: com.azure
-                  safeName: azurecoreversiontests
-              VersionOverrides:
-                - jackson_2.10
-                - jackson_2.11
-                - jackson_2.12
-                - jackson_2.13
-                - jackson_2.14
-                - jackson_2.15
-                - jackson_2.16
-                - jackson_2.17
-                - jackson_2.18
-                - reactor_2020
-                - reactor_2022
-                - reactor_2023
-                - reactor_2024
-              TestGoals: surefire:test
+
+    # Run separate version override tests using a different artifacts list
+    # This matrix config overrides the ArtifactsJson variable
+    AdditionalMatrixConfigs:
+      - Name: version_overrides_tests
+        Path: sdk/core/version-overrides-matrix.json
+        Selection: all
+        GenerateVMJobs: true
 
     LiveTestStages:
       - template: /sdk/storage/tests-template.yml

sdk/core/version-overrides-matrix.json

@@ -0,0 +1,37 @@
+{
+  "matrix": {
+    "Agent": {
+      "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
+    },
+    "TestConfig": {
+      "version_override": {
+        "TestVersionSupport": true,
+        "VERSION_OVERRIDE_TESTS": true,
+        "TestGoals": "surefire:test",
+        // This has to be stringified json
+        "ArtifactsJson": "{
+          \"name\": \"azure-core-version-tests\",
+          \"groupId\": \"com.azure\",
+          \"safeName\": \"azurecoreversiontests\"
+        }",
+        // blank this out so we don't pick up the defaults from ci.yml
+        "AdditionalModulesJson": ""
+      }
+    },
+    "VersionOverride": [
+        "jackson_2.10",
+        "jackson_2.11",
+        "jackson_2.12",
+        "jackson_2.13",
+        "jackson_2.14",
+        "jackson_2.15",
+        "jackson_2.16",
+        "jackson_2.17",
+        "jackson_2.18",
+        "reactor_2020",
+        "reactor_2022",
+        "reactor_2023",
+        "reactor_2024"
+    ]
+  }
+}

sdk/serialization/ci.yml

@@ -45,36 +45,14 @@ extends:
         groupId: com.azure
         safeName: azurexml
         releaseInBatch: ${{ parameters.release_azurexml }}
-    AdditionalStagesAfterBuild:
-      - stage: AzureJsonReflectVersionSupport
-        displayName: 'azure-json-reflect Version Support'
-        dependsOn: []
-        jobs:
-          - template: /eng/pipelines/templates/jobs/ci.versions.tests.yml
-            parameters:
-              Artifacts:
-                - name: azure-json-reflect
-                  groupId: com.azure
-                  safeName: azurejsonreflect
-              VersionOverrides:
-                - gson_2.4
-                - gson_2.5
-                - gson_2.6
-                - gson_2.7
-                - gson_2.8
-                - gson_2.9
-                - gson_2.10
-                - gson_2.11
-                - jackson_2.10
-                - jackson_2.11
-                - jackson_2.12
-                - jackson_2.13
-                - jackson_2.14
-                - jackson_2.15
-                - jackson_2.16
-                - jackson_2.17
-                - jackson_2.18
-              TestGoals: surefire:test
+
+    # Run separate version override tests using a different artifacts list
+    # This matrix config overrides the ArtifactsJson variable
+    AdditionalMatrixConfigs:
+      - Name: version_overrides_tests
+        Path: sdk/serialization/version-overrides-matrix.json
+        Selection: all
+        GenerateVMJobs: true
 
     LiveTestStages:
       - template: /eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml

sdk/serialization/version-overrides-matrix.json

@@ -0,0 +1,41 @@
+{
+  "matrix": {
+    "Agent": {
+      "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
+    },
+    "TestConfig": {
+      "version_override": {
+        "TestVersionSupport": true,
+        "VERSION_OVERRIDE_TESTS": true,
+        "TestGoals": "surefire:test",
+        // This has to be stringified json
+        "ArtifactsJson": "{
+          \"name\": \"azure-json-reflect\",
+          \"groupId\": \"com.azure\",
+          \"safeName\": \"azurejsonreflect\"
+        }",
+        // blank this out so we don't pick up the defaults from ci.yml
+        "AdditionalModulesJson": ""
+      }
+    },
+    "VersionOverride": [
+      "gson_2.4",
+      "gson_2.5",
+      "gson_2.6",
+      "gson_2.7",
+      "gson_2.8",
+      "gson_2.9",
+      "gson_2.10",
+      "gson_2.11",
+      "jackson_2.10",
+      "jackson_2.11",
+      "jackson_2.12",
+      "jackson_2.13",
+      "jackson_2.14",
+      "jackson_2.15",
+      "jackson_2.16",
+      "jackson_2.17",
+      "jackson_2.18"
+    ]
+  }
+}