Skip to content

Commit 2d9408d

Browse files
vinceaperrivinceaperri
committed
update
1 parent be27eae commit 2d9408d

41 files changed

Lines changed: 1026 additions & 191 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 64 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,51 +45,103 @@ jobs:
4545
permissions:
4646
contents: read
4747

48-
tests-functional-azl-on-azl3-amd64:
49-
name: Functional tests AZL on AZL3 AMD64
48+
tests-functional-azl3-on-azl3-amd64:
49+
name: Functional tests AZL3 on AZL3 AMD64
5050
if: ${{ inputs.runFunctionalTests }}
5151
uses: ./.github/workflows/tests-functional.yml
5252
with:
53-
testDistro: azl
53+
testDistro: azl3
5454
hostDistro: azl3
5555
hostArch: amd64
5656
permissions:
5757
contents: read
5858
# Azure login.
5959
id-token: write
6060

61-
tests-functional-azl-on-azl3-arm64:
62-
name: Functional tests AZL on AZL3 ARM64
61+
tests-functional-azl4-on-azl3-amd64:
62+
name: Functional tests AZL4 on AZL3 AMD64
6363
if: ${{ inputs.runFunctionalTests }}
6464
uses: ./.github/workflows/tests-functional.yml
6565
with:
66-
testDistro: azl
66+
testDistro: azl4
67+
hostDistro: azl3
68+
hostArch: amd64
69+
permissions:
70+
contents: read
71+
# Azure login.
72+
id-token: write
73+
74+
tests-functional-azl3-on-azl3-arm64:
75+
name: Functional tests AZL3 on AZL3 ARM64
76+
if: ${{ inputs.runFunctionalTests }}
77+
uses: ./.github/workflows/tests-functional.yml
78+
with:
79+
testDistro: azl3
80+
hostDistro: azl3
81+
hostArch: arm64
82+
permissions:
83+
contents: read
84+
# Azure login.
85+
id-token: write
86+
87+
tests-functional-azl4-on-azl3-arm64:
88+
name: Functional tests AZL4 on AZL3 ARM64
89+
if: ${{ inputs.runFunctionalTests }}
90+
uses: ./.github/workflows/tests-functional.yml
91+
with:
92+
testDistro: azl4
6793
hostDistro: azl3
6894
hostArch: arm64
6995
permissions:
7096
contents: read
7197
# Azure login.
7298
id-token: write
7399

74-
tests-functional-azl-on-ubuntu2404-amd64:
75-
name: Functional tests AZL on Ubuntu24.04 AMD64
100+
tests-functional-azl3-on-ubuntu2404-amd64:
101+
name: Functional tests AZL3 on Ubuntu24.04 AMD64
76102
if: ${{ inputs.runFunctionalTests }}
77103
uses: ./.github/workflows/tests-functional.yml
78104
with:
79-
testDistro: azl
105+
testDistro: azl3
80106
hostDistro: ubuntu2404
81107
hostArch: amd64
82108
permissions:
83109
contents: read
84110
# Azure login.
85111
id-token: write
86112

87-
tests-functional-azl-on-ubuntu2404-arm64:
88-
name: Functional tests AZL on Ubuntu24.04 ARM64
113+
tests-functional-azl4-on-ubuntu2404-amd64:
114+
name: Functional tests AZL4 on Ubuntu24.04 AMD64
115+
if: ${{ inputs.runFunctionalTests }}
116+
uses: ./.github/workflows/tests-functional.yml
117+
with:
118+
testDistro: azl4
119+
hostDistro: ubuntu2404
120+
hostArch: amd64
121+
permissions:
122+
contents: read
123+
# Azure login.
124+
id-token: write
125+
126+
tests-functional-azl3-on-ubuntu2404-arm64:
127+
name: Functional tests AZL3 on Ubuntu24.04 ARM64
128+
if: ${{ inputs.runFunctionalTests }}
129+
uses: ./.github/workflows/tests-functional.yml
130+
with:
131+
testDistro: azl3
132+
hostDistro: ubuntu2404
133+
hostArch: arm64
134+
permissions:
135+
contents: read
136+
# Azure login.
137+
id-token: write
138+
139+
tests-functional-azl4-on-ubuntu2404-arm64:
140+
name: Functional tests AZL4 on Ubuntu24.04 ARM64
89141
if: ${{ inputs.runFunctionalTests }}
90142
uses: ./.github/workflows/tests-functional.yml
91143
with:
92-
testDistro: azl
144+
testDistro: azl4
93145
hostDistro: ubuntu2404
94146
hostArch: arm64
95147
permissions:

‎.github/workflows/tests-functional.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,11 @@ jobs:
9898
./repo/.github/workflows/scripts/download-image.sh "$AZURE_STORAGE" "$AZURE_CONTAINER" "$1" "$2"
9999
}
100100
101-
if [[ "$TEST_DISTRO" == "azl" ]]; then
101+
if [[ "$TEST_DISTRO" == "azl3" ]]; then
102102
download "azure-linux/core-efi-vhdx-2.0-$HOST_ARCH" azl-core-efi-2.0
103103
download "azure-linux/core-efi-vhdx-3.0-$HOST_ARCH" azl-core-efi-3.0
104+
elif [[ "$TEST_DISTRO" == "azl4" ]]; then
105+
download "azure-linux/core-efi-vhdx-4.0-$HOST_ARCH" azl-core-efi-4.0
104106
elif [[ "$TEST_DISTRO" == "ubuntu" ]]; then
105107
download "ubuntu/azure-cloud-vhdx-22.04-$HOST_ARCH" ubuntu-azure-cloud-22.04
106108
download "ubuntu/azure-cloud-vhdx-24.04-$HOST_ARCH" ubuntu-azure-cloud-24.04
@@ -118,8 +120,10 @@ jobs:
118120
run: |
119121
set -eux
120122
pushd repo/toolkit/tools
121-
if [[ "$TEST_DISTRO" == "azl" ]]; then
123+
if [[ "$TEST_DISTRO" == "azl3" ]]; then
122124
./internal/testutils/testrpms/download-test-utils.sh -d azurelinux -t 3.0 -s true
125+
elif [[ "$TEST_DISTRO" == "azl4" ]]; then
126+
./internal/testutils/testrpms/download-test-utils.sh -d azurelinux -t 4.0 -s true
123127
elif [[ "$TEST_DISTRO" == "ubuntu" ]]; then
124128
echo "No test utils needed for Ubuntu tests"
125129
else
@@ -137,12 +141,15 @@ jobs:
137141
138142
AZL2_VHDX=""
139143
AZL3_VHDX=""
144+
AZL4_VHDX=""
140145
UBUNTU2204_VHDX=""
141146
UBUNTU2404_VHDX=""
142147
143-
if [[ "$TEST_DISTRO" == "azl" ]]; then
148+
if [[ "$TEST_DISTRO" == "azl3" ]]; then
144149
AZL2_VHDX="../../../../../azl-core-efi-2.0/image.vhdx"
145150
AZL3_VHDX="../../../../../azl-core-efi-3.0/image.vhdx"
151+
elif [[ "$TEST_DISTRO" == "azl4" ]]; then
152+
AZL4_VHDX="../../../../../azl-core-efi-4.0/image.vhdx"
146153
elif [[ "$TEST_DISTRO" == "ubuntu" ]]; then
147154
UBUNTU2204_VHDX="../../../../../ubuntu-azure-cloud-22.04/image.vhdx"
148155
UBUNTU2404_VHDX="../../../../../ubuntu-azure-cloud-24.04/image.vhdx"
@@ -161,6 +168,7 @@ jobs:
161168
-args \
162169
--base-image-core-efi-azl2 "$AZL2_VHDX" \
163170
--base-image-core-efi-azl3 "$AZL3_VHDX" \
171+
--base-image-core-efi-azl4 "$AZL4_VHDX" \
164172
--base-image-azure-cloud-ubuntu2204 "$UBUNTU2204_VHDX" \
165173
--base-image-azure-cloud-ubuntu2404 "$UBUNTU2404_VHDX" \
166174
2>&1 \

‎.github/workflows/tests-vmtests.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ jobs:
101101
102102
./repo/.github/workflows/scripts/download-image.sh "$AZURE_STORAGE" "$AZURE_CONTAINER" "azure-linux/core-efi-vhdx-2.0-$HOST_ARCH" azl-core-efi-2.0
103103
./repo/.github/workflows/scripts/download-image.sh "$AZURE_STORAGE" "$AZURE_CONTAINER" "azure-linux/core-efi-vhdx-3.0-$HOST_ARCH" azl-core-efi-3.0
104+
./repo/.github/workflows/scripts/download-image.sh "$AZURE_STORAGE" "$AZURE_CONTAINER" "azure-linux/core-efi-vhdx-4.0-$HOST_ARCH" azl-core-efi-4.0
104105
105106
if [ "$HOST_ARCH" == "amd64" ]; then
106107
./repo/.github/workflows/scripts/download-image.sh "$AZURE_STORAGE" "$AZURE_CONTAINER" "azure-linux/core-legacy-vhd-2.0-$HOST_ARCH" azl-core-legacy-2.0
@@ -170,6 +171,7 @@ jobs:
170171
IMAGE_CUSTOMIZER_CONTAINER_TAG="$CONTAINER_TAG" \
171172
CORE_EFI_AZL2="../../../azl-core-efi-2.0/image.vhdx" \
172173
CORE_EFI_AZL3="../../../azl-core-efi-3.0/image.vhdx" \
174+
CORE_EFI_AZL4="../../../azl-core-efi-4.0/image.vhdx" \
173175
CORE_LEGACY_AZL2="$CORE_LEGACY_AZL2" \
174176
CORE_LEGACY_AZL3="$CORE_LEGACY_AZL3" \
175177
RPM_SOURCES_AZL3="$TEST_RPMS_DIR/downloadedrpms/azurelinux/3.0" \

‎docs/imagecustomizer/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ other Linux distributions as well.
5959
Image Customizer supports the following input image distributions:
6060

6161
- Azure Linux 3.0
62+
- Azure Linux 4.0
6263
- Ubuntu 22.04
6364
- Ubuntu 24.04
6465

0 commit comments

Comments
 (0)