diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 19bfdde3cc6b..a8a917c64bc5 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -4,8 +4,10 @@ jobs: timeoutInMinutes: 1200 pool: name: Mac-Cloud Image Generation + demands: + - PrimaryRackAgent -equals ${{ parameters.primary_agent }} variables: - - group: Mac-Cloud Image Generation + - group: ${{ parameters.variable_group_name }} steps: - pwsh: | diff --git a/images.CI/macos/azure-pipelines/macos11.yml b/images.CI/macos/azure-pipelines/macos11.yml index 012b3e61d0b9..7f659c75f57c 100644 --- a/images.CI/macos/azure-pipelines/macos11.yml +++ b/images.CI/macos/azure-pipelines/macos11.yml @@ -14,6 +14,9 @@ pr: include: - main +variables: +- group: Mac-Cloud Image Generation + jobs: - template: image-generation.yml parameters: @@ -21,3 +24,5 @@ jobs: base_image_name: 'clean-macOS-11-380Gb-runner' template_path: 'templates/macOS-11.pkr.hcl' target_datastore: 'ds-image' + variable_group_name: 'Mac-Cloud Image Generation' + primary_agent: 'true' diff --git a/images.CI/macos/azure-pipelines/macos12.yml b/images.CI/macos/azure-pipelines/macos12.yml index afa2190c2baa..e3652d8d4b61 100644 --- a/images.CI/macos/azure-pipelines/macos12.yml +++ b/images.CI/macos/azure-pipelines/macos12.yml @@ -14,6 +14,9 @@ pr: include: - main +variables: +- group: Mac-Cloud Image Generation + jobs: - template: image-generation.yml parameters: @@ -21,3 +24,5 @@ jobs: base_image_name: 'clean-macOS-12-380Gb-runner' template_path: 'templates/macOS-12.pkr.hcl' target_datastore: 'ds-image' + variable_group_name: 'Mac-Cloud Image Generation' + primary_agent: 'true' diff --git a/images.CI/macos/azure-pipelines/secondary-macos11.yml b/images.CI/macos/azure-pipelines/secondary-macos11.yml new file mode 100644 index 000000000000..5e86fa88a1f8 --- /dev/null +++ b/images.CI/macos/azure-pipelines/secondary-macos11.yml @@ -0,0 +1,23 @@ +name: macOS-11_$(date:yyyyMMdd)$(rev:.r)_unstable +schedules: +- cron: '45 0 * * 1' + displayName: Weekly + branches: + include: + - main + always: true + +trigger: none + +variables: +- group: Mac-Cloud Image Generation + +jobs: +- template: image-generation.yml + parameters: + image_label: 'macOS Big Sur' + base_image_name: 'clean-macOS-11-380Gb-runner' + template_path: 'templates/macOS-11.pkr.hcl' + target_datastore: 'ds-image' + variable_group_name: 'Mac-Cloud Secondary Image Generation' + primary_agent: 'false' diff --git a/images.CI/macos/azure-pipelines/secondary-macos12.yml b/images.CI/macos/azure-pipelines/secondary-macos12.yml new file mode 100644 index 000000000000..a43c2c0ea267 --- /dev/null +++ b/images.CI/macos/azure-pipelines/secondary-macos12.yml @@ -0,0 +1,23 @@ +name: macOS-12_$(date:yyyyMMdd)$(rev:.r)_unstable +schedules: +- cron: '45 1 * * 1' + displayName: Weekly + branches: + include: + - main + always: true + +trigger: none + +variables: +- group: Mac-Cloud Image Generation + +jobs: +- template: image-generation.yml + parameters: + image_label: 'macOS Monterey' + base_image_name: 'clean-macOS-12-380Gb-runner' + template_path: 'templates/macOS-12.pkr.hcl' + target_datastore: 'ds-image' + variable_group_name: 'Mac-Cloud Secondary Image Generation' + primary_agent: 'false'