File tree Expand file tree Collapse file tree 2 files changed +22
-5
lines changed Expand file tree Collapse file tree 2 files changed +22
-5
lines changed Original file line number Diff line number Diff line change @@ -31,20 +31,22 @@ CONTAINERS_JSON=$(
31
31
--prefix " $IMAGE_NAME /"
32
32
)
33
33
34
- LATEST_DIR =$(
34
+ LATEST_IMAGE =$(
35
35
jq \
36
36
-r \
37
37
--arg image " $IMAGE_NAME " \
38
- ' [.[].name | select(endswith("/image.vhdx")) | rtrimstr ("/image.vhdx" )] | sort | last' \
38
+ ' [.[].name | select(endswith("/image.vhdx") or endswith ("/image.vhd") )] | sort | last' \
39
39
<<< " $CONTAINERS_JSON" \
40
40
)
41
41
42
- echo " Latest: $LATEST_DIR "
42
+ echo " Latest: $LATEST_IMAGE "
43
+
44
+ FILENAME=" $( basename " $LATEST_IMAGE " ) "
43
45
44
46
az storage blob download \
45
47
--auth-mode login \
46
48
--account-name " $ACCOUNT " \
47
49
--container-name " $CONTAINER " \
48
- --name " $LATEST_DIR /image.vhdx " \
49
- --file " $OUTPUT_DIR /image.vhdx " \
50
+ --name " $LATEST_IMAGE " \
51
+ --file " $OUTPUT_DIR /$FILENAME " \
50
52
--output none
Original file line number Diff line number Diff line change 93
93
94
94
./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
95
95
./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
96
+
97
+ if [ "$HOST_ARCH" == "amd64" ]; then
98
+ ./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
99
+ ./repo/.github/workflows/scripts/download-image.sh "$AZURE_STORAGE" "$AZURE_CONTAINER" "azure-linux/core-legacy-vhd-3.0-$HOST_ARCH" azl-core-legacy-3.0
100
+ fi
96
101
env :
97
102
HOST_ARCH : ${{ inputs.hostArch }}
98
103
AZURE_STORAGE : ${{ vars.AZURE_STORAGE }}
@@ -133,12 +138,22 @@ jobs:
133
138
134
139
pushd ./repo/test/vmtests
135
140
141
+ CORE_LEGACY_AZL2=""
142
+ CORE_LEGACY_AZL3=""
143
+ if [ "$HOST_ARCH" == "amd64" ]; then
144
+ CORE_LEGACY_AZL2="../../../azl-core-legacy-2.0/image.vhd"
145
+ CORE_LEGACY_AZL3="../../../azl-core-legacy-3.0/image.vhd"
146
+ fi
147
+
136
148
sudo make test \
137
149
IMAGE_CUSTOMIZER_CONTAINER_TAG="$CONTAINER_TAG" \
138
150
CORE_EFI_AZL2="../../../azl-core-efi-2.0/image.vhdx" \
139
151
CORE_EFI_AZL3="../../../azl-core-efi-3.0/image.vhdx" \
152
+ CORE_LEGACY_AZL2="$CORE_LEGACY_AZL2" \
153
+ CORE_LEGACY_AZL3="$CORE_LEGACY_AZL3" \
140
154
SSH_PRIVATE_KEY_FILE=~/.ssh/id_ed25519
141
155
env :
156
+ HOST_ARCH : ${{ inputs.hostArch }}
142
157
CONTAINER_TAG : ${{ steps.importContainer.outputs.containerTag }}
143
158
144
159
- uses : actions/upload-artifact@v4
You can’t perform that action at this time.
0 commit comments