Skip to content

Commit cc754f0

Browse files
committed
update
1 parent 8286224 commit cc754f0

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

.github/workflows/buid-vm-image-manual.yml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,36 +38,22 @@ jobs:
3838
- name: install qemu-kvn
3939
run: |
4040
sudo apt update && \
41-
sudo apt upgrade && \
41+
sudo apt upgrade -y && \
4242
sudo apt install -y qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils qemu-utils
4343
4444
4545
- name: replace variables
4646
run: |
47-
48-
if [[ "${version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-[0-9]+\.[0-9]+$ ]]; then
49-
package="${version}"
50-
version="${version%-*}"
51-
series="${version%.*}"
52-
53-
elif [[ "${version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
54-
echo "warning: $(basename "${0}") will assume ${version}-1.1 as the package version!"
55-
56-
package="${version}-1.1"
57-
series="${version%.*}"
58-
59-
else
60-
echo "error: $(basename "${0}") requires a version (X.Y.Z or X.Y.Z-N.N) as an argument!" >&2
61-
exit 1
62-
fi
63-
47+
package="${version}-1.1"
48+
series="${version%.*}"
6449
6550
sed -r \
6651
-e "s/\\\$KUBERNETES_SERIES/${series}/" \
6752
-e "s/\\\$KUBERNETES_VERSION/${version}/" \
6853
-e "s/\\\$KUBERNETES_DEB_VERSION/${package}/" \
6954
-e "s/\\\$IMAGE_TAG/${tag}/" \
70-
"template.json"
55+
<"template.json" >"kubernetes.json"
56+
7157
working-directory: ./images/capi
7258

7359
- name: install dependencies for openstack
@@ -86,7 +72,7 @@ jobs:
8672
run: make build-qemu-ubuntu-2404-efi
8773
env:
8874
PACKER_LOG: 1
89-
PACKER_VAR_FILES: template.json
75+
PACKER_VAR_FILES: kubernetes.json
9076
working-directory: ./images/capi
9177

9278

0 commit comments

Comments
 (0)