Skip to content

Commit 22be3f0

Browse files
authored
Fix another issues in multi-arch images (#3313)
* Fix another issue in multi-arch images Follow-up of PR #3303 - need to push the images before creating the manifest, also for the index image. Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com> * Enable multi-ach images on nightly test Install qemu-user-static, to allow running binary from one arch, on image build for another arch. Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com> --------- Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com>
1 parent 6ab4fe5 commit 22be3f0

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

automation/nightly/test-nightly-build.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ function dump() {
1818

1919
# Get golang
2020
$CRI_BIN login --username "$(cat "${QUAY_USER}")" --password-stdin quay.io < "${QUAY_PASSWORD}"
21-
wget -q https://dl.google.com/go/go1.22.6.linux-amd64.tar.gz
21+
wget -q https://dl.google.com/go/go1.23.5.linux-amd64.tar.gz
2222
tar -C /usr/local -xf go*.tar.gz
2323
export PATH=/usr/local/go/bin:$PATH
2424

25+
# add qemu-user-static
26+
$CRI_BIN run --rm --privileged docker.io/multiarch/qemu-user-static --reset -p yes
27+
2528
# get latest KubeVirt commit
2629
latest_kubevirt=$(curl -sL https://storage.googleapis.com/kubevirt-prow/devel/nightly/release/kubevirt/kubevirt/latest)
2730
latest_kubevirt_image=$(curl -sL "https://storage.googleapis.com/kubevirt-prow/devel/nightly/release/kubevirt/kubevirt/${latest_kubevirt}/kubevirt-operator.yaml" | grep 'OPERATOR_IMAGE' -A1 | tail -n 1 | sed 's/.*value: //g')

hack/build-index-image.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,10 @@ function create_file_based_catalog() {
8484

8585
IMAGES=
8686
for arch in ${ARCHITECTURES}; do
87-
podman build --platform="linux/${arch}" -t "${INDEX_IMAGE_NAME}-${arch}" -f fbc-catalog.Dockerfile
88-
IMAGES="${IMAGES} ${INDEX_IMAGE_NAME}-${arch}"
87+
current_image="${INDEX_IMAGE_NAME}-${arch}"
88+
podman build --platform="linux/${arch}" -t "${current_image}" -f fbc-catalog.Dockerfile
89+
podman push "${current_image}"
90+
IMAGES="${IMAGES} ${current_image}"
8991
done
9092

9193
podman manifest create "${INDEX_IMAGE_NAME}" ${IMAGES}

0 commit comments

Comments
 (0)