Skip to content

Commit 634627a

Browse files
fabiocavfabiocav
authored
Updating Host CI lease access (#10294)
1 parent b691e04 commit 634627a

File tree

5 files changed

+38
-56
lines changed

5 files changed

+38
-56
lines changed

‎azure-pipelines.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,12 @@ jobs:
313313
targetType: 'inline'
314314
script: 'Install-Module -Name Az.Storage -RequiredVersion 1.11.0 -Scope CurrentUser -Force -AllowClobber'
315315

316-
- task: AzureKeyVault@1
317-
inputs:
318-
# Note: This is actually a Service Connection in DevOps, not an Azure subscription name
319-
azureSubscription: 'Azure-Functions-Host-CI'
320-
keyVaultName: 'azure-functions-host-ci'
321-
secretsFilter: '*'
322-
- task: PowerShell@2
316+
- task: AzurePowerShell@5
323317
displayName: 'Checkout secrets'
324318
inputs:
325-
filePath: '$(Build.Repository.LocalPath)\build\checkout-secrets.ps1'
326-
arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'''
319+
azureSubscription: Azure-Functions-Host-CI
320+
ScriptPath: '$(Build.Repository.LocalPath)\build\checkout-secrets.ps1'
321+
azurePowerShellVersion: 'LatestVersion'
327322
- task: AzureKeyVault@1
328323
inputs:
329324
# Note: This is actually a Service Connection in DevOps, not an Azure subscription name
@@ -348,12 +343,14 @@ jobs:
348343
AzureWebJobsSecretStorageKeyVaultTenantId: $(AzureTenantId)
349344
AzureWebJobsSecretStorageKeyVaultClientId: $(AzureClientId)
350345
AzureWebJobsSecretStorageKeyVaultClientSecret: $(AzureClientSecret)
351-
- task: PowerShell@2
346+
- task: AzurePowerShell@5
352347
condition: always()
353348
displayName: 'Checkin secrets'
354349
inputs:
355-
filePath: '$(Build.Repository.LocalPath)\build\checkin-secrets.ps1'
356-
arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'' -leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'
350+
azureSubscription: Azure-Functions-Host-CI
351+
ScriptPath: '$(Build.Repository.LocalPath)\build\checkin-secrets.ps1'
352+
arguments: '-leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'
353+
azurePowerShellVersion: 'LatestVersion'
357354

358355
- job: RunIntegrationTests
359356
pool:
@@ -385,11 +382,12 @@ jobs:
385382
azureSubscription: 'Azure-Functions-Host-CI'
386383
keyVaultName: 'azure-functions-host-ci'
387384
secretsFilter: '*'
388-
- task: PowerShell@2
385+
- task: AzurePowerShell@5
389386
displayName: 'Checkout secrets'
390387
inputs:
391-
filePath: '$(Build.Repository.LocalPath)\build\checkout-secrets.ps1'
392-
arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'''
388+
azureSubscription: Azure-Functions-Host-CI
389+
ScriptPath: '$(Build.Repository.LocalPath)\build\checkout-secrets.ps1'
390+
azurePowerShellVersion: 'LatestVersion'
393391
- task: AzureKeyVault@1
394392
inputs:
395393
# Note: This is actually a Service Connection in DevOps, not an Azure subscription name
@@ -535,9 +533,11 @@ jobs:
535533
arguments: '--filter "Group=ReleaseTests" --no-build'
536534
projects: |
537535
**\WebJobs.Script.Tests.Integration.csproj
538-
- task: PowerShell@2
536+
- task: AzurePowerShell@5
539537
condition: always()
540538
displayName: 'Checkin secrets'
541539
inputs:
542-
filePath: '$(Build.Repository.LocalPath)\build\checkin-secrets.ps1'
543-
arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'' -leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'
540+
azureSubscription: Azure-Functions-Host-CI
541+
ScriptPath: '$(Build.Repository.LocalPath)\build\checkin-secrets.ps1'
542+
arguments: '-leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'
543+
azurePowerShellVersion: 'LatestVersion'

‎build/checkin-secrets.ps1‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
param (
2-
[string]$connectionString = "",
32
[string]$leaseBlob = "",
43
[string]$leaseToken = ""
54
)
@@ -16,7 +15,7 @@ if ($leaseToken -eq "") {
1615

1716
Write-Host "Breaking lease for $leaseBlob."
1817

19-
$storageContext = New-AzStorageContext -ConnectionString $connectionString
18+
$storageContext = New-AzStorageContext -StorageAccountName "azurefunctionshostci0" -UseConnectedAccount
2019
$blob = Get-AzStorageBlob -Context $storageContext -Container "ci-locks" -Blob $leaseBlob
2120

2221
$accessCondition = New-Object -TypeName Microsoft.Azure.Storage.AccessCondition

‎build/checkout-secrets.ps1‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
param (
2-
[string]$connectionString = ""
3-
)
4-
51
function AcquireLease($blob) {
62
try {
73
return $blob.ICloudBlob.AcquireLease($null, $null, $null, $null, $null)
@@ -14,15 +10,10 @@ function AcquireLease($blob) {
1410
# use this for tracking metadata in lease blobs
1511
$buildName = "3.0." + $env:buildNumber + "_" + $env:SYSTEM_JOBDISPLAYNAME
1612

17-
$azVersion = "1.11.0"
1813
Import-Module Az.Storage
19-
$azModule = Get-Module -Name Az.Storage
20-
if ($azModule.Version -ne $azVersion) {
21-
throw "Az.Storage module version $azVersion was not found. Current version: $($azModule.Version)"
22-
}
2314

2415
# get a blob lease to prevent test overlap
25-
$storageContext = New-AzStorageContext -ConnectionString $connectionString
16+
$storageContext = New-AzStorageContext -StorageAccountName "azurefunctionshostci0" -UseConnectedAccount
2617

2718
While($true) {
2819
$blobs = Get-AzStorageBlob -Context $storageContext -Container "ci-locks"

‎eng/ci/templates/official/jobs/run-integration-tests.yml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,12 @@ jobs:
4141
command: ci
4242
workingDir: sample/CustomHandlerRetry
4343

44-
- task: AzureKeyVault@1
45-
inputs:
46-
# Note: This is actually a Service Connection in DevOps, not an Azure subscription name
47-
azureSubscription: Azure-Functions-Host-CI-internal
48-
keyVaultName: azure-functions-host-ci
49-
secretsFilter: '*'
50-
51-
- task: PowerShell@2
44+
- task: AzurePowerShell@5
5245
displayName: Checkout secrets
5346
inputs:
54-
filePath: build/checkout-secrets.ps1
55-
arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'''
47+
azureSubscription: Azure-Functions-Host-CI-internal
48+
azurePowerShellVersion: 'LatestVersion'
49+
ScriptPath: build/checkout-secrets.ps1
5650

5751
- task: AzureKeyVault@1
5852
inputs:
@@ -201,9 +195,11 @@ jobs:
201195
arguments: '--filter "Group=ReleaseTests" --no-build'
202196
projects: $(IntegrationProject)
203197

204-
- task: PowerShell@2
198+
- task: AzurePowerShell@5
205199
condition: always()
206200
displayName: Checkin secrets
207201
inputs:
208-
filePath: build/checkin-secrets.ps1
209-
arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'' -leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'
202+
azureSubscription: Azure-Functions-Host-CI-internal
203+
azurePowerShellVersion: 'LatestVersion'
204+
ScriptPath: build/checkin-secrets.ps1
205+
arguments: '-leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'

‎eng/ci/templates/official/jobs/run-non-e2e-tests.yml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,12 @@ jobs:
2929
targetType: inline
3030
script: 'Install-Module -Name Az.Storage -RequiredVersion 1.11.0 -Scope CurrentUser -Force -AllowClobber'
3131

32-
- task: AzureKeyVault@1
33-
inputs:
34-
# Note: This is actually a Service Connection in DevOps, not an Azure subscription name
35-
azureSubscription: Azure-Functions-Host-CI-internal
36-
keyVaultName: azure-functions-host-ci
37-
secretsFilter: '*'
38-
39-
- task: PowerShell@2
32+
- task: AzurePowerShell@5
4033
displayName: Checkout secrets
4134
inputs:
42-
filePath: build/checkout-secrets.ps1
43-
arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'''
35+
azureSubscription: Azure-Functions-Host-CI-internal
36+
azurePowerShellVersion: 'LatestVersion'
37+
ScriptPath: build/checkout-secrets.ps1
4438

4539
- task: AzureKeyVault@1
4640
inputs:
@@ -73,9 +67,11 @@ jobs:
7367
AzureWebJobsSecretStorageKeyVaultClientId: $(AzureClientId)
7468
AzureWebJobsSecretStorageKeyVaultClientSecret: $(AzureClientSecret)
7569

76-
- task: PowerShell@2
70+
- task: AzurePowerShell@5
7771
condition: always()
7872
displayName: Checkin secrets
7973
inputs:
80-
filePath: build/checkin-secrets.ps1
81-
arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'' -leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'
74+
azureSubscription: Azure-Functions-Host-CI-internal
75+
azurePowerShellVersion: 'LatestVersion'
76+
ScriptPath: build/checkin-secrets.ps1
77+
arguments: '-leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'

0 commit comments

Comments
 (0)