Skip to content

Commit 607b1c0

Browse files
authored
Merge pull request #1599 from mboersma/fix-azurelinux-3
Update Azure Linux 3 base image source
2 parents 83c7e31 + 14925bb commit 607b1c0

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

images/capi/ansible/roles/setup/tasks/azurelinux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
---
1515
- ansible.builtin.import_tasks: rpm_repos.yml
1616

17-
- name: Perform a yum update
18-
ansible.builtin.yum:
17+
- name: Perform a tdnf update
18+
ansible.builtin.dnf:
1919
name: "*"
2020
state: latest
2121
lock_timeout: 60
2222

2323
- name: Install baseline dependencies on Azure Linux
24-
ansible.builtin.yum:
24+
ansible.builtin.dnf:
2525
name: "{{ rpms }}"
2626
state: present
2727
lock_timeout: 60
2828

2929
- name: Install extra rpms
30-
ansible.builtin.yum:
30+
ansible.builtin.dnf:
3131
name: "{{ extra_rpms.split() }}"
3232
state: present
3333
lock_timeout: 60

images/capi/azure_targets.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
VHD_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd"
2-
VHD_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 windows-2022-containerd"
2+
VHD_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 windows-2022-containerd"
33
SIG_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd windows-2025-containerd flatcar"
4-
SIG_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 windows-2022-containerd flatcar"
4+
SIG_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 windows-2022-containerd flatcar"
55
SIG_GEN2_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 flatcar"
6-
SIG_GEN2_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 flatcar"
6+
SIG_GEN2_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 flatcar"
77
SIG_CVM_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 windows-2019-containerd windows-2022-containerd"
88
SIG_CVM_CI_TARGETS="ubuntu-2204 ubuntu-2404 windows-2022-containerd"

images/capi/packer/azure/azurelinux-3-gen2.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"distribution": "azurelinux",
44
"distribution_release": "azure-linux-gen2",
55
"distribution_version": "3",
6-
"image_offer": "azure-linux",
6+
"image_offer": "azure-linux-3",
77
"image_publisher": "MicrosoftCBLMariner",
8-
"image_sku": "azure-linux-gen2"
8+
"image_sku": "azure-linux-3-gen2"
99
}

images/capi/packer/azure/azurelinux-3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"distribution": "azurelinux",
44
"distribution_release": "azure-linux-3",
55
"distribution_version": "3",
6-
"image_offer": "azure-linux",
6+
"image_offer": "azure-linux-3",
77
"image_publisher": "MicrosoftCBLMariner",
88
"image_sku": "azure-linux-3"
99
}

0 commit comments

Comments
 (0)