Skip to content

Commit

Permalink
podvm: fix qemu plugin missing failure during s390x rhel podvm image …
Browse files Browse the repository at this point in the history
…builds

Removed required_plugins section from rhel/qemu-rhel.pkr.hcl as plugin are not available for s390x.

Signed-off-by: Saripalli Lavanya <Saripalli.Lavanya@ibm.com>
  • Loading branch information
Saripalli-lavanya authored and bpradipt committed May 27, 2024
1 parent a5e37f4 commit 4a7a6a1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
3 changes: 2 additions & 1 deletion src/cloud-api-adaptor/podvm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ $(IMAGE_FILE): $(BINARIES) $(FILES) setopts
if [ "${SE_BOOT}" = "1" ] && [ "${ARCH}" = "s390x" ]; then \
qemu-img create -f qcow2 "se-${IMAGE_FILE}" 100G; \
fi
packer init ./qcow2/${PODVM_DISTRO}
if [ "${ARCH}" = "x86_64" ]; then \
packer init qcow2/rhel/qemu-rhel.pkr.hcl; \
packer plugins install github.com/hashicorp/qemu v1.1.0; \
fi
packer build ${PACKER_DEFAULT_OPTS} ${OPTS} qcow2/$(PODVM_DISTRO)
rm -fr toupload
Expand Down
8 changes: 0 additions & 8 deletions src/cloud-api-adaptor/podvm/qcow2/rhel/qemu-rhel.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
packer {
required_plugins {
qemu = {
version = "1.1.0"
source = "github.com/hashicorp/qemu"
}
}
}

locals {
machine_type = "${var.os_arch}" == "x86_64" && "${var.is_uefi}" ? "q35" : "${var.machine_type}"
Expand Down

0 comments on commit 4a7a6a1

Please sign in to comment.