Skip to content

Fix the cleanup script. #856

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
maxim-lobanov merged 2 commits into from
May 12, 2020
Merged

Fix the cleanup script. #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fcb249
Fix the cleanup script.The result is not returned to the variable bec…
simpleprovider May 8, 2020
036b642
Added the cancel timeout.
simpleprovider May 11, 2020
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
3 changes: 2 additions & 1 deletion images.CI/azure-pipelines/image-generation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
- job:
pool: ci-agent-pool
timeoutInMinutes: 600
cancelTimeoutInMinutes: 30
variables:
- group: Image Generation Variables

Expand Down Expand Up @@ -74,4 +75,4 @@ jobs:
-ClientSecret $(CLIENT_SECRET) `
-Image ${{ parameters.image_type }} `
-SubscriptionId $(AZURE_SUBSCRIPTION) `
-TenantId $(AZURE_TENANT)
-TenantId $(AZURE_TENANT)
2 changes: 1 addition & 1 deletion images.CI/cleanup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down