Merge pull request Azure#6327 from bmoore-msft/cicd

pipeline script updates

Author: bmoore-msft

.gitignore

@@ -35,3 +35,5 @@ test/template-validation-tests/mochawesome-report/*
 
 test/ci-scripts/.config.json
 test/AzTemplateToolKit.zip
+test/pipeline/QuickStarts-Az-CI-Public-Export.json
+test/pipeline/QuickStarts-Az-CI-Public-Import.json

test/ci-gen-setup/Create-GEN-Artifacts.ps1

@@ -45,7 +45,7 @@ Creat a KeyVault and add:
 # Create the Vault
 $vault = Get-AzureRMKeyVault -VaultName $KeyVaultName -verbose -ErrorAction SilentlyContinue
 if($vault -eq $null) {
-    $vault = New-AzureRMKeyVault -VaultName $KeyVaultName -ResourceGroupName $ResourceGroupName -Location $Location -EnabledForTemplateDeployment -EnabledForDiskEncryption
+    $vault = New-AzureRMKeyVault -VaultName $KeyVaultName -ResourceGroupName $ResourceGroupName -Location $Location -EnabledForTemplateDeployment -EnabledForDiskEncryption -Verbose
 }
 
 # 1) Create a sample password

test/ci-scripts/Create-ResourceGroupAssignment.ps1

@@ -5,8 +5,7 @@
 param(
     [string][Parameter(mandatory=$true)] $ResourceGroupName,
     [string][Parameter(mandatory=$true)] $Location,
-    [string][Parameter(mandatory=$true)] $appId,
-    [string][Parameter(mandatory=$true)] $objectId #TODO this is a workaround until we can figure out why Get-AzADSP failes and role assignment partially fails
+    [string][Parameter(mandatory=$true)] $appId
 )
 
 #Create the group only if it doesn't already exist
@@ -15,5 +14,4 @@ if ((Get-AzResourceGroup -Name $ResourceGroupName -Location $Location -Verbose -
 }
 
 #Note that the service principal assigning the role must have AAD perms to query AD for the objectId
-#New-AzRoleAssignment -ObjectId $(Get-AzADServicePrincipal -ApplicationId $appId).Id -RoleDefinitionName Contributor  -ResourceGroupName $ResourceGroupName -Verbose
-New-AzRoleAssignment -ObjectId $objectId -RoleDefinitionName Contributor  -ResourceGroupName $ResourceGroupName -Verbose
+New-AzRoleAssignment -ObjectId $(Get-AzADServicePrincipal -ApplicationId $appId).Id -RoleDefinitionName Contributor  -ResourceGroupName $ResourceGroupName -Verbose

test/ci-scripts/Get-SampleFolder.ps1

@@ -5,7 +5,7 @@ If the PR does not contain changes to a sample folder, it will currently fail bu
 pass the build in order to trigger a manual review
 #>
 
-Get-ChildItem env: # debugging
+# Get-ChildItem env: # debugging
 
 $GitHubRepository = $ENV:BUILD_REPOSITORY_NAME
 $GitHubPRNumber = $ENV:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER