Add vnext emulator stages back to public CI pipeline (#48737)

* Add vnext emulator stages back to public CI pipeline

Remove the internal-only guard ({{ if eq(variables['System.TeamProject'], 'internal') }})
from the VNext emulator test stages in cosmos-sdk-client.yml so they run
on both public and internal CI pipelines.

The Skip.VnextEmulator variable condition is preserved for opt-out.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Adding dummy change to trigger CI

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: mbhaskar

eng/pipelines/templates/stages/cosmos-sdk-client.yml

@@ -157,44 +157,43 @@ extends:
                   displayName: "Print ScalaTest report files"
                   errorActionPreference: continue
                   condition: always()
-      - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        - ${{ each mode in parameters.VnextEmulatorModes }}:
-          - stage:
-            displayName: Test VNext Emulator with ${{ mode }}
-            dependsOn: [ ]
-            condition: and(succeeded(), ne(variables['Skip.VnextEmulator'], 'true'))
-            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: 2
-                    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') }}
+      - ${{ each mode in parameters.VnextEmulatorModes }}:
+        - stage:
+          displayName: Test VNext Emulator with ${{ mode }}
+          dependsOn: [ ]
+          condition: and(succeeded(), ne(variables['Skip.VnextEmulator'], 'true'))
+          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: 2
+                  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'))}}:

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/ConflictTests.java

@@ -98,4 +98,5 @@ public void createCustomPolicyWithSproc() {
             assertThat(ex.getMessage()).isEqualTo("sprocName cannot be null");
         }
     }
+
 }