Only run cosmos vnext on internal. Clean up/de-dup configs. (Azure#44642)

benbp · web-flow · commit 969321ed0d1d · 2025-03-14T17:50:47.000-04:00
diff --git a/eng/pipelines/templates/stages/cosmos-emulator-matrix.json b/eng/pipelines/templates/stages/cosmos-emulator-matrix.json
@@ -1,8 +1,12 @@
 {
+  "displayNames": {
+    "clean verify": ""
+  },
   "matrix": {
     "Agent": {
       "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
     },
+    "TestGoals": "clean verify",
     "EmulatorConfig": {
       "Emulator Only Integration Tests Tcp - Java 8": {
           "ProfileFlag": "-Pemulator",
diff --git a/eng/pipelines/templates/stages/cosmos-emulator-vnext-matrix.json b/eng/pipelines/templates/stages/cosmos-emulator-vnext-matrix.json
@@ -1,21 +1,19 @@
 {
+  "displayNames": {
+    "clean verify": ""
+  },
   "matrix": {
     "Agent": {
       "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
     },
     "EmulatorConfig": {
-      "Emulator VNext Integration Tests On Insecure Connection - Java 8": {
+      "Emulator VNext Integration Tests On Insecure Connection - Java ": {
         "ProfileFlag": "-Pemulator-vnext",
         "DESIRED_CONSISTENCIES": "[\"Session\"]",
-        "JavaTestVersion": "1.8",
-        "AdditionalArgs": "-DCOSMOS.AZURE_COSMOS_DISABLE_NON_STREAMING_ORDER_BY=true"
-      },
-      "Emulator VNext Integration Tests On Insecure connection - Java 17": {
-        "ProfileFlag": "-Pemulator-vnext",
-        "DESIRED_CONSISTENCIES": "[\"Session\"]",
-        "JavaTestVersion": "1.17",
         "AdditionalArgs": "-DCOSMOS.AZURE_COSMOS_DISABLE_NON_STREAMING_ORDER_BY=true"
       }
-    }
+    },
+    "JavaTestVersion": ["1.8", "1.17"],
+    "TestGoals": "clean verify"
   }
 }
diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -17,6 +17,9 @@ parameters:
 - name: LanguageFilter
   type: object
   default: []
+- name: VnextEmulatorModes
+  type: object
+  default: ['Http', 'Https']
 
 extends:
   template: /eng/pipelines/templates/stages/1es-redirect.yml
@@ -88,15 +91,9 @@ extends:
               BuildParallelization: 1
               DisableAzureResourceCreation: true
               ServiceDirectory: cosmos
-              ACCOUNT_HOST: 'https://localhost:8081/'
-              ACCOUNT_KEY: 'C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=='
-              SECONDARY_ACCOUNT_KEY: 'C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=='
               # Increased timeout to 90 because of cosmos emulator taking 25-30 mins to download emulator
               # Issue filed to improve download speed: https://github.com/Azure/azure-sdk-for-java/issues/12970
               TimeoutInMinutes: 120
-              TestGoals: 'clean verify'
-              TestOptions: '$(ProfileFlag) $(AdditionalArgs)'
-
               PreSteps:
               - template: /eng/common/pipelines/templates/steps/cosmos-emulator.yml
                 parameters:
@@ -123,74 +120,43 @@ extends:
                   keytool -keystore cacerts -importcert -noprompt -trustcacerts -alias CosmosDbEmulatorCert -file CosmosDbEmulatorCert.cer -storepass changeit
                 displayName: 'Create Java TrustStore'
 
-      - stage: TestVNextEmulatorHttp
-        displayName: Test VNext Emulator with Http
-        dependsOn: [ ]
-        variables:
-          - template: /eng/pipelines/templates/variables/globals.yml
-          - template: /eng/pipelines/templates/variables/image.yml
-          - name: ArtifactsJson
-            value: '${{ convertToJson(parameters.Artifacts) }}'
-          - name: AdditionalModulesJson
-            value: '${{ convertToJson(parameters.AdditionalModules) }}'
-        jobs:
-          - template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
-            parameters:
-              JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
-              MatrixConfigs:
-                - Name: Cosmos_vnext_emulator_http_integration
-                  Path: eng/pipelines/templates/stages/cosmos-emulator-vnext-matrix.json
-                  Selection: all
-                  GenerateVMJobs: true
-              MatrixFilters:
-                - ${{ parameters.LanguageFilter }}
-                - ${{ parameters.MatrixFilters }}
-              AdditionalParameters:
-                BuildParallelization: 1
-                DisableAzureResourceCreation: true
-                ServiceDirectory: cosmos
-                ACCOUNT_HOST: 'http://localhost:8081/'
-                ACCOUNT_KEY: 'C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=='
-                SECONDARY_ACCOUNT_KEY: 'C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=='
-                TimeoutInMinutes: 120
-                TestGoals: 'clean verify'
-                TestOptions: '$(ProfileFlag) $(AdditionalArgs) -DACCOUNT_HOST=http://localhost:8081/ -DCOSMOS.HTTP_CONNECTION_WITHOUT_TLS_ALLOWED=true'
-                PreSteps:
-                  - template: /eng/pipelines/templates/stages/cosmos-vnext-emulator-http.yml
-      - stage: TestVNextEmulatorHttps
-        displayName: Test VNext Emulator with Https
-        dependsOn: [ ]
-        variables:
-          - template: /eng/pipelines/templates/variables/globals.yml
-          - template: /eng/pipelines/templates/variables/image.yml
-          - name: ArtifactsJson
-            value: '${{ convertToJson(parameters.Artifacts) }}'
-          - name: AdditionalModulesJson
-            value: '${{ convertToJson(parameters.AdditionalModules) }}'
-        jobs:
-          - template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
-            parameters:
-              JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
-              MatrixConfigs:
-                - Name: Cosmos_vnext_emulator_http_integration
-                  Path: eng/pipelines/templates/stages/cosmos-emulator-vnext-matrix.json
-                  Selection: all
-                  GenerateVMJobs: true
-              MatrixFilters:
-                - ${{ parameters.LanguageFilter }}
-                - ${{ parameters.MatrixFilters }}
-              AdditionalParameters:
-                BuildParallelization: 1
-                DisableAzureResourceCreation: true
-                ServiceDirectory: cosmos
-                ACCOUNT_HOST: 'https://localhost:8081/'
-                ACCOUNT_KEY: 'C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=='
-                SECONDARY_ACCOUNT_KEY: 'C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=='
-                TimeoutInMinutes: 90
-                TestGoals: 'clean verify'
-                TestOptions: '$(ProfileFlag) $(AdditionalArgs) -DACCOUNT_HOST=https://localhost:8081/ -DCOSMOS.EMULATOR_SERVER_CERTIFICATE_VALIDATION_DISABLED=true'
-                PreSteps:
-                  - template: /eng/pipelines/templates/stages/cosmos-vnext-emulator-https.yml
+      - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        - ${{ each mode in parameters.VnextEmulatorModes }}:
+          - stage:
+            displayName: Test VNext Emulator with ${{ mode }}
+            dependsOn: [ ]
+            variables:
+              - template: /eng/pipelines/templates/variables/globals.yml
+              - template: /eng/pipelines/templates/variables/image.yml
+              - name: ArtifactsJson
+                value: '${{ convertToJson(parameters.Artifacts) }}'
+              - name: AdditionalModulesJson
+                value: '${{ convertToJson(parameters.AdditionalModules) }}'
+            jobs:
+              - template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
+                parameters:
+                  JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
+                  MatrixConfigs:
+                    - Name: Cosmos_vnext_emulator_http_integration
+                      Path: eng/pipelines/templates/stages/cosmos-emulator-vnext-matrix.json
+                      Selection: all
+                      GenerateVMJobs: true
+                  MatrixFilters:
+                    - ${{ parameters.LanguageFilter }}
+                    - ${{ parameters.MatrixFilters }}
+                  AdditionalParameters:
+                    BuildParallelization: 1
+                    DisableAzureResourceCreation: true
+                    ServiceDirectory: cosmos
+                    TimeoutInMinutes: 120
+                    ${{ if eq(mode, 'Https') }}:
+                      TestOptions: '$(ProfileFlag) $(AdditionalArgs) -DACCOUNT_HOST=https://localhost:8081/ -DCOSMOS.EMULATOR_SERVER_CERTIFICATE_VALIDATION_DISABLED=true'
+                    ${{ else }}:
+                      TestOptions: '$(ProfileFlag) $(AdditionalArgs) -DACCOUNT_HOST=http://localhost:8081/ -DCOSMOS.HTTP_CONNECTION_WITHOUT_TLS_ALLOWED=true'
+                    PreSteps:
+                      - template: /eng/pipelines/templates/steps/cosmos-vnext-emulator.yml
+                        parameters:
+                          Https: ${{ eq(mode, 'Https') }}
 
       # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
       - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
diff --git a/eng/pipelines/templates/stages/cosmos-vnext-emulator-http.yml b/eng/pipelines/templates/stages/cosmos-vnext-emulator-http.yml
diff --git a/eng/pipelines/templates/stages/cosmos-vnext-emulator-https.yml b/eng/pipelines/templates/stages/cosmos-vnext-emulator-https.yml
diff --git a/eng/pipelines/templates/steps/cosmos-vnext-emulator.yml b/eng/pipelines/templates/steps/cosmos-vnext-emulator.yml
@@ -0,0 +1,21 @@
+parameters:
+- name: Https
+  type: boolean
+  default: true
+
+steps:
+    - task: Docker@0
+      displayName: Pull cosmos db vnext emulator
+      inputs:
+          command: 'Run a Docker command'
+          action: 'Run a Docker command'
+          customCommand: 'pull mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-preview'
+    - task: Docker@0
+      displayName: Run cosmos db vnext emulator
+      inputs:
+          command: 'Run a Docker command'
+          action: 'Run a Docker command'
+          ${{ if parameters.Https }}:
+            customCommand: 'run --detach --publish 8081:8081 --publish 1234:1234 -e ENABLE_EXPLORER=false -e PROTOCOL=https mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-preview'
+          ${{ else }}:
+            customCommand: 'run --detach --publish 8081:8081 --publish 1234:1234 -e ENABLE_EXPLORER=false mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-preview'
