From 93f0ede6ebaa5778339dfff3e36718a0d3cc22cc Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 6 Jan 2023 16:43:36 -0800 Subject: [PATCH 1/6] Remove language from profile zip --- eng/common/pipelines/templates/jobs/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index b19bd5c88b..b6a75436fa 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -173,7 +173,7 @@ jobs: - task: PublishPipelineArtifact@1 inputs: - targetPath: $(System.DefaultWorkingDirectory)/${{ parameters.Language }}-profile.zip + targetPath: $(System.DefaultWorkingDirectory)/profile.zip artifactName: ${{ parameters.Language }}-profile.zip condition: ${{ parameters.Profile }} From 7aa7e15a9bc6b4d659d08d5f78a4d6519b366c79 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 6 Jan 2023 17:00:02 -0800 Subject: [PATCH 2/6] Revert "Remove language from profile zip" This reverts commit 2f670435b25f89955338170a7bdfbe4432cbe23f. --- eng/common/pipelines/templates/jobs/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index b6a75436fa..b19bd5c88b 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -173,7 +173,7 @@ jobs: - task: PublishPipelineArtifact@1 inputs: - targetPath: $(System.DefaultWorkingDirectory)/profile.zip + targetPath: $(System.DefaultWorkingDirectory)/${{ parameters.Language }}-profile.zip artifactName: ${{ parameters.Language }}-profile.zip condition: ${{ parameters.Profile }} From 7a2277743888827bead1a802234c36be9138b2d0 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 23 Jan 2023 23:00:20 -0800 Subject: [PATCH 3/6] Remove Services parameter --- eng/common/pipelines/templates/jobs/perf.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index b19bd5c88b..28d9a0bd2a 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -38,9 +38,6 @@ parameters: - name: ServiceDirectory type: string default: '' -- name: Services - type: string - default: '' - name: PackageVersions type: string default: '.*' @@ -118,17 +115,12 @@ jobs: Location: westus ResourceType: perf - - pwsh: | - set-content -path config.yml -value "WorkingDirectories:" - add-content -path config.yml -value " ${{ parameters.Language }}: $(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 ${{ parameters.Language }} - --services "${{ parameters.Services }}" + --language ${{ parameters.Language }} + --repo-root $(System.DefaultWorkingDirectory) + --tests-file $(System.DefaultWorkingDirectory)/${{ parameters.ServiceDirectory }}/perf-tests.yml --package-versions "${{ parameters.PackageVersions }}" --tests "${{ parameters.Tests }}" --arguments "${{ parameters.Arguments }}" From ad751987f0de0122c8bd1525e058b0db14bfdd06 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 23 Jan 2023 23:23:30 -0800 Subject: [PATCH 4/6] Fix path to tests-file --- eng/common/pipelines/templates/jobs/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index 28d9a0bd2a..671e6f0d3a 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -120,7 +120,7 @@ jobs: --no-sync --language ${{ parameters.Language }} --repo-root $(System.DefaultWorkingDirectory) - --tests-file $(System.DefaultWorkingDirectory)/${{ parameters.ServiceDirectory }}/perf-tests.yml + --tests-file $(System.DefaultWorkingDirectory)/sdk/${{ parameters.ServiceDirectory }}/perf-tests.yml --package-versions "${{ parameters.PackageVersions }}" --tests "${{ parameters.Tests }}" --arguments "${{ parameters.Arguments }}" From fb7b18f27f00b056dd549a8a5f1c7d7a727925dd Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 26 Jan 2023 22:19:28 -0800 Subject: [PATCH 5/6] Run both sync and async tests by default --- eng/common/pipelines/templates/jobs/perf.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index 671e6f0d3a..3d52542ad9 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -117,7 +117,6 @@ jobs: - script: >- dotnet run -- run - --no-sync --language ${{ parameters.Language }} --repo-root $(System.DefaultWorkingDirectory) --tests-file $(System.DefaultWorkingDirectory)/sdk/${{ parameters.ServiceDirectory }}/perf-tests.yml From 22e384baae6fe2d864cbbdf76a47ef48708e56cd Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 31 Jan 2023 14:24:19 -0800 Subject: [PATCH 6/6] Add LanguageVersion to common perf.yml --- eng/common/pipelines/templates/jobs/perf.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index 3d52542ad9..ff2d531625 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -17,6 +17,9 @@ parameters: - name: Language type: string default: '' +- name: LanguageVersion + type: string + default: '' - name: LanguageRepoName type: string default: $(Build.Repository.Name) @@ -118,6 +121,7 @@ jobs: - script: >- dotnet run -- run --language ${{ parameters.Language }} + --language-version ${{ parameters.LanguageVersion }} --repo-root $(System.DefaultWorkingDirectory) --tests-file $(System.DefaultWorkingDirectory)/sdk/${{ parameters.ServiceDirectory }}/perf-tests.yml --package-versions "${{ parameters.PackageVersions }}"