Skip to content

Catching up on fixes to the Azure DevOps pipeline. #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Dec 23, 2021
Merged

Catching up on fixes to the Azure DevOps pipeline. #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
495f014
Updated to use new service principal
lizbaron Dec 22, 2021
795133b
Merge pull request #129 from tSQLt-org/fixServicePrinciapl
mbt1 Dec 22, 2021
25755af
testing new value
lizbaron Dec 22, 2021
b8206b2
made up some parameters
lizbaron Dec 22, 2021
079c6c8
Perhaps this change will fix, "Invalid Logical Unit numbers specified…
lizbaron Dec 22, 2021
f955b2e
starting at zero for LUNs
lizbaron Dec 22, 2021
e05b3f3
nothing works. Everything is terrible.
lizbaron Dec 22, 2021
b93c087
Add a data disk to the vm, because we seem to get an error for Log an…
lizbaron Dec 23, 2021
0700870
can we do this without luns?
lizbaron Dec 23, 2021
5e26a8e
that didn't work, let's try something else
lizbaron Dec 23, 2021
c158991
What will happen if I specify a LUN=0 but use C drive???
lizbaron Dec 23, 2021
0d2949c
going back to the last working version
lizbaron Dec 23, 2021
31ffbc3
Merge pull request #130 from tSQLt-org/fixSQLVM
mbt1 Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CI/Azure-DevOps/AZ_MainPipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ stages:

- task: AzureKeyVault@1
inputs:
azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
KeyVaultName: 'tSQLtSigningKey'

- task: PowerShell@2
Expand All @@ -112,7 +112,7 @@ stages:
SQLPORTMINIMUM: $(SqlPortMinimum)
SQLPORTMAXIMUM: $(SqlPortMaximum)
inputs:
azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
azurePowerShellVersion: 'LatestVersion'
scriptType: ps
scriptLocation: inlineScript
Expand Down Expand Up @@ -199,7 +199,7 @@ stages:

- task: AzureKeyVault@1
inputs:
azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
KeyVaultName: 'tSQLtSigningKey'

- task: PowerShell@2
Expand Down Expand Up @@ -407,7 +407,7 @@ stages:

- task: AzureKeyVault@1
inputs:
azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
KeyVaultName: 'tSQLtSigningKey'

- task: PowerShell@2
Expand Down Expand Up @@ -646,7 +646,7 @@ stages:
- task: AzureCLI@2
name: DeleteAzureVM
inputs:
azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
azurePowerShellVersion: 'LatestVersion'
scriptType: ps
scriptLocation: inlineScript
Expand Down
4 changes: 2 additions & 2 deletions CI/Azure-DevOps/CreateSQLVM_azcli.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Log-Output "Creating VM $VMName";

$output = az vm create --name "$VMName" --resource-group "$ResourceGroupName" --location "$Location" --admin-password "$VMAdminPwd" `
--admin-username "$VMAdminName" --computer-name "$VMName" --image "$ImageUrn" --nics "$InterfaceName" --priority Spot `
--size $Size | ConvertFrom-Json;
--size $Size --data-disk-sizes-gb 8 | ConvertFrom-Json;
if (!$output) {
Log-Output "VMName: ", $VMName;
Log-Output "ResourceGroupName: ", $ResourceGroupName;
Expand All @@ -154,7 +154,7 @@ $output = az deployment group create --resource-group $ResourceGroupName --templ
if (!$output) {
Write-Error "Error creating SqlVM";
return;
}
}
$SQLVM|Out-String|Log-Output;
Log-Output 'DONE: Applying SqlVM Config'

Expand Down
18 changes: 17 additions & 1 deletion CI/Azure-DevOps/CreateSqlVirtualMachineTemplate.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
param sqlConnectivityType string = 'Public'
param sqlPortNumber int = 41433
param sqlStorageWorkloadType string = 'DW'
param sqlStorageWorkloadType string = 'General'
param sqlStorageDisksConfigurationType string = 'NEW'
param sqlDataSettingsDefaultFilePath string = 'F:\\data'
param sqlDataSettingsLUNs array = [
0
]
param sqlLogSettingsDefaultFilePath string = 'F:\\log'
param sqlLogSettingsLUNs array = [
0
]
param sqlAutopatchingDayOfWeek string = 'Sunday'
param sqlAutopatchingStartHour int = 2
param sqlAutopatchingWindowDuration int = 60
Expand Down Expand Up @@ -29,6 +37,14 @@ resource newVMName_resource 'Microsoft.SqlVirtualMachine/SqlVirtualMachines@2017
}
storageConfigurationSettings: {
diskConfigurationType: sqlStorageDisksConfigurationType
sqlDataSettings : {
luns: sqlDataSettingsLUNs
defaultFilePath: sqlDataSettingsDefaultFilePath
}
sqlLogSettings: {
luns: sqlLogSettingsLUNs
defaultFilePath: sqlLogSettingsDefaultFilePath
}
storageWorkloadType: sqlStorageWorkloadType
}
serverConfigurationsManagementSettings: {
Expand Down