Skip to content

Commit 5f3a146

Browse files
committed
change workflow
1 parent c75aeb4 commit 5f3a146

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

.github/workflows/build-openstack-capi-image.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ env:
2626
version: ${{ inputs.version }}
2727
tag: ${{ inputs.tag }}
2828

29-
3029
# defaults:
3130
# run:
3231
# working-directory: ./images/capi
@@ -38,30 +37,24 @@ jobs:
3837
image: ghcr.io/elastisys/image-builder-amd64:Automate-production-of-CAPI-VM-images-ce6595cad6edd0486d3b0c0d436f637ca8214d5f
3938

4039
steps:
41-
# - uses: actions/checkout@v5
42-
# name: Checkout
43-
44-
4540
# - name: Enable KVM
4641
# run: |
4742
# echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
4843
# sudo udevadm control --reload-rules
4944
# sudo udevadm trigger --name-match=kvm
5045

51-
5246
- name: replace variables
5347
run: |
5448
package="${version}-1.1"
5549
series="${version%.*}"
56-
50+
5751
sed -r \
5852
-e "s/\\\$KUBERNETES_SERIES/${series}/" \
5953
-e "s/\\\$KUBERNETES_VERSION/${version}/" \
6054
-e "s/\\\$KUBERNETES_DEB_VERSION/${package}/" \
6155
-e "s/\\\$IMAGE_TAG/${tag}/" \
6256
<"template.json" >"kubernetes.json"
6357
64-
6558
- name: build openstack image
6659
run: make build-qemu-ubuntu-2404-efi
6760
env:

images/capi/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ COPY --chown=imagebuilder:imagebuilder hack hack/
5555
COPY --chown=imagebuilder:imagebuilder packer packer/
5656
COPY --chown=imagebuilder:imagebuilder Makefile Makefile
5757
COPY --chown=imagebuilder:imagebuilder azure_targets.sh azure_targets.sh
58+
COPY --chown=imagebuilder:imagebuilder template.json template.json
5859

5960
ENV PATH="/home/imagebuilder/.local/bin:${PATH}"
6061
ENV PACKER_ARGS=''

0 commit comments

Comments
 (0)