From 3e4cc29aeed418addb5766644ce5e2f4d08603c3 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Fri, 13 Aug 2021 12:37:29 -0400 Subject: [PATCH 1/4] Checkout/Search 'sdk' directory in stress test release pipeline --- eng/pipelines/stress-test-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/stress-test-release.yml b/eng/pipelines/stress-test-release.yml index b430d433a73..22536abf269 100644 --- a/eng/pipelines/stress-test-release.yml +++ b/eng/pipelines/stress-test-release.yml @@ -72,6 +72,7 @@ jobs: WorkingDirectory: $(System.DefaultWorkingDirectory)/$(Repository) Paths: - '/tools' + - '/sdk' - '!sdk/**/test-recordings' - '!sdk/**/session-records' - '!sdk/**/SessionRecords' From 3dab59d28f11d3b250e14ae2f8c93b6627154bc9 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Fri, 13 Aug 2021 13:06:43 -0400 Subject: [PATCH 2/4] Use script path local to repository --- eng/pipelines/stress-test-release.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/pipelines/stress-test-release.yml b/eng/pipelines/stress-test-release.yml index 22536abf269..8731e8e9551 100644 --- a/eng/pipelines/stress-test-release.yml +++ b/eng/pipelines/stress-test-release.yml @@ -64,9 +64,6 @@ jobs: - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml parameters: Repositories: - - Name: Azure/azure-sdk-tools - Commitish: ${{ parameters.DeployFromBranchOrCommit }} - WorkingDirectory: $(System.DefaultWorkingDirectory)/Azure/azure-sdk-tools - Name: $(Repository) Commitish: ${{ parameters.DeployFromBranchOrCommit }} WorkingDirectory: $(System.DefaultWorkingDirectory)/$(Repository) @@ -82,7 +79,7 @@ jobs: inputs: azureSubscription: ${{ parameters.Subscription }} scriptType: pscore - scriptPath: $(System.DefaultWorkingDirectory)/Azure/azure-sdk-tools/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/$(Repository)/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 arguments: -SearchDirectory '$(System.DefaultWorkingDirectory)/$(Repository)' -Filters $(Filters) From 397ff5ac5e763fe550d935a6ffc85c9380e7ec5e Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Fri, 13 Aug 2021 13:33:55 -0400 Subject: [PATCH 3/4] Sparse checkout from root for stress test release --- eng/pipelines/stress-test-release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/pipelines/stress-test-release.yml b/eng/pipelines/stress-test-release.yml index 8731e8e9551..416ee8ff3bd 100644 --- a/eng/pipelines/stress-test-release.yml +++ b/eng/pipelines/stress-test-release.yml @@ -68,8 +68,7 @@ jobs: Commitish: ${{ parameters.DeployFromBranchOrCommit }} WorkingDirectory: $(System.DefaultWorkingDirectory)/$(Repository) Paths: - - '/tools' - - '/sdk' + - '/*' - '!sdk/**/test-recordings' - '!sdk/**/session-records' - '!sdk/**/SessionRecords' From 3bdc38878b2e78fccb343dd4b4ecc4d1e94944a4 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Fri, 13 Aug 2021 13:44:21 -0400 Subject: [PATCH 4/4] Prevent wildcard expansion in git sparse checkout add --- eng/common/pipelines/templates/steps/sparse-checkout.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/pipelines/templates/steps/sparse-checkout.yml b/eng/common/pipelines/templates/steps/sparse-checkout.yml index 50603bc35a2..5b36bf48e4a 100644 --- a/eng/common/pipelines/templates/steps/sparse-checkout.yml +++ b/eng/common/pipelines/templates/steps/sparse-checkout.yml @@ -25,8 +25,6 @@ steps: script: | function SparseCheckout([Array]$paths, [Hashtable]$repository) { - $paths = $paths -Join ' ' - $dir = $repository.WorkingDirectory if (!$dir) { $dir = "./$($repository.Name)" @@ -50,7 +48,9 @@ steps: git sparse-checkout set '/*' '!/*/' '/eng' } - $gitsparsecmd = "git sparse-checkout add $paths" + # Prevent wildcard expansion in Invoke-Expression (e.g. for checkout path '/*') + $quotedPaths = $paths | ForEach-Object { "'$_'" } + $gitsparsecmd = "git sparse-checkout add $quotedPaths" Write-Host $gitsparsecmd Invoke-Expression -Command $gitsparsecmd