Skip to content

Commit 9dda00a

Browse files
andrewd-zededarene
authored andcommitted
kubevirt arm build and publish additions
- For builds add hv=kubevirt arch=arm64 platform=generic,nvidia-jp5,nvidia-jp6 - For publish add all kubevirt Signed-off-by: Andrew Durbin <andrewd@zededa.com>
1 parent f59e10e commit 9dda00a

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

.github/workflows/assets.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54+
hv: [kvm, kubevirt]
5455
arch: [amd64, arm64]
5556
steps:
5657
- name: checkout repo
@@ -73,20 +74,20 @@ jobs:
7374
# if the default server is responding -- we can skip apt update
7475
$APT_INSTALL || { sudo apt update && $APT_INSTALL ; }
7576
echo "ARCH=${{ matrix.arch }}" >> "$GITHUB_ENV"
77+
echo "EVEHV=${{ matrix.hv }}" >> "$GITHUB_ENV"
7678
echo "TAG=$(git describe --always --tags | grep -E '[0-9]+\.[0-9]+\.[0-9]' || echo snapshot)" >> "$GITHUB_ENV"
7779
- name: ensure clean assets directory
7880
run: |
7981
rm -rf assets && mkdir -p assets
8082
- name: Pull the EVE release from DockerHUB or build it
8183
run: |
82-
HV=kvm
8384
if [ "${{ github.event.repository.full_name }}" = "rene/eve" ]; then
84-
EVE=10.208.13.132/lfedge/eve:${TAG}-${HV}-${{ env.ARCH }}
85+
EVE=10.208.13.132/lfedge/eve:${TAG}-${{ env.EVEHV }}-${{ env.ARCH }}
8586
docker pull "$EVE"
8687
else
8788
make pkgs
88-
make HV=${HV} ZARCH=${{ env.ARCH }} eve
89-
EVE=10.208.13.132/lfedge/eve:$(make version)-${HV}-${{ env.ARCH }}
89+
make HV=${{ env.EVEHV }} ZARCH=${{ env.ARCH }} eve
90+
EVE=10.208.13.132/lfedge/eve:$(make version)-${{ env.EVEHV }}-${{ env.ARCH }}
9091
fi
9192
docker run "$EVE" rootfs > assets/rootfs.img
9293
docker run "$EVE" installer_net | tar -C assets -xvf -
@@ -100,8 +101,7 @@ jobs:
100101
sed -e 's#{mac:hexhyp}#{ip}#' < assets/ipxe.efi.cfg > assets/ipxe.efi.ip.cfg
101102
- name: Pull eve-sources and publish collected_sources.tar.gz to assets
102103
run: |
103-
HV=kvm
104-
EVE_SOURCES=10.208.13.132/lfedge/eve-sources:${TAG}-${HV}-${{ env.ARCH }}
104+
EVE_SOURCES=10.208.13.132/lfedge/eve-sources:${TAG}-${{ env.EVEHV }}-${{ env.ARCH }}
105105
docker pull "$EVE_SOURCES"
106106
docker create --name eve_sources "$EVE_SOURCES" bash
107107
docker export --output assets/collected_sources.tar.gz eve_sources

.github/workflows/build.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,11 @@ jobs:
109109
hv: kvm
110110
platform: "rt"
111111
- arch: arm64
112-
hv: kvm
112+
hv: [kvm, kubevirt]
113113
platform: "nvidia-jp5"
114114
- arch: arm64
115-
hv: kvm
115+
hv: [kvm, kubevirt]
116116
platform: "nvidia-jp6"
117-
exclude:
118-
- arch: arm64
119-
hv: kubevirt
120-
platform: "generic"
121117

122118
steps:
123119
- uses: actions/checkout@v4

.github/workflows/buildondemand.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
fail-fast: false
9090
matrix:
9191
arch: [arm64, amd64]
92-
hv: [xen, kvm]
92+
hv: [xen, kvm, kubevirt]
9393
platform: ["generic"]
9494
include:
9595
- arch: riscv64
@@ -99,10 +99,10 @@ jobs:
9999
hv: kvm
100100
platform: "rt"
101101
- arch: arm64
102-
hv: kvm
102+
hv: [kvm, kubevirt]
103103
platform: "nvidia-jp5"
104104
- arch: arm64
105-
hv: kvm
105+
hv: [kvm, kubevirt]
106106
platform: "nvidia-jp6"
107107
- arch: arm64
108108
hv: kvm

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,17 @@ jobs:
187187
fail-fast: false
188188
matrix:
189189
arch: [arm64, amd64]
190-
hv: [kvm, xen]
190+
hv: [kvm, xen, kubevirt]
191191
platform: ["generic"]
192192
include:
193193
- arch: riscv64
194194
hv: mini
195195
platform: "generic"
196196
- arch: arm64
197-
hv: kvm
197+
hv: [kvm, kubevirt]
198198
platform: "nvidia-jp5"
199199
- arch: arm64
200-
hv: kvm
200+
hv: [kvm, kubevirt]
201201
platform: "nvidia-jp6"
202202
steps:
203203
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)