From 52ce3618d5d0f6c53ac25721d392eaef5e8a60d8 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 19 Oct 2020 09:18:41 +0300 Subject: [PATCH 1/4] fix build number --- images.CI/macos/azure-pipelines/image-generation.yml | 2 +- images.CI/macos/azure-pipelines/macos1013.yml | 3 +-- images.CI/macos/azure-pipelines/macos1014.yml | 3 +-- images.CI/macos/azure-pipelines/macos1015.yml | 3 +-- images.CI/macos/azure-pipelines/macos110.yml | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index f38d2fdc..2b0f9fa8 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -8,7 +8,7 @@ jobs: - group: Mac-Cloud Image Generation - group: Mac-Cloud Image Generation Key Vault - name: VirtualMachineName - value: $(Build.BuildNumber).$(System.JobAttempt) + value: ${{ parameters.image_label }}_$(date:yyyyMMdd)$(rev:.r)_unstable.$(System.JobAttempt) steps: - bash: | diff --git a/images.CI/macos/azure-pipelines/macos1013.yml b/images.CI/macos/azure-pipelines/macos1013.yml index a7b9a4a1..a61d69ac 100644 --- a/images.CI/macos/azure-pipelines/macos1013.yml +++ b/images.CI/macos/azure-pipelines/macos1013.yml @@ -1,4 +1,3 @@ -name: macOS-10.13_$(date:yyyyMMdd)$(rev:.r)_unstable schedules: - cron: "0 0 * * *" displayName: Daily @@ -17,7 +16,7 @@ pr: jobs: - template: image-generation.yml parameters: - image_label: 'macOS High Sierra' + image_label: 'macOS-10.13' base_image_name: 'clean-macOS-10.13.6-380Gb-SIPoff_runner' template_path: 'templates/macOS-10.13.json' target_datastore: 'ds-image' diff --git a/images.CI/macos/azure-pipelines/macos1014.yml b/images.CI/macos/azure-pipelines/macos1014.yml index 21f7e48c..3b801624 100644 --- a/images.CI/macos/azure-pipelines/macos1014.yml +++ b/images.CI/macos/azure-pipelines/macos1014.yml @@ -1,4 +1,3 @@ -name: macOS-10.14_$(date:yyyyMMdd)$(rev:.r)_unstable schedules: - cron: "0 0 * * *" displayName: Daily @@ -17,7 +16,7 @@ pr: jobs: - template: image-generation.yml parameters: - image_label: 'macOS Mojave' + image_label: 'macOS-10.14' base_image_name: 'clean-macOS-10.14-380Gb_runner' template_path: 'templates/macOS-10.14.json' target_datastore: 'ds-image' diff --git a/images.CI/macos/azure-pipelines/macos1015.yml b/images.CI/macos/azure-pipelines/macos1015.yml index f42980cc..1d86512f 100644 --- a/images.CI/macos/azure-pipelines/macos1015.yml +++ b/images.CI/macos/azure-pipelines/macos1015.yml @@ -1,4 +1,3 @@ -name: macOS-10.15_$(date:yyyyMMdd)$(rev:.r)_unstable schedules: - cron: "0 0 * * *" displayName: Daily @@ -17,7 +16,7 @@ pr: jobs: - template: image-generation.yml parameters: - image_label: 'macOS Catalina' + image_label: 'macOS-10.15' base_image_name: 'clean-macOS-10.15-380Gb-runner' template_path: 'templates/macOS-10.15.json' target_datastore: 'ds-image' diff --git a/images.CI/macos/azure-pipelines/macos110.yml b/images.CI/macos/azure-pipelines/macos110.yml index ada6dcfe..19f9725a 100644 --- a/images.CI/macos/azure-pipelines/macos110.yml +++ b/images.CI/macos/azure-pipelines/macos110.yml @@ -1,4 +1,3 @@ -name: macOS-11.0_$(date:yyyyMMdd)$(rev:.r)_unstable schedules: - cron: "0 0 * * *" displayName: Daily @@ -17,7 +16,7 @@ pr: jobs: - template: image-generation.yml parameters: - image_label: 'macOS Big Sur' + image_label: 'macOS-11.0' base_image_name: 'clean-macOS-11.0-380Gb-runner' template_path: 'templates/macOS-11.0.json' target_datastore: 'ds-image' From 9229296dd2c6bde98f99f499524d00abf50a5749 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 19 Oct 2020 09:39:11 +0300 Subject: [PATCH 2/4] fix build number --- images.CI/macos/azure-pipelines/image-generation.yml | 9 +++++---- images.CI/macos/azure-pipelines/macos1013.yml | 3 ++- images.CI/macos/azure-pipelines/macos1014.yml | 3 ++- images.CI/macos/azure-pipelines/macos1015.yml | 3 ++- images.CI/macos/azure-pipelines/macos110.yml | 3 ++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 2b0f9fa8..3fa3ba60 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -7,12 +7,13 @@ jobs: variables: - group: Mac-Cloud Image Generation - group: Mac-Cloud Image Generation Key Vault - - name: VirtualMachineName - value: ${{ parameters.image_label }}_$(date:yyyyMMdd)$(rev:.r)_unstable.$(System.JobAttempt) steps: - - bash: | - echo "##vso[build.updatebuildnumber]${{ variables.VirtualMachineName }}" + - pwsh: | + $cleanBuildNumber = "$(Build.BuildNumber)" -replace "(.+_unstable\.)(\d+)", '$1' + $virtualMachineName = "${cleanBuildNumber}.$(System.JobAttempt)" + echo "##vso[task.setvariable variable=VirtualMachineName;]$virtualMachineName" + echo "##vso[build.updatebuildnumber]$virtualMachineName" displayName: Update BuildNumber - checkout: self diff --git a/images.CI/macos/azure-pipelines/macos1013.yml b/images.CI/macos/azure-pipelines/macos1013.yml index a61d69ac..a7b9a4a1 100644 --- a/images.CI/macos/azure-pipelines/macos1013.yml +++ b/images.CI/macos/azure-pipelines/macos1013.yml @@ -1,3 +1,4 @@ +name: macOS-10.13_$(date:yyyyMMdd)$(rev:.r)_unstable schedules: - cron: "0 0 * * *" displayName: Daily @@ -16,7 +17,7 @@ pr: jobs: - template: image-generation.yml parameters: - image_label: 'macOS-10.13' + image_label: 'macOS High Sierra' base_image_name: 'clean-macOS-10.13.6-380Gb-SIPoff_runner' template_path: 'templates/macOS-10.13.json' target_datastore: 'ds-image' diff --git a/images.CI/macos/azure-pipelines/macos1014.yml b/images.CI/macos/azure-pipelines/macos1014.yml index 3b801624..21f7e48c 100644 --- a/images.CI/macos/azure-pipelines/macos1014.yml +++ b/images.CI/macos/azure-pipelines/macos1014.yml @@ -1,3 +1,4 @@ +name: macOS-10.14_$(date:yyyyMMdd)$(rev:.r)_unstable schedules: - cron: "0 0 * * *" displayName: Daily @@ -16,7 +17,7 @@ pr: jobs: - template: image-generation.yml parameters: - image_label: 'macOS-10.14' + image_label: 'macOS Mojave' base_image_name: 'clean-macOS-10.14-380Gb_runner' template_path: 'templates/macOS-10.14.json' target_datastore: 'ds-image' diff --git a/images.CI/macos/azure-pipelines/macos1015.yml b/images.CI/macos/azure-pipelines/macos1015.yml index 1d86512f..f42980cc 100644 --- a/images.CI/macos/azure-pipelines/macos1015.yml +++ b/images.CI/macos/azure-pipelines/macos1015.yml @@ -1,3 +1,4 @@ +name: macOS-10.15_$(date:yyyyMMdd)$(rev:.r)_unstable schedules: - cron: "0 0 * * *" displayName: Daily @@ -16,7 +17,7 @@ pr: jobs: - template: image-generation.yml parameters: - image_label: 'macOS-10.15' + image_label: 'macOS Catalina' base_image_name: 'clean-macOS-10.15-380Gb-runner' template_path: 'templates/macOS-10.15.json' target_datastore: 'ds-image' diff --git a/images.CI/macos/azure-pipelines/macos110.yml b/images.CI/macos/azure-pipelines/macos110.yml index 19f9725a..ada6dcfe 100644 --- a/images.CI/macos/azure-pipelines/macos110.yml +++ b/images.CI/macos/azure-pipelines/macos110.yml @@ -1,3 +1,4 @@ +name: macOS-11.0_$(date:yyyyMMdd)$(rev:.r)_unstable schedules: - cron: "0 0 * * *" displayName: Daily @@ -16,7 +17,7 @@ pr: jobs: - template: image-generation.yml parameters: - image_label: 'macOS-11.0' + image_label: 'macOS Big Sur' base_image_name: 'clean-macOS-11.0-380Gb-runner' template_path: 'templates/macOS-11.0.json' target_datastore: 'ds-image' From 3a355831822a9df382f6ccef772922d09a0e5edd Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 19 Oct 2020 09:47:10 +0300 Subject: [PATCH 3/4] Update image-generation.yml --- images.CI/macos/azure-pipelines/image-generation.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 3fa3ba60..71cad923 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -72,7 +72,7 @@ jobs: -var="output_folder=$(output-folder)" ` -var="vm_username=$(vm-username)" ` -var="vm_password=$(vm-password)" ` - -var="build_id=${{ variables.VirtualMachineName }}" ` + -var="build_id=$(VirtualMachineName)" ` -var="baseimage_name=${{ parameters.base_image_name }}" ` -var="github_feed_token=$(github-feed-token)" ` -var="xcode_install_user=$(xcode-installation-user)" ` @@ -99,7 +99,7 @@ jobs: ls $(Common.TestResultsDirectory) echo "Put VM name to 'VM_Done_Name' file" - echo "${{ variables.VirtualMachineName }}" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name" + echo "$(VirtualMachineName)" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name" displayName: Prepare artifact - bash: | @@ -126,7 +126,7 @@ jobs: inputs: targetType: 'filePath' filePath: ./images.CI/macos/move-vm.ps1 - arguments: -VMName "${{ variables.VirtualMachineName }}" ` + arguments: -VMName "$(VirtualMachineName)" ` -TargetDataStore "${{ parameters.target_datastore }}" ` -VIServer "$(vcenter-server-v2)" ` -VIUserName "$(vcenter-username-v2)" ` @@ -138,7 +138,7 @@ jobs: inputs: targetType: 'filePath' filePath: ./images.CI/macos/destroy-vm.ps1 - arguments: -VMName "${{ variables.VirtualMachineName }}" ` + arguments: -VMName "$(VirtualMachineName)" ` -VIServer "$(vcenter-server-v2)" ` -VIUserName "$(vcenter-username-v2)" ` -VIPassword "$(vcenter-password-v2)" From 478e20cb4a445602595b706ef306d15d1bf75827 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 19 Oct 2020 10:28:59 +0300 Subject: [PATCH 4/4] Update image-generation.yml --- images.CI/macos/azure-pipelines/image-generation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 71cad923..89216e21 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -10,7 +10,7 @@ jobs: steps: - pwsh: | - $cleanBuildNumber = "$(Build.BuildNumber)" -replace "(.+_unstable\.)(\d+)", '$1' + $cleanBuildNumber = "$(Build.BuildNumber)" -replace "(.+_unstable)(\.\d+)", '$1' $virtualMachineName = "${cleanBuildNumber}.$(System.JobAttempt)" echo "##vso[task.setvariable variable=VirtualMachineName;]$virtualMachineName" echo "##vso[build.updatebuildnumber]$virtualMachineName"