Skip to content
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

chore: move base image urls to pipeline vars #5933

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore: move base image urls to pipeline vars #5933

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
a34417d
move base image urls to pipeline vars
timmy-wright Feb 26, 2025
3bc9a80
fix capitalisation
timmy-wright Feb 26, 2025
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
20 changes: 20 additions & 0 deletions .pipelines/.vsts-vhd-builder-release-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,22 @@ parameters:
displayName: Branch in aks-rp to use for overrides
type: string
default: master
- name: ws2019BaseImageUrl
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We keep these variables as secret and do not want to expose the values in any logs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's OK to expose them in the devops logs as they are only accessible internally. Also, anyone who has access to the pipelines can view the variables or parameters that were used to run the pipelines - so I'm not sure we gain much by using variables.

displayName: WS2019 base image URL
type: string
default:
- name: ws2022BaseImageUrl
displayName: WS2022 base image URL
type: string
default:
- name: ws23H2BaseImageUrl
displayName: WS23H2 base image URL
type: string
default:
- name: ws2025BaseImageUrl
displayName: WS2025 base image URL
type: string
default:

# Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build"
# Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build - PR check-in gate"
Expand All @@ -79,3 +95,7 @@ stages:
installOpenSshServer: ${{ parameters.installOpenSshServer }}
overrideBranch: ${{ parameters.overrideBranch }}
useOverrides: ${{ parameters.useOverrides }}
ws2019BaseImageUrl: {{ parameters.ws2019BaseImageUrl }}
ws2022BaseImageUrl: {{ parameters.ws2022BaseImageUrl }}
ws23H2BaseImageUrl: {{ parameters.ws23H2BaseImageUrl }}
ws2025BaseImageUrl: {{ parameters.ws2025BaseImageUrl }}
26 changes: 21 additions & 5 deletions .pipelines/templates/.build-and-test-windows-vhds-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,22 @@ parameters:
- name: useOverrides
displayName: Use component overrides
type: boolean
- name: ws2019BaseImageUrl
displayName: WS2019 base image URL
type: string
default:
- name: ws2022BaseImageUrl
displayName: WS2022 base image URL
type: string
default:
- name: ws23H2BaseImageUrl
displayName: WS23H2 base image URL
type: string
default:
- name: ws2025BaseImageUrl
displayName: WS2025 base image URL
type: string
default:

stages:
- template: ./.build-and-test-windows-vhd-template.yaml
Expand All @@ -55,7 +71,7 @@ stages:
buildVmSize: ${{ parameters.buildVmSize }}
installOpenSshServer: ${{ parameters.installOpenSshServer }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_2019_BASE_IMAGE_URL)
windowsBaseImageUrl: ${{ parameters.ws2019BaseImageUrl }}
windowsNanoImageUrl: $(WINDOWS_2019_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2019_CORE_IMAGE_URL)
overrideBranch: ${{ parameters.overrideBranch }}
Expand All @@ -75,7 +91,7 @@ stages:
buildVmSize: ${{ parameters.buildVmSize }}
installOpenSshServer: ${{ parameters.installOpenSshServer }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_2022_BASE_IMAGE_URL)
windowsBaseImageUrl: ${{ parameters.ws2022BaseImageUrl }}
windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
overrideBranch: ${{ parameters.overrideBranch }}
Expand All @@ -95,7 +111,7 @@ stages:
dryrun: ${{ parameters.dryrun }}
installOpenSshServer: ${{ parameters.installOpenSshServer }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)
windowsBaseImageUrl: ${{ parameters.ws2022BaseImageUrl }}
windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
overrideBranch: ${{ parameters.overrideBranch }}
Expand All @@ -115,7 +131,7 @@ stages:
dryrun: ${{ parameters.dryrun }}
installOpenSshServer: ${{ parameters.installOpenSshServer }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_23H2_BASE_IMAGE_URL)
windowsBaseImageUrl: ${{ parameters.ws23H2BaseImageUrl }}
windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
overrideBranch: ${{ parameters.overrideBranch }}
Expand All @@ -135,7 +151,7 @@ stages:
dryrun: ${{ parameters.dryrun }}
installOpenSshServer: ${{ parameters.installOpenSshServer }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)
windowsBaseImageUrl: ${{ parameters.ws23H2BaseImageUrl }}
windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
overrideBranch: ${{ parameters.overrideBranch }}
Expand Down
Loading