From a15d3c39ee53944cabe8bedc9c0cd3ba645e6e3f Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 15 Jul 2022 17:30:51 -0700 Subject: [PATCH] [Perf] Extend from perf.yml under eng/common (#25223) - Convert parameter names from camelCase to PascalCase to follow convention --- eng/pipelines/templates/jobs/perf.yml | 148 +++++------------- sdk/storage/azure-storage-blob/perf.yml | 54 +++---- .../azure-storage-file-datalake/perf.yml | 54 +++---- sdk/storage/azure-storage-file-share/perf.yml | 54 +++---- 4 files changed, 123 insertions(+), 187 deletions(-) diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml index 578c63428bef..c2d1c6ddbef0 100644 --- a/eng/pipelines/templates/jobs/perf.yml +++ b/eng/pipelines/templates/jobs/perf.yml @@ -1,111 +1,47 @@ parameters: - - name: serviceDirectory - type: string - default: '' - - name: services - type: string - default: '' - - name: packageVersions - type: string - default: '.*' - - name: tests - type: string - default: '' - - name: arguments - type: string - default: '' - - name: iterations - type: number - default: '5' - - name: envVars - type: object - default: {} - - name: additionalArguments - type: string - default: '' - -variables: - - template: /eng/pipelines/templates/variables/globals.yml - - name: Pool - value: 'azsdk-pool-mms-ubuntu-2004-perf' - - name: OSVmImage - value: 'MMSUbuntu20.04' - - name: PythonVersion - value: '3.7' - -resources: - repositories: - - repository: azure-sdk-tools - type: github - endpoint: Azure - name: Azure/azure-sdk-tools - -jobs: -- job: Perf - timeoutInMinutes: 360 - pool: - name: $(Pool) - vmImage: $(OSVmImage) - steps: - - checkout: self - path: s - - - checkout: azure-sdk-tools - path: s/azure-sdk-tools - - - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml - parameters: - AgentImage: $(OSVmImage) - +- name: ServiceDirectory + type: string + default: '' +- name: Services + type: string + default: '' +- name: PackageVersions + type: string + default: '.*' +- name: Tests + type: string + default: '.*' +- name: Arguments + type: string + default: '.*' +- name: Iterations + type: number + default: '5' +- name: AdditionalArguments + type: string + default: '' +- name: EnvVars + type: object + default: {} + +extends: + template: /eng/common/pipelines/templates/jobs/perf.yml + parameters: + Variables: + - template: /eng/pipelines/templates/variables/globals.yml + - name: PythonVersion + value: '3.7' + Language: Python + InstallLanguageSteps: - task: UsePythonVersion@0 displayName: "Use Python $(PythonVersion)" inputs: versionSpec: $(PythonVersion) - - - template: /eng/common/TestResources/deploy-test-resources.yml - parameters: - ServiceDirectory: ${{ parameters.serviceDirectory }} - Location: westus - ResourceType: perf - - - pwsh: | - set-content -path config.yml -value "WorkingDirectories:" - add-content -path config.yml -value " Python: $(Agent.BuildDirectory)/s" - workingDirectory: azure-sdk-tools/tools/perf-automation/Azure.Sdk.Tools.PerfAutomation - displayName: Create config.yml - - - script: >- - dotnet run -- run - --no-sync - --languages python - --services "${{ parameters.services }}" - --package-versions "${{ parameters.packageVersions }}" - --tests "${{ parameters.tests }}" - --arguments "${{ parameters.arguments }}" - --iterations ${{ parameters.iterations }} - ${{ parameters.additionalArguments }} - workingDirectory: azure-sdk-tools/tools/perf-automation/Azure.Sdk.Tools.PerfAutomation - env: - ${{ each var in parameters.EnvVars }}: - ${{ var.key }}: ${{ var.value }} - displayName: Run perf tests - - - pwsh: | - get-content results.csv - workingDirectory: azure-sdk-tools/tools/perf-automation/Azure.Sdk.Tools.PerfAutomation/results - displayName: Print results.csv - - - pwsh: | - get-content results.json - workingDirectory: azure-sdk-tools/tools/perf-automation/Azure.Sdk.Tools.PerfAutomation/results - displayName: Print results.json - - - template: /eng/common/TestResources/remove-test-resources.yml - parameters: - ServiceDirectory: ${{ parameters.serviceDirectory }} - ResourceType: perf - - - task: PublishPipelineArtifact@1 - inputs: - targetPath: azure-sdk-tools/tools/perf-automation/Azure.Sdk.Tools.PerfAutomation/results - artifactName: results + ServiceDirectory: ${{ parameters.ServiceDirectory }} + Services: ${{ parameters.Services }} + PackageVersions: ${{ parameters.PackageVersions }} + Tests: ${{ parameters.Tests }} + Arguments: ${{ parameters.Arguments }} + Iterations: ${{ parameters.Iterations }} + AdditionalArguments: ${{ parameters.AdditionalArguments }} + EnvVars: ${{ parameters.EnvVars}} diff --git a/sdk/storage/azure-storage-blob/perf.yml b/sdk/storage/azure-storage-blob/perf.yml index 3f33cf1a74e0..6c59ad772b00 100644 --- a/sdk/storage/azure-storage-blob/perf.yml +++ b/sdk/storage/azure-storage-blob/perf.yml @@ -1,32 +1,32 @@ parameters: - - name: packageVersions - displayName: PackageVersions (regex of package versions to run) - type: string - default: '12|source' - - name: tests - displayName: Tests (regex of tests to run) - type: string - default: '^(download|upload|list-blobs)$' - - name: arguments - displayName: Arguments (regex of arguments to run) - type: string - default: '(10240)|(10485760)|(1073741824)|(5 )|(500 )|(50000 )' - - name: iterations - displayName: Iterations (times to run each test) - type: number - default: '5' - - name: additionalArguments - displayName: AdditionalArguments (passed to PerfAutomation) - type: string - default: ' ' +- name: PackageVersions + displayName: PackageVersions (regex of package versions to run) + type: string + default: '12|source' +- name: Tests + displayName: Tests (regex of tests to run) + type: string + default: '^(download|upload|list-blobs)$' +- name: Arguments + displayName: Arguments (regex of arguments to run) + type: string + default: '(10240)|(10485760)|(1073741824)|(5 )|(500 )|(50000 )' +- name: Iterations + displayName: Iterations (times to run each test) + type: number + default: '5' +- name: AdditionalArguments + displayName: AdditionalArguments (passed to PerfAutomation) + type: string + default: ' ' extends: template: /eng/pipelines/templates/jobs/perf.yml parameters: - serviceDirectory: storage/azure-storage-blob - services: "^storage-blob$" - packageVersions: ${{ parameters.packageVersions }} - tests: ${{ parameters.tests }} - arguments: ${{ parameters.arguments }} - iterations: ${{ parameters.iterations }} - additionalArguments: ${{ parameters.additionalArguments }} + ServiceDirectory: storage/azure-storage-blob + Services: "^storage-blob$" + PackageVersions: ${{ parameters.PackageVersions }} + Tests: ${{ parameters.Tests }} + Arguments: ${{ parameters.Arguments }} + Iterations: ${{ parameters.Iterations }} + AdditionalArguments: ${{ parameters.AdditionalArguments }} diff --git a/sdk/storage/azure-storage-file-datalake/perf.yml b/sdk/storage/azure-storage-file-datalake/perf.yml index a09b4aa53fea..1993d7769d6d 100644 --- a/sdk/storage/azure-storage-file-datalake/perf.yml +++ b/sdk/storage/azure-storage-file-datalake/perf.yml @@ -1,32 +1,32 @@ parameters: - - name: packageVersions - displayName: PackageVersions (regex of package versions to run) - type: string - default: '12|source' - - name: tests - displayName: Tests (regex of tests to run) - type: string - default: '^(download|upload)$' - - name: arguments - displayName: Arguments (regex of arguments to run) - type: string - default: '(10240)|(10485760)|(1073741824)' - - name: iterations - displayName: Iterations (times to run each test) - type: number - default: '5' - - name: additionalArguments - displayName: AdditionalArguments (passed to PerfAutomation) - type: string - default: ' ' +- name: PackageVersions + displayName: PackageVersions (regex of package versions to run) + type: string + default: '12|source' +- name: Tests + displayName: Tests (regex of tests to run) + type: string + default: '^(download|upload)$' +- name: Arguments + displayName: Arguments (regex of arguments to run) + type: string + default: '(10240)|(10485760)|(1073741824)' +- name: Iterations + displayName: Iterations (times to run each test) + type: number + default: '5' +- name: AdditionalArguments + displayName: AdditionalArguments (passed to PerfAutomation) + type: string + default: ' ' extends: template: /eng/pipelines/templates/jobs/perf.yml parameters: - serviceDirectory: storage/azure-storage-file-datalake - services: "^storage-file-datalake$" - packageVersions: ${{ parameters.packageVersions }} - tests: ${{ parameters.tests }} - arguments: ${{ parameters.arguments }} - iterations: ${{ parameters.iterations }} - additionalArguments: ${{ parameters.additionalArguments }} + ServiceDirectory: storage/azure-storage-file-datalake + Services: "^storage-file-datalake$" + PackageVersions: ${{ parameters.PackageVersions }} + Tests: ${{ parameters.Tests }} + Arguments: ${{ parameters.Arguments }} + Iterations: ${{ parameters.Iterations }} + AdditionalArguments: ${{ parameters.AdditionalArguments }} diff --git a/sdk/storage/azure-storage-file-share/perf.yml b/sdk/storage/azure-storage-file-share/perf.yml index a04a0e788733..03d90933f08f 100644 --- a/sdk/storage/azure-storage-file-share/perf.yml +++ b/sdk/storage/azure-storage-file-share/perf.yml @@ -1,32 +1,32 @@ parameters: - - name: packageVersions - displayName: PackageVersions (regex of package versions to run) - type: string - default: '12|source' - - name: tests - displayName: Tests (regex of tests to run) - type: string - default: '^(download|upload)$' - - name: arguments - displayName: Arguments (regex of arguments to run) - type: string - default: '(10240)|(10485760)|(1073741824)' - - name: iterations - displayName: Iterations (times to run each test) - type: number - default: '5' - - name: additionalArguments - displayName: AdditionalArguments (passed to PerfAutomation) - type: string - default: ' ' +- name: PackageVersions + displayName: PackageVersions (regex of package versions to run) + type: string + default: '12|source' +- name: Tests + displayName: Tests (regex of tests to run) + type: string + default: '^(download|upload)$' +- name: Arguments + displayName: Arguments (regex of arguments to run) + type: string + default: '(10240)|(10485760)|(1073741824)' +- name: Iterations + displayName: Iterations (times to run each test) + type: number + default: '5' +- name: AdditionalArguments + displayName: AdditionalArguments (passed to PerfAutomation) + type: string + default: ' ' extends: template: /eng/pipelines/templates/jobs/perf.yml parameters: - serviceDirectory: storage/azure-storage-file-share - services: "^storage-file-share$" - packageVersions: ${{ parameters.packageVersions }} - tests: ${{ parameters.tests }} - arguments: ${{ parameters.arguments }} - iterations: ${{ parameters.iterations }} - additionalArguments: ${{ parameters.additionalArguments }} + ServiceDirectory: storage/azure-storage-file-share + Services: "^storage-file-share$" + PackageVersions: ${{ parameters.PackageVersions }} + Tests: ${{ parameters.Tests }} + Arguments: ${{ parameters.Arguments }} + Iterations: ${{ parameters.Iterations }} + AdditionalArguments: ${{ parameters.AdditionalArguments }}