actions/runner-images
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1844 from maxim-lobanov/v-malob/fix-build-number

Browse Source 
Fix buildNumber for MacOS Test CI
This commit is contained in:
Maxim Lobanov
2020-10-19 12:19:17 +03:00
committed by GitHub
parent 941243a186 478e20cb4a
commit eb478e9f2b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images.CI/macos/azure-pipelines/image-generation.yml
+9 -8
View File
@@ -7,12 +7,13 @@ jobs:
variables: variables:
- group: Mac-Cloud Image Generation - group: Mac-Cloud Image Generation
- group: Mac-Cloud Image Generation Key Vault - group: Mac-Cloud Image Generation Key Vault
- name: VirtualMachineName
value: $(Build.BuildNumber).$(System.JobAttempt)
steps: steps:
- bash: | - pwsh: |
echo "##vso[build.updatebuildnumber]${{ variables.VirtualMachineName }}" $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 displayName: Update BuildNumber
- checkout: self - checkout: self
@@ -71,7 +72,7 @@ jobs:
-var="output_folder=$(output-folder)" ` -var="output_folder=$(output-folder)" `
-var="vm_username=$(vm-username)" ` -var="vm_username=$(vm-username)" `
-var="vm_password=$(vm-password)" ` -var="vm_password=$(vm-password)" `
-var="build_id=${{ variables.VirtualMachineName }}" ` -var="build_id=$(VirtualMachineName)" `
-var="baseimage_name=${{ parameters.base_image_name }}" ` -var="baseimage_name=${{ parameters.base_image_name }}" `
-var="github_feed_token=$(github-feed-token)" ` -var="github_feed_token=$(github-feed-token)" `
-var="xcode_install_user=$(xcode-installation-user)" ` -var="xcode_install_user=$(xcode-installation-user)" `
@@ -98,7 +99,7 @@ jobs:
ls $(Common.TestResultsDirectory) ls $(Common.TestResultsDirectory)
echo "Put VM name to 'VM_Done_Name' file" 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 displayName: Prepare artifact
- bash: | - bash: |
@@ -125,7 +126,7 @@ jobs:
inputs: inputs:
targetType: 'filePath' targetType: 'filePath'
filePath: ./images.CI/macos/move-vm.ps1 filePath: ./images.CI/macos/move-vm.ps1
arguments: -VMName "${{ variables.VirtualMachineName }}" ` arguments: -VMName "$(VirtualMachineName)" `
-TargetDataStore "${{ parameters.target_datastore }}" ` -TargetDataStore "${{ parameters.target_datastore }}" `
-VIServer "$(vcenter-server-v2)" ` -VIServer "$(vcenter-server-v2)" `
-VIUserName "$(vcenter-username-v2)" ` -VIUserName "$(vcenter-username-v2)" `
@@ -137,7 +138,7 @@ jobs:
inputs: inputs:
targetType: 'filePath' targetType: 'filePath'
filePath: ./images.CI/macos/destroy-vm.ps1 filePath: ./images.CI/macos/destroy-vm.ps1
arguments: -VMName "${{ variables.VirtualMachineName }}" ` arguments: -VMName "$(VirtualMachineName)" `
-VIServer "$(vcenter-server-v2)" ` -VIServer "$(vcenter-server-v2)" `
-VIUserName "$(vcenter-username-v2)" ` -VIUserName "$(vcenter-username-v2)" `
-VIPassword "$(vcenter-password-v2)" -VIPassword "$(vcenter-password-v2)"