From 3fcb24941bfb1535c42cd1e40a4f1afb0dda8ec9 Mon Sep 17 00:00:00 2001 From: Cage200 Date: Fri, 8 May 2020 20:06:15 +0200 Subject: [PATCH 1/2] Fix the cleanup script.The result is not returned to the variable because of the output redirect --- images.CI/cleanup.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/cleanup.ps1 b/images.CI/cleanup.ps1 index 00050d5517..31abcb56a7 100644 --- a/images.CI/cleanup.ps1 +++ b/images.CI/cleanup.ps1 @@ -11,7 +11,7 @@ az login --service-principal --username $ClientId --password $ClientSecret --ten $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" -$groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId | Out-Null +$groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId if ($groupExist -eq "true") { Write-Host "Found a match, deleting temporary files" az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null From 036b64278d7914bae9cebfa19116c7f99090283d Mon Sep 17 00:00:00 2001 From: cage200 Date: Mon, 11 May 2020 18:11:48 +0200 Subject: [PATCH 2/2] Added the cancel timeout. --- images.CI/azure-pipelines/image-generation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 03b084ca88..d2adc15ae8 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -8,6 +8,7 @@ jobs: - job: pool: ci-agent-pool timeoutInMinutes: 600 + cancelTimeoutInMinutes: 30 variables: - group: Image Generation Variables @@ -74,4 +75,4 @@ jobs: -ClientSecret $(CLIENT_SECRET) ` -Image ${{ parameters.image_type }} ` -SubscriptionId $(AZURE_SUBSCRIPTION) ` - -TenantId $(AZURE_TENANT) \ No newline at end of file + -TenantId $(AZURE_TENANT)