Skip to content

Commit 60a1cc8

Browse files
authored
Merge pull request #199 from tSQLt-org/fix-tSQLt-CI-Nightly-Cleanup
using new " azureSubscription: 'tSQLt CI - Nightly Cleanup - Service Connection'" to authenticate
2 parents f724ad2 + 1d28ae3 commit 60a1cc8

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

CI/Azure-DevOps/AZ_MainPipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ stages:
102102

103103
- task: AzureKeyVault@1
104104
inputs:
105-
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
105+
azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
106106
KeyVaultName: 'tSQLtSigningKey'
107107
SecretsFilter: '*'
108108
RunAsPreJob: false
@@ -130,7 +130,7 @@ stages:
130130
SQLPORTMINIMUM: $(SqlPortMinimum)
131131
SQLPORTMAXIMUM: $(SqlPortMaximum)
132132
inputs:
133-
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
133+
azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
134134
azurePowerShellVersion: 'LatestVersion'
135135
scriptType: ps
136136
scriptLocation: inlineScript
@@ -218,7 +218,7 @@ stages:
218218

219219
- task: AzureKeyVault@1
220220
inputs:
221-
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
221+
azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
222222
KeyVaultName: 'tSQLtSigningKey'
223223

224224
- task: PowerShell@2
@@ -426,7 +426,7 @@ stages:
426426

427427
- task: AzureKeyVault@1
428428
inputs:
429-
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
429+
azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
430430
KeyVaultName: 'tSQLtSigningKey'
431431

432432
- task: PowerShell@2
@@ -665,7 +665,7 @@ stages:
665665
- task: AzureCLI@2
666666
name: DeleteAzureVM
667667
inputs:
668-
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
668+
azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
669669
azurePowerShellVersion: 'LatestVersion'
670670
scriptType: ps
671671
scriptLocation: inlineScript

CI/Azure-DevOps/AZ_NightlyCleanup.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# https://aka.ms/yaml
55

66
pool:
7-
vmImage: 'vs2017-win2016'
7+
vmImage: 'windows-latest' #requires windows for azure authentication
88

99
schedules:
1010
- cron: 1 16 * * *
@@ -35,11 +35,10 @@ steps:
3535
AZURE_DEVOPS_EXT_PAT: $(tSQLtCIAzureCLIPatToken)
3636
## black magic: this token ^^^^ is required to make "az pipelines runs show" work below
3737
inputs:
38-
azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
38+
azureSubscription: 'tSQLt CI - Nightly Cleanup - Service Connection'
3939
scriptType: 'ps'
4040
scriptLocation: 'inlineScript'
4141
inlineScript: |
42-
4342
##Functions
4443
$GetAll_tSQLtCI_RGs = {
4544
param();
@@ -141,7 +140,7 @@ steps:
141140
- task: AzurePowerShell@4
142141
name: print_stuff
143142
inputs:
144-
azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
143+
azureSubscription: 'tSQLt CI - Nightly Cleanup - Service Connection'
145144
azurePowerShellVersion: 'LatestVersion'
146145
failOnStandardError: True
147146
ScriptType: 'InlineScript'
@@ -159,7 +158,7 @@ steps:
159158
condition: succeeded()
160159
name: Delete_RGs
161160
inputs:
162-
azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
161+
azureSubscription: 'tSQLt CI - Nightly Cleanup - Service Connection'
163162
azurePowerShellVersion: 'LatestVersion'
164163
FailOnStandardError: true
165164
ScriptType: 'InlineScript'
@@ -225,7 +224,7 @@ steps:
225224
name: AssertDeleteSuccessful
226225
condition: always()
227226
inputs:
228-
azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
227+
azureSubscription: 'tSQLt CI - Nightly Cleanup - Service Connection'
229228
azurePowerShellVersion: 'LatestVersion'
230229
failOnStandardError: True
231230
ScriptType: 'InlineScript'

0 commit comments

Comments
 (0)