Merge pull request #137 from tSQLt-org/Fix-Main-Azure-Build-pipeline-is-not-rerunnable-#135

Fix main azure build pipeline is not rerunnable #135

Author: mbt1

CI/Azure-DevOps/AZ_MainPipeline.yml

@@ -23,7 +23,14 @@ parameters: # TODO, these don't work for scheduled pipelines, not even the defau
       SQLVersionEdition: 2017
     - name: SQL2019
       SQLVersionEdition: 2019
-
+  - name: VMPriority
+    displayName: VM Priority
+    type: string
+    default: Spot
+    values:
+    - Spot
+    - Regular
+    - Low
 
 variables:
   - name: ArtifactBranchName
@@ -77,6 +84,7 @@ stages:
         ${{ each version in parameters.VMMatrix }}:
           ${{ format('{0}', version.name) }}:
             SQLVersionEdition: ${{ version.SQLVersionEdition }}
+            SQLVersionName: ${{ version.name }}
 
     steps:
     - checkout: self
@@ -99,7 +107,7 @@ stages:
           Set-Location "$(Pipeline.Workspace)/$(TSQLT_REPO_DIR)"
           .("Build/CommonFunctionsAndMethods.ps1")
 
-          $ResourceGroupName = ("$(NamePreFix)" + (Get-Date).tostring('yyyyMMdd') + "_" + "$(SQLVersionEdition)" + "_" + "$(Build.BuildId)");
+          $ResourceGroupName = ("$(NamePreFix)" + (Get-Date).tostring('yyyyMMdd') + "_" + "$(SQLVersionName)" + "_" + "$(Build.BuildId)");
           Log-Output "ResourceGroupName: $ResourceGroupName";
           Write-Host "##vso[task.setvariable variable=ResourceGroupName;isOutput=true]$ResourceGroupName";
 
@@ -140,6 +148,7 @@ stages:
             SQLPort="$SqlPort";
             SQLUserName="$SQLUserName";
             SQLPwd="$SQLPwd";
+            VMPriority="${{ parameters.VMPriority }}";
           }; 
           $VMDetails = .'CI/Azure-DevOps/CreateSQLVM_azcli.ps1' @Parameters
     
@@ -611,7 +620,7 @@ stages:
             git switch "$(ArtifactBranchName)"
             $CheckIfGitOk.invoke($?);
 
-            git tag $TagName;
+            git tag -f $TagName;
             $CheckIfGitOk.invoke($?);
 
             git push --tags

CI/Azure-DevOps/CreateSQLVM_azcli.ps1

@@ -9,7 +9,8 @@ Param(
     [Parameter(Mandatory=$true)][ValidateNotNullOrEmpty()][string] $SQLVersionEdition,
     [Parameter(Mandatory=$true)][ValidateNotNullOrEmpty()][string] $SQLPort,
     [Parameter(Mandatory=$true)][ValidateNotNullOrEmpty()][string] $SQLUserName,
-    [Parameter(Mandatory=$true)][ValidateNotNullOrEmpty()][string] $SQLPwd
+    [Parameter(Mandatory=$true)][ValidateNotNullOrEmpty()][string] $SQLPwd,
+    [Parameter(Mandatory=$true)][ValidateNotNullOrEmpty()][string] $VMPriority
 );
 
 $scriptpath = $MyInvocation.MyCommand.Path;
@@ -28,6 +29,7 @@ Log-Output "ResourceGroupName:", $ResourceGroupName;
 Log-Output "BuildId:", $BuildId;
 Log-Output "SQLVersionEdition:", $SQLVersionEdition;
 Log-Output "SQLPort:", $SQLPort;
+Log-Output "VMPriority:", $VMPriority;
 Log-Output "Parameters: ---------------------------";
 Log-Output "<-><-><-><-><-><-><-><-><-><-><-><-><-><->";
 
@@ -128,7 +130,7 @@ Log-Output "DONE: Creating NIC $InterfaceName";
 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 `
+            --admin-username "$VMAdminName" --computer-name "$VMName" --image "$ImageUrn" --nics "$InterfaceName" --priority "$VMPriority" `
             --size $Size --data-disk-sizes-gb 8 | ConvertFrom-Json;
 if (!$output) {
     Log-Output "VMName: ", $VMName;