update smoke tests, ensure that the smoke test eligibility check passes

scbedd · scbedd · commit e68a7d56a649 · 2024-03-05T17:01:01.000-08:00
diff --git a/eng/pipelines/templates/jobs/smoke.tests.yml b/eng/pipelines/templates/jobs/smoke.tests.yml
@@ -13,8 +13,9 @@ jobs:
     - job: smoke_test_eligibility
       displayName: Check Smoke Test Eligibility
       pool:
-        name: "azsdk-pool-mms-ubuntu-2004-general"
-        vmImage: "MMSUbuntu20.04"
+        name: azsdk-pool-mms-ubuntu-2004-general
+        image: azsdk-pool-mms-ubuntu-2004-1espt
+        os: linux
       steps:
         - ${{ if and(ne(variables['Skip.Release'], 'true'), ne(parameters.Artifact.skipPublishPackage, 'true')) }}:
           - pwsh: |
@@ -34,7 +35,7 @@ jobs:
             RunSmokeTests: $(RunSmokeTests)
 
   - job: run_smoke_test
-    displayName: Run Smoke Test
+    displayName: Run Smoke Test Linux
     ${{ if eq(parameters.Daily, false) }}:
       dependsOn: smoke_test_eligibility
       condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['output_eligibility.RunSmokeTests'], true))
@@ -50,78 +51,100 @@ jobs:
           Python_27_Linux (AzureCloud):
             PythonVersion: '2.7'
             SkipAsyncInstall: true
-            Pool: "azsdk-pool-mms-ubuntu-2004-general"
-            OSVmImage: "MMSUbuntu20.04"
+            Pool: azsdk-pool-mms-ubuntu-2004-general
+            OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt
             SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
             ArmTemplateParameters: $(azureCloudArmParameters)
           Python_37_Linux (AzureCloud):
             PythonVersion: '3.7'
-            Pool: "azsdk-pool-mms-ubuntu-2004-general"
-            OSVmImage: "MMSUbuntu20.04"
+            Pool: azsdk-pool-mms-ubuntu-2004-general
+            OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt
             SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
             ArmTemplateParameters: $(azureCloudArmParameters)
           Python_38_Linux (AzureCloud Canary):
             PythonVersion: '3.8'
-            Pool: "azsdk-pool-mms-ubuntu-2004-general"
-            OSVmImage: "MMSUbuntu20.04"
+            Pool: azsdk-pool-mms-ubuntu-2004-general
+            OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt
             SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
             ArmTemplateParameters: $(azureCloudArmParameters)
             Location: 'eastus2euap'
+          Python_38_Linux (AzureUSGovernment):
+            PythonVersion: '3.8'
+            Pool: azsdk-pool-mms-ubuntu-2004-general
+            OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt
+            SubscriptionConfiguration: $(sub-config-gov-test-resources)
+            ArmTemplateParameters: $(azureUSGovernmentArmParameters)
+          Python_38_Linux (AzureChinaCloud):
+            PythonVersion: '3.8'
+            Pool: azsdk-pool-mms-ubuntu-2004-general
+            OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt
+            SubscriptionConfiguration: $(sub-config-cn-test-resources)
+            Location: 'chinanorth'
+            ArmTemplateParameters: $(azureChinaCloudArmParameters)
+
+    pool:
+      name: $(Pool)
+      vmImage: $(OSVmImage)
+      os: linux
+
+    variables:
+      - template: /eng/pipelines/templates/variables/globals.yml
+      - name: Location
+        value: ''
+      - name: azureCloudArmParameters
+        value: "@{ storageEndpointSuffix = 'core.windows.net'; azureCloud = 'AzureCloud'; }"
+      - name: azureUSGovernmentArmParameters
+        value: "@{ storageEndpointSuffix = 'core.usgovcloudapi.net'; azureCloud = 'AzureUSGovernment'; }"
+      - name: azureChinaCloudArmParameters
+        value: "@{ storageEndpointSuffix = 'core.chinacloudapi.cn'; azureCloud = 'AzureChinaCloud'; }"
+      - name: requirements
+        ${{ if eq(parameters.Daily, true) }}:
+          value: $(Build.SourcesDirectory)/common/smoketest/requirements.txt
+        ${{ if eq(parameters.Daily, false) }}:
+          value: $(Build.SourcesDirectory)/common/smoketest/requirements-release.txt
+
+    steps:
+      - template: /eng/pipelines/templates/steps/smoke-test-steps.yml
+
+
+
+  - job: run_smoke_test
+    displayName: Run Smoke Test Windows
+    ${{ if eq(parameters.Daily, false) }}:
+      dependsOn: smoke_test_eligibility
+      condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['output_eligibility.RunSmokeTests'], true))
+    strategy:
+      matrix:
+        ${{ if eq(parameters.Daily, true) }}:
           Python_37_Windows (AzureCloud):
             PythonVersion: '3.7'
-            Pool: "azsdk-pool-mms-win-2022-general"
-            OSVmImage: "MMS2022"
+            Pool: azsdk-pool-mms-win-2022-general
+            OSVmImage: azsdk-pool-mms-win-2022-1espt
             SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
             ArmTemplateParameters: $(azureCloudArmParameters)
           Python_38_Windows (AzureCloud):
             PythonVersion: '3.8'
-            Pool: "azsdk-pool-mms-ubuntu-2004-general"
-            OSVmImage: "MMSUbuntu20.04"
-            SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-            ArmTemplateParameters: $(azureCloudArmParameters)
-          Python_37_Mac (AzureCloud):
-            PythonVersion: '3.7'
-            Pool: Azure Pipelines
-            OSVmImage: macos-11
-            SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-            ArmTemplateParameters: $(azureCloudArmParameters)
-          Python_38_Mac (AzureCloud):
-            PythonVersion: '3.8'
-            Pool: Azure Pipelines
-            OSVmImage: macos-11
+            Pool: azsdk-pool-mms-win-2022-general
+            OSVmImage: azsdk-pool-mms-win-2022-1espt
             SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
             ArmTemplateParameters: $(azureCloudArmParameters)
-          Python_38_Linux (AzureUSGovernment):
-            PythonVersion: '3.8'
-            Pool: "azsdk-pool-mms-ubuntu-2004-general"
-            OSVmImage: "MMSUbuntu120.04"
-            SubscriptionConfiguration: $(sub-config-gov-test-resources)
-            ArmTemplateParameters: $(azureUSGovernmentArmParameters)
           Python_37_Windows (AzureUSGovernment):
             PythonVersion: '3.7'
-            Pool: "azsdk-pool-mms-ubuntu-2004-general"
-            OSVmImage: "MMSUbuntu20.04"
+            Pool: azsdk-pool-mms-win-2022-general
+            OSVmImage: azsdk-pool-mms-win-2022-1espt
             SubscriptionConfiguration: $(sub-config-gov-test-resources)
             ArmTemplateParameters: $(azureUSGovernmentArmParameters)
-          Python_38_Linux (AzureChinaCloud):
-            PythonVersion: '3.8'
-            Pool: "azsdk-pool-mms-ubuntu-2004-general"
-            OSVmImage: "MMSUbuntu20.04"
-            SubscriptionConfiguration: $(sub-config-cn-test-resources)
-            Location: 'chinanorth'
-            ArmTemplateParameters: $(azureChinaCloudArmParameters)
           Python_37_Windows (AzureChinaCloud):
             PythonVersion: '3.7'
-            Pool: "azsdk-pool-mms-ubuntu-2004-general"
-            OSVmImage: "MMSUbuntu20.04"
+            Pool: azsdk-pool-mms-win-2022-general
+            OSVmImage: azsdk-pool-mms-win-2022-1espt
             SubscriptionConfiguration: $(sub-config-cn-test-resources)
             Location: 'chinanorth'
             ArmTemplateParameters: $(azureChinaCloudArmParameters)
-        
     pool:
       name: $(Pool)
-      vmImage: $(OSVmImage)
-      os: $(os)
+      image: azsdk-pool-mms-win-2022-1espt
+      os: windows
 
     variables:
       - template: /eng/pipelines/templates/variables/globals.yml
@@ -140,107 +163,49 @@ jobs:
           value: $(Build.SourcesDirectory)/common/smoketest/requirements-release.txt
 
     steps:
-      - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
-        parameters:
-          AgentImage: $(OSVmImage)
-
-      - task: UsePythonVersion@0
-        displayName: "Use Python $(PythonVersion)"
-        inputs:
-          versionSpec: $(PythonVersion)
-
-      - script: |
-          python -m pip install pip==20.0.2
-          pip --version
-        displayName: pip --version
-
-      - ${{ if eq(parameters.Daily, false) }}:
-        - download: current
-          artifact: ${{ parameters.ArtifactName }}
-          timeoutInMinutes: 5
-
-        - pwsh: |
-            $packages = Get-ChildItem "$(Pipeline.Workspace)/${{ parameters.ArtifactName }}/${{ parameters.Artifact.name }}/*.tar.gz"
-            Write-Host "Artifacts found:"
-            $artifacts = $packages | ForEach-Object {
-              if ($_.Name -match "([a-zA-Z\-]+)\-(.*).tar.gz") {
-                Write-Host "$($matches[1]): $($matches[2])"
-                return @{ "name" = $matches[1]; "version" = $matches[2] }
-              }
-            }
-            if ($artifacts.name -notcontains "${{parameters.Artifact.name}}") {
-              Write-Host "Can't find package ${{parameters.Artifact.name}}"
-              exit 1
-            }
-            $dependencies = Get-Content $(requirements) | ForEach-Object {
-              $line = $_
-              if ($line -match "([a-zA-Z\-]+)(\W+)(.*)") {
-                  $override = ($artifacts | Where-Object { $_.Name -eq $matches[1] }).Version
-                  if ($override) {
-                      $line = $line -replace '([a-zA-Z\-]+)(\W+)(.*)', ('${1}${2}' + $override)
-                      Write-Host "Overriding dependency to: $line"
-                  }
-              }
-              return $line
-            }
-
-            $dependencies | Out-File $(requirements)
-
-          displayName: Override requirements with pipeline build artifact versions
-
-        # Retry for pip install due to delay in package availability after publish
-        # The package is expected to be available for download/installation within 10 minutes 
-        - pwsh: |
-            $ErrorActionPreference = "Continue"
-            while ($retries++ -lt 15) {
-              Write-Host "python -m pip install -r $(requirements) --no-deps --upgrade --no-cache-dir"
-              python -m pip install -r "$(requirements)" --no-deps --upgrade --no-cache-dir
-              if ($LASTEXITCODE) {
-                if ($retries -ge 15) {
-                  exit $LASTEXITCODE
-                }
-                Write-Host "Installation failed, retrying in 1 minute..."
-                sleep 60
-              } else {
-                break
-              }
-            }
-          displayName: Install requirements without dependencies
+      - template: /eng/pipelines/templates/steps/smoke-test-steps.yml
 
-      - ${{ if eq(parameters.Daily, true) }}:
-        - pwsh: |
-            python -m pip install -r "$(requirements)" --pre --no-deps --upgrade `
-              --index-url https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple
-
-          displayName: Install requirements from dev feed without dependencies
-
-      - pwsh: python -m pip install -r $(Build.SourcesDirectory)/common/smoketest/requirements_async.txt
-        displayName: "Install requirements_async.txt"
-        condition: and(succeeded(), ne(variables['SkipAsyncInstall'], true))
-
-      - pwsh: |
-          python $(Build.SourcesDirectory)/common/smoketest/dependencies.py -r "$(requirements)" `
-            | Out-File $(Build.SourcesDirectory)/common/smoketest/requirements_dependencies.txt
-        displayName: Create dependency list from installed packages
-
-      - script: python -m pip install -r $(Build.SourcesDirectory)/common/smoketest/requirements_dependencies.txt
-        displayName: Install package dependencies from PyPI
-
-      - script: python -m pip freeze
-        displayName: Show installed packages (pip freeze)
-
-      - template: /eng/common/TestResources/deploy-test-resources.yml
-        parameters:
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoketest/'
-          SubscriptionConfiguration: $(SubscriptionConfiguration)
-          Location: $(Location)
-          ArmTemplateParameters: $(ArmTemplateParameters)
+  - job: run_smoke_test
+    displayName: Run Smoke Test MacOS
+    ${{ if eq(parameters.Daily, false) }}:
+      dependsOn: smoke_test_eligibility
+      condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['output_eligibility.RunSmokeTests'], true))
+    strategy:
+      matrix:
+        ${{ if eq(parameters.Daily, true) }}:
+          Python_37_Mac (AzureCloud):
+            PythonVersion: '3.7'
+            Pool: Azure Pipelines
+            OSVmImage: macos-11
+            SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+            ArmTemplateParameters: $(azureCloudArmParameters)
+          Python_38_Mac (AzureCloud):
+            PythonVersion: '3.8'
+            Pool: Azure Pipelines
+            OSVmImage: macos-11
+            SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+            ArmTemplateParameters: $(azureCloudArmParameters)
 
-      - script: python $(Build.SourcesDirectory)/common/smoketest/program.py
-        displayName: Run Smoke Test
+    pool:
+      name: $(Pool)
+      vmImage: $(OSVmImage)
+      os: macOS
 
-      - template: /eng/common/TestResources/remove-test-resources.yml
-        parameters:
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoketest/'
-          SubscriptionConfiguration: $(SubscriptionConfiguration)
+    variables:
+      - template: /eng/pipelines/templates/variables/globals.yml
+      - name: Location
+        value: ''
+      - name: azureCloudArmParameters
+        value: "@{ storageEndpointSuffix = 'core.windows.net'; azureCloud = 'AzureCloud'; }"
+      - name: azureUSGovernmentArmParameters
+        value: "@{ storageEndpointSuffix = 'core.usgovcloudapi.net'; azureCloud = 'AzureUSGovernment'; }"
+      - name: azureChinaCloudArmParameters
+        value: "@{ storageEndpointSuffix = 'core.chinacloudapi.cn'; azureCloud = 'AzureChinaCloud'; }"
+      - name: requirements
+        ${{ if eq(parameters.Daily, true) }}:
+          value: $(Build.SourcesDirectory)/common/smoketest/requirements.txt
+        ${{ if eq(parameters.Daily, false) }}:
+          value: $(Build.SourcesDirectory)/common/smoketest/requirements-release.txt
 
+    steps:
+      - template: /eng/pipelines/templates/steps/smoke-test-steps.yml
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -91,7 +91,7 @@ extends:
   parameters:
     sdl:
       sourceAnalysisPool:
-        name: azsdk-pool-mms-win-2022-1es-pt
+        name: azsdk-pool-mms-win-2022-general
         image: azsdk-pool-mms-win-2022-1espt
         os: windows
       eslint:
diff --git a/eng/pipelines/templates/steps/smoke-test-steps.yml b/eng/pipelines/templates/steps/smoke-test-steps.yml
