WIP: actuate AAD tests in Azure China Cloud

eng/common/TestResources/New-TestResources.ps1

@@ -21,6 +21,9 @@ param (
     [Parameter(Mandatory = $true, Position = 0)]
     [string] $ServiceDirectory,
 
+    [Parameter()]
+    [string[]] $Artifacts = @(),
+
     [Parameter()]
     [ValidatePattern('^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$')]
     [string] $TestApplicationId,
@@ -144,16 +147,30 @@ try {
     # Azure SDK Developer Playground
     $defaultSubscription = "faa080af-c1d8-40ad-9cce-e1a450ca5b57"
 
-    Write-Verbose "Checking for '$templateFileName' files under '$root'"
-    Get-ChildItem -Path $root -Filter $templateFileName -Recurse | ForEach-Object {
-        $templateFile = $_.FullName
+    # Deploy test resources according to Artifacts
+    if ($Artifacts) {
+        foreach ($Artifact in $Artifacts) {
+            $templateFilePath = Join-Path $root $Artifact.name
+            Write-Verbose "Checking for '$templateFileName' files under '$templateFilePath'"
+            Get-ChildItem -Path $templateFilePath -Filter $templateFileName -Recurse | ForEach-Object {
+                $templateFile = $_.FullName
 
-        Write-Verbose "Found template '$templateFile'"
-        $templateFiles += $templateFile
+                Write-Verbose "Found template '$templateFile'"
+                $templateFiles += $templateFile
+            }
+        }
+    } else {
+        Write-Verbose "Checking for '$templateFileName' files under '$root'"
+        Get-ChildItem -Path $root -Filter $templateFileName -Recurse | ForEach-Object {
+            $templateFile = $_.FullName
+
+            Write-Verbose "Found template '$templateFile'"
+            $templateFiles += $templateFile
+        }
     }
 
     if (!$templateFiles) {
-        Write-Warning -Message "No template files found under '$root'"
+        Write-Warning -Message "No template files found"
         exit
     }
 

eng/common/TestResources/deploy-test-resources.yml

@@ -4,7 +4,7 @@ parameters:
   DeleteAfterHours: 8
   Location: ''
   SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-
+  Artifacts: []
 # SubscriptionConfiguration will be splatted into the parameters of the test
 # resources script. It should be JSON in the form:
 # {
@@ -38,6 +38,15 @@ steps:
   - pwsh: |
       eng/common/TestResources/Import-AzModules.ps1
 
+#      $artifactsArray = ${{ parameters.Artifacts }}
+#      Write-Verbose "There are $artifactsArray.Count artifacts"
+#
+#      $artifactsNameArray = @()
+#      foreach($artifact in $artifactsArray) {
+#        Write-Verbose "$artifact.name"
+#        $artifactsNameArray += $artifact.name
+#      }
+
       $subscriptionConfiguration = @'
         ${{ parameters.SubscriptionConfiguration }}
       '@ | ConvertFrom-Json -AsHashtable;
@@ -48,6 +57,7 @@ steps:
       eng/common/TestResources/New-TestResources.ps1 `
         -BaseName 'Generated' `
         -ServiceDirectory '${{ parameters.ServiceDirectory }}' `
+        -Artifacts ${{ parameters.Artifacts }} `
         -Location '${{ parameters.Location }}' `
         -DeleteAfterHours '${{ parameters.DeleteAfterHours }}' `
         @subscriptionConfiguration `

eng/common/TestResources/setup-az-modules.yml

@@ -28,7 +28,7 @@ steps:
       script: |
         eng/common/TestResources/Import-AzModules.ps1
 
-        $environmentSpec = @"
-          $(env-config-dogfood)
-        "@ | ConvertFrom-Json -AsHashtable;
-        Add-AzEnvironment @environmentSpec
+#        $environmentSpec = @"
+#          $(env-config-dogfood)
+#        "@ | ConvertFrom-Json -AsHashtable;
+#        Add-AzEnvironment @environmentSpec

eng/pipelines/templates/jobs/archetype-sdk-tests.yml

@@ -102,6 +102,7 @@ jobs:
             SubscriptionConfiguration: $(SubscriptionConfiguration)
             ArmTemplateParameters: $(ArmTemplateParameters)
             Location: $(Location)
+            Artifacts: $(Artifacts)
 
       - ${{ parameters.PreRunSteps }}
 

sdk/spring/spring-test-template.yml

@@ -0,0 +1,45 @@
+parameters:
+  EnvVars: {}
+  TestName: ''
+  Artifacts: []
+  SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+
+jobs:
+    - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
+      parameters:
+        TimeoutInMinutes: 240
+        ServiceDirectory: spring
+        EnvVars: ${{ parameters.EnvVars }}
+        TestName: ${{ parameters.TestName }}
+        SubscriptionConfiguration: ${{ parameters.SubscriptionConfiguration }}
+        Artifacts: ${{ parameters.Artifacts }}
+        TestStepMavenInputs:
+          options: '-Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -DskipSpringITs=false -pl $(ProjectList)'
+          goals: "verify"
+
+        PostRunSteps:
+          - script: |
+              python --version
+              python -m pip install setuptools termcolor in_place
+              python sdk/spring/scripts/replace_util.py --module spring --log debug --color false
+            displayName: 'Run replace_util.py'
+
+          - task: Maven@3
+            displayName: 'Build and Install again, JDK Version: $(JavaBuildVersion)'
+            inputs:
+              mavenPomFile: pom.xml
+              goals: 'install'
+              options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am'
+              mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
+              javaHomeOption: 'JDKVersion'
+              jdkVersionOption: $(JavaBuildVersion)
+              jdkArchitectureOption: 'x64'
+              publishJUnitResults: false
+
+          - task: Maven@3
+            displayName: 'Run tests again, JDK Version: $(JavaBuildVersion)'
+            inputs:
+              mavenPomFile: pom.xml
+              goals: verify
+              options: '-Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -DskipSpringITs=false -pl $(ProjectList)'
+            env: ${{ parameters.EnvVars }}

sdk/spring/tests.yml

@@ -1,13 +1,10 @@
 trigger: none
 
 jobs:
-    - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml
+    - template: spring-test-template.yml
       parameters:
-        TimeoutInMinutes: 240
-        ServiceDirectory: spring
-        TestStepMavenInputs:
-          options: '-Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -DskipSpringITs=false -pl $(ProjectList)'
-          goals: "verify"
+        TestName: LiveTestInAzureCloud
+        ScenarioName: AzureCloud
 
         Artifacts:
           - name: azure-spring-boot-test-application
@@ -70,50 +67,32 @@ jobs:
           AAD_B2C_CLIENT_ID: $(java-spring-aad-b2c-client-id)
           AAD_B2C_CLIENT_SECRET: $(java-spring-aad-b2c-client-secret)
 
-        PostRunSteps:
-          - script: |
-              python --version
-              python -m pip install setuptools termcolor in_place
-              python sdk/spring/scripts/replace_util.py --module spring --log debug --color false
-            displayName: 'Run replace_util.py'
-
-          - task: Maven@3
-            displayName: 'Build and Install again, JDK Version: $(JavaBuildVersion)'
-            inputs:
-              mavenPomFile: pom.xml
-              goals: 'install'
-              options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am'
-              mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
-              javaHomeOption: 'JDKVersion'
-              jdkVersionOption: $(JavaBuildVersion)
-              jdkArchitectureOption: 'x64'
-              publishJUnitResults: false
+    - template: spring-test-template.yml
+      parameters:
+        TestName: LiveTestInAzureChina
+        ScenarioName: AzureChinaCloud
+        SubscriptionConfiguration: $(sub-config-cn-test-resources)
+        Artifacts:
+          - name: azure-spring-boot-test-core
+            groupId: com.azure.spring
+            safeName: azurespringboottestcore
+          - name: azure-spring-boot-test-aad
+            groupId: com.azure.spring
+            safeName: azurespringboottestaad
 
-          - task: Maven@3
-            displayName: 'Run tests again, JDK Version: $(JavaBuildVersion)'
-            inputs:
-              mavenPomFile: pom.xml
-              goals: verify
-              options: '-Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -DskipSpringITs=false -pl $(ProjectList)'
-            env:
-              AZURE_TEST_MODE: LIVE
-              AAD_TENANT_ID_1: $(java-spring-aad-tenant-id-1)
-              AAD_USER_NAME_1: $(java-spring-aad-user-name-1)
-              AAD_USER_PASSWORD_1: $(java-spring-aad-user-password-1)
-              AAD_TENANT_ID_2: $(java-spring-aad-tenant-id-2)
-              AAD_USER_NAME_2: $(java-spring-aad-user-name-2)
-              AAD_USER_PASSWORD_2: $(java-spring-aad-user-password-2)
-              AAD_MULTI_TENANT_CLIENT_ID: $(java-spring-aad-multi-tenant-client-id)
-              AAD_MULTI_TENANT_CLIENT_SECRET: $(java-spring-aad-multi-tenant-client-secret)
-              AAD_SINGLE_TENANT_CLIENT_ID: $(java-spring-aad-single-tenant-id)
-              AAD_SINGLE_TENANT_CLIENT_SECRET: $(java-spring-aad-single-tenant-secret)
-              AAD_SINGLE_TENANT_CLIENT_ID_WITH_ROLE: $(java-spring-aad-single-tenant-id-with-role)
-              AAD_SINGLE_TENANT_CLIENT_SECRET_WITH_ROLE: $(java-spring-aad-single-tenant-secret-with-role)
-              AAD_B2C_USER_EMAIL: "[email protected]"
-              AAD_B2C_TENANT: "B2CITTest1"
-              AAD_B2C_REPLY_URL: "http://localhost:8080/home"
-              AAD_B2C_SIGN_UP_OR_SIGN_IN: "B2C_1_signupsignin1"
-              AAD_B2C_PROFILE_EDIT: "B2C_1_profileediting1"
-              AAD_B2C_USER_PASSWORD: $(java-spring-aad-b2c-user-password)
-              AAD_B2C_CLIENT_ID: $(java-spring-aad-b2c-client-id)
-              AAD_B2C_CLIENT_SECRET: $(java-spring-aad-b2c-client-secret)
+        EnvVars:
+          AZURE_TEST_MODE: LIVE
+          AAD_TENANT_ID_1: $(java-spring-aad-tenant-id-1-cn)
+          AAD_USER_NAME_1: $(java-spring-aad-user-name-1-cn)
+          AAD_USER_PASSWORD_1: $(java-spring-aad-user-password-1-cn)
+          AAD_TENANT_ID_2: $(java-spring-aad-tenant-id-2-cn)
+          AAD_USER_NAME_2: $(java-spring-aad-user-name-2-cn)
+          AAD_USER_PASSWORD_2: $(java-spring-aad-user-password-2-cn)
+          AAD_MULTI_TENANT_CLIENT_ID: $(java-spring-aad-multi-tenant-client-id-cn)
+          AAD_MULTI_TENANT_CLIENT_SECRET: $(java-spring-aad-multi-tenant-client-secret-cn)
+          AAD_SINGLE_TENANT_CLIENT_ID: $(java-spring-aad-single-tenant-id-cn)
+          AAD_SINGLE_TENANT_CLIENT_SECRET: $(java-spring-aad-single-tenant-secret-cn)
+          AAD_SINGLE_TENANT_CLIENT_ID_WITH_ROLE: $(java-spring-aad-single-tenant-id-with-role-cn)
+          AAD_SINGLE_TENANT_CLIENT_SECRET_WITH_ROLE: $(java-spring-aad-single-tenant-secret-with-role-cn)
+          AAD_LOGIN_BASE_URL: https://login.partner.microsoftonline.cn
+          AAD_GRAPH_BASE_URL: https://microsoftgraph.chinacloudapi.cn