From 9b52e4043f96d7d6871cc7903271e328207f3c58 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Fri, 14 Feb 2020 19:09:09 +0300 Subject: [PATCH 1/6] Configure yml files for the images --- .../azure-pipelines/image-generation.yml | 29 +++++++++++++ images.CI/azure-pipelines/ubuntu1604.yml | 22 ++++++++++ images.CI/azure-pipelines/ubuntu1804.yml | 22 ++++++++++ images.CI/azure-pipelines/windows2016.yml | 22 ++++++++++ images.CI/azure-pipelines/windows2019.yml | 22 ++++++++++ images.CI/build-image.ps1 | 41 +++++++++++++++++++ images.CI/cleanup.ps1 | 25 +++++++++++ 7 files changed, 183 insertions(+) create mode 100644 images.CI/azure-pipelines/image-generation.yml create mode 100644 images.CI/azure-pipelines/ubuntu1604.yml create mode 100644 images.CI/azure-pipelines/ubuntu1804.yml create mode 100644 images.CI/azure-pipelines/windows2016.yml create mode 100644 images.CI/azure-pipelines/windows2019.yml create mode 100644 images.CI/build-image.ps1 create mode 100644 images.CI/cleanup.ps1 diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml new file mode 100644 index 00000000..373c7500 --- /dev/null +++ b/images.CI/azure-pipelines/image-generation.yml @@ -0,0 +1,29 @@ +jobs: +- job: + pool: ci-agent-pool + steps: + - script: | + ./images.CI/build-image.ps1 -ResourcesNamePrefix $(Build.BuildNumber) ` + -ClientId $(CLIENT_ID) ` + -ClientSecret $(CLIENT_SECRET) ` + -Image ${{ parameters.image_type }} ` + -ResourceGroup $(AZURE_RESOURCE_GROUP) ` + -StorageAccount $(AZURE_STORAGE_ACCOUNT) ` + -SubscriptionId $(AZURE_SUBSCRIPTION) ` + -TenantId $(AZURE_TENANT) ` + -Location $(AZURE_LOCATION) ` + -VirtualNetworkName $(BUILD_AGENT_VNET_NAME) ` + -VirtualNetworkRG $(BUILD_AGENT_VNET_RESOURCE_GROUP) ` + -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) ` + -GitHubFeedToken $(GITHUB_TOKEN) + displayName: Build VM + + - script: | + ./images.CI/cleanup.ps1 -ResourcesNamePrefix $(Build.BuildNumber) ` + -ClientId $(CLIENT_ID) ` + -ClientSecret $(CLIENT_SECRET) ` + -Image ${{ parameters.image_type }} ` + -SubscriptionId $(AZURE_SUBSCRIPTION) ` + -TenantId $(AZURE_TENANT) + displayName: Clean up resources + condition: always() \ No newline at end of file diff --git a/images.CI/azure-pipelines/ubuntu1604.yml b/images.CI/azure-pipelines/ubuntu1604.yml new file mode 100644 index 00000000..c76a3924 --- /dev/null +++ b/images.CI/azure-pipelines/ubuntu1604.yml @@ -0,0 +1,22 @@ +# schedules: +# - cron: "0 0 * * *" +# displayName: Daily +# branches: +# include: +# - master +# always: true + +variables: +- group: "Image Generation Variables" + +trigger: none +pr: + autoCancel: true + branches: + include: + - master + +jobs: +- template: image-generation.yml + parameters: + image_type: ubuntu1604 \ No newline at end of file diff --git a/images.CI/azure-pipelines/ubuntu1804.yml b/images.CI/azure-pipelines/ubuntu1804.yml new file mode 100644 index 00000000..eb7c6dd0 --- /dev/null +++ b/images.CI/azure-pipelines/ubuntu1804.yml @@ -0,0 +1,22 @@ +# schedules: +# - cron: "0 0 * * *" +# displayName: Daily +# branches: +# include: +# - master +# always: true + +variables: +- group: "Image Generation Variables" + +trigger: none +pr: + autoCancel: true + branches: + include: + - master + +jobs: +- template: image-generation.yml + parameters: + image_type: ubuntu1804 \ No newline at end of file diff --git a/images.CI/azure-pipelines/windows2016.yml b/images.CI/azure-pipelines/windows2016.yml new file mode 100644 index 00000000..d3ac23e6 --- /dev/null +++ b/images.CI/azure-pipelines/windows2016.yml @@ -0,0 +1,22 @@ +# schedules: +# - cron: "0 0 * * *" +# displayName: Daily +# branches: +# include: +# - master +# always: true + +variables: +- group: "Image Generation Variables" + +trigger: none +pr: + autoCancel: true + branches: + include: + - master + +jobs: +- template: image-generation.yml + parameters: + image_type: Windows2016-Azure \ No newline at end of file diff --git a/images.CI/azure-pipelines/windows2019.yml b/images.CI/azure-pipelines/windows2019.yml new file mode 100644 index 00000000..93c73003 --- /dev/null +++ b/images.CI/azure-pipelines/windows2019.yml @@ -0,0 +1,22 @@ +# schedules: +# - cron: "0 0 * * *" +# displayName: Daily +# branches: +# include: +# - master +# always: true + +variables: +- group: "Image Generation Variables" + +trigger: none +pr: + autoCancel: true + branches: + include: + - master + +jobs: +- template: image-generation.yml + parameters: + image_type: Windows2019-Azure \ No newline at end of file diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 new file mode 100644 index 00000000..1087abbe --- /dev/null +++ b/images.CI/build-image.ps1 @@ -0,0 +1,41 @@ +param( + [ValidateSet('Windows2019-Azure','Windows2016-Azure','ubuntu1604','ubuntu1804')] + [String] [Parameter (Mandatory=$true)] $Image, + [String] [Parameter (Mandatory=$true)] $ClientId, + [String] [Parameter (Mandatory=$true)] $ClientSecret, + [String] [Parameter (Mandatory=$true)] $GitHubFeedToken, + [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, + [String] [Parameter (Mandatory=$true)] $Location, + [String] [Parameter (Mandatory=$true)] $ResourceGroup, + [String] [Parameter (Mandatory=$true)] $StorageAccount, + [String] [Parameter (Mandatory=$true)] $SubscriptionId, + [String] [Parameter (Mandatory=$true)] $TenantId, + [String] [Parameter (Mandatory=$true)] $VirtualNetworkName, + [String] [Parameter (Mandatory=$true)] $VirtualNetworkRG, + [String] [Parameter (Mandatory=$true)] $VirtualNetworkSubnet +) + +$TemplatePath = (Get-ChildItem -Path "images" -Include "$Image.json" -Recurse -Depth 2).FullName +$TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" +$InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() + +Write-Host "TemplatePath = $TemplatePath" +Write-Host "ResourcesNamePrefix = $ResourcesNamePrefix" +Write-Host "TempResourceGroupName = $TempResourceGroupName" + +Write-Host "Build $Image VM" +packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` + -var "client_id=$ClientId" ` + -var "client_secret=$ClientSecret" ` + -var "install_password=$InstallPassword" ` + -var "github_feed_token=$GitHubFeedToken" ` + -var "location=$Location" ` + -var "resource_group=$ResourceGroup" ` + -var "storage_account=$StorageAccount" ` + -var "subscription_id=$SubscriptionId" ` + -var "temp_resource_group_name=$TempResourceGroupName" ` + -var "tenant_id=$TenantId" ` + -var "virtual_network_name=$VirtualNetworkName" ` + -var "virtual_network_resource_group_name=$VirtualNetworkRG" ` + -var "virtual_network_subnet_name=$VirtualNetworkSubnet" ` + $TemplatePath \ No newline at end of file diff --git a/images.CI/cleanup.ps1 b/images.CI/cleanup.ps1 new file mode 100644 index 00000000..fcf7d946 --- /dev/null +++ b/images.CI/cleanup.ps1 @@ -0,0 +1,25 @@ +param( + [ValidateSet('Windows2019-Azure','Windows2016-Azure','ubuntu1604','ubuntu1804')] + [String] [Parameter (Mandatory=$true)] $Image, + [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, + [String] [Parameter (Mandatory=$true)] $ClientId, + [String] [Parameter (Mandatory=$true)] $ClientSecret, + [String] [Parameter (Mandatory=$true)] $SubscriptionId, + [String] [Parameter (Mandatory=$true)] $TenantId +) + +az login --service-principal --username $ClientId --password $ClientSecret --tenant $TenantId | Out-Null + +$TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" + +Write-Host "ResourcesNamePrefix = $ResourcesNamePrefix" +Write-Host "TempResourceGroupName = $TempResourceGroupName" + +$groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId | Out-Null +if ($groupExist -eq "true") { + Write-Host "Found a match, deleting temporary files" + az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null + Write-Host "Temporary group was deleted succesfully" -ForegroundColor Green +} else { + Write-Host "No temporary groups found" +} \ No newline at end of file From 78ce3a0bd3b903f540b18829e2c83574ddeeafbb Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Fri, 14 Feb 2020 19:44:06 +0300 Subject: [PATCH 2/6] Change the script steps to the PowerShell tasks --- .../azure-pipelines/image-generation.yml | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 373c7500..98922bf0 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -2,8 +2,12 @@ jobs: - job: pool: ci-agent-pool steps: - - script: | - ./images.CI/build-image.ps1 -ResourcesNamePrefix $(Build.BuildNumber) ` + - task: PowerShell@2 + displayName: 'Build VM' + inputs: + targetType: filePath + filePath: ./images.CI/build-image.ps1 + arguments: -ResourcesNamePrefix $(Build.BuildNumber) ` -ClientId $(CLIENT_ID) ` -ClientSecret $(CLIENT_SECRET) ` -Image ${{ parameters.image_type }} ` @@ -16,14 +20,16 @@ jobs: -VirtualNetworkRG $(BUILD_AGENT_VNET_RESOURCE_GROUP) ` -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) ` -GitHubFeedToken $(GITHUB_TOKEN) - displayName: Build VM - - script: | - ./images.CI/cleanup.ps1 -ResourcesNamePrefix $(Build.BuildNumber) ` + - task: PowerShell@2 + displayName: 'Clean up resources' + condition: always() + inputs: + targetType: filePath + filePath: ./images.CI/cleanup.ps1 + arguments: -ResourcesNamePrefix $(Build.BuildNumber) ` -ClientId $(CLIENT_ID) ` -ClientSecret $(CLIENT_SECRET) ` -Image ${{ parameters.image_type }} ` -SubscriptionId $(AZURE_SUBSCRIPTION) ` - -TenantId $(AZURE_TENANT) - displayName: Clean up resources - condition: always() \ No newline at end of file + -TenantId $(AZURE_TENANT) \ No newline at end of file From 0295b6f57eb5865b228587685b557d19839d7e77 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Sat, 15 Feb 2020 20:52:05 +0300 Subject: [PATCH 3/6] Move variables group --- images.CI/azure-pipelines/image-generation.yml | 4 ++++ images.CI/azure-pipelines/ubuntu1604.yml | 3 --- images.CI/azure-pipelines/ubuntu1804.yml | 3 --- images.CI/azure-pipelines/windows2016.yml | 3 --- images.CI/azure-pipelines/windows2019.yml | 3 --- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 98922bf0..2f9840b6 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -1,6 +1,10 @@ jobs: - job: pool: ci-agent-pool + timeoutInMinutes: 600 + variables: + - group: Image Generation Variables + steps: - task: PowerShell@2 displayName: 'Build VM' diff --git a/images.CI/azure-pipelines/ubuntu1604.yml b/images.CI/azure-pipelines/ubuntu1604.yml index c76a3924..b19e79a1 100644 --- a/images.CI/azure-pipelines/ubuntu1604.yml +++ b/images.CI/azure-pipelines/ubuntu1604.yml @@ -6,9 +6,6 @@ # - master # always: true -variables: -- group: "Image Generation Variables" - trigger: none pr: autoCancel: true diff --git a/images.CI/azure-pipelines/ubuntu1804.yml b/images.CI/azure-pipelines/ubuntu1804.yml index eb7c6dd0..db8acfd9 100644 --- a/images.CI/azure-pipelines/ubuntu1804.yml +++ b/images.CI/azure-pipelines/ubuntu1804.yml @@ -6,9 +6,6 @@ # - master # always: true -variables: -- group: "Image Generation Variables" - trigger: none pr: autoCancel: true diff --git a/images.CI/azure-pipelines/windows2016.yml b/images.CI/azure-pipelines/windows2016.yml index d3ac23e6..eaac2d1b 100644 --- a/images.CI/azure-pipelines/windows2016.yml +++ b/images.CI/azure-pipelines/windows2016.yml @@ -6,9 +6,6 @@ # - master # always: true -variables: -- group: "Image Generation Variables" - trigger: none pr: autoCancel: true diff --git a/images.CI/azure-pipelines/windows2019.yml b/images.CI/azure-pipelines/windows2019.yml index 93c73003..ebbf68e7 100644 --- a/images.CI/azure-pipelines/windows2019.yml +++ b/images.CI/azure-pipelines/windows2019.yml @@ -6,9 +6,6 @@ # - master # always: true -variables: -- group: "Image Generation Variables" - trigger: none pr: autoCancel: true From 624b905bc9e125cc3f38cbea9f53c06b0f028eab Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Mon, 17 Feb 2020 13:48:05 +0300 Subject: [PATCH 4/6] Remove log messages --- images.CI/build-image.ps1 | 4 ---- images.CI/cleanup.ps1 | 3 --- 2 files changed, 7 deletions(-) diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 index 1087abbe..989167e4 100644 --- a/images.CI/build-image.ps1 +++ b/images.CI/build-image.ps1 @@ -19,10 +19,6 @@ $TemplatePath = (Get-ChildItem -Path "images" -Include "$Image.json" -Recurse -D $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() -Write-Host "TemplatePath = $TemplatePath" -Write-Host "ResourcesNamePrefix = $ResourcesNamePrefix" -Write-Host "TempResourceGroupName = $TempResourceGroupName" - Write-Host "Build $Image VM" packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` -var "client_id=$ClientId" ` diff --git a/images.CI/cleanup.ps1 b/images.CI/cleanup.ps1 index fcf7d946..4b0b527b 100644 --- a/images.CI/cleanup.ps1 +++ b/images.CI/cleanup.ps1 @@ -12,9 +12,6 @@ az login --service-principal --username $ClientId --password $ClientSecret --ten $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" -Write-Host "ResourcesNamePrefix = $ResourcesNamePrefix" -Write-Host "TempResourceGroupName = $TempResourceGroupName" - $groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId | Out-Null if ($groupExist -eq "true") { Write-Host "Found a match, deleting temporary files" From 9b8fe11d2cb0dd83fe3405c445d36bcbb3bd1390 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Mon, 17 Feb 2020 17:25:55 +0300 Subject: [PATCH 5/6] Remove ValidateSet --- images.CI/build-image.ps1 | 9 ++++++++- images.CI/cleanup.ps1 | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 index 989167e4..9a35373d 100644 --- a/images.CI/build-image.ps1 +++ b/images.CI/build-image.ps1 @@ -1,5 +1,4 @@ param( - [ValidateSet('Windows2019-Azure','Windows2016-Azure','ubuntu1604','ubuntu1804')] [String] [Parameter (Mandatory=$true)] $Image, [String] [Parameter (Mandatory=$true)] $ClientId, [String] [Parameter (Mandatory=$true)] $ClientSecret, @@ -16,9 +15,17 @@ param( ) $TemplatePath = (Get-ChildItem -Path "images" -Include "$Image.json" -Recurse -Depth 2).FullName +if ($TemplatePath -eq $null) +{ + Write-Error "'-Image' parameter is not valid. You have to specify correct image type." + exit 1 +} + $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() +packer validate -syntax-only $TemplatePath + Write-Host "Build $Image VM" packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` -var "client_id=$ClientId" ` diff --git a/images.CI/cleanup.ps1 b/images.CI/cleanup.ps1 index 4b0b527b..00050d55 100644 --- a/images.CI/cleanup.ps1 +++ b/images.CI/cleanup.ps1 @@ -1,5 +1,4 @@ param( - [ValidateSet('Windows2019-Azure','Windows2016-Azure','ubuntu1604','ubuntu1804')] [String] [Parameter (Mandatory=$true)] $Image, [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, [String] [Parameter (Mandatory=$true)] $ClientId, From 60dc082e2fc2edc7a70923f258699fc85869b8f2 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Mon, 17 Feb 2020 17:31:08 +0300 Subject: [PATCH 6/6] Minor update --- images.CI/build-image.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1 index 9a35373d..6b75ec28 100644 --- a/images.CI/build-image.ps1 +++ b/images.CI/build-image.ps1 @@ -15,7 +15,7 @@ param( ) $TemplatePath = (Get-ChildItem -Path "images" -Include "$Image.json" -Recurse -Depth 2).FullName -if ($TemplatePath -eq $null) +if (-not $TemplatePath) { Write-Error "'-Image' parameter is not valid. You have to specify correct image type." exit 1