From 4a7a6a1db80412ca1115db98fa6693cf3151ca27 Mon Sep 17 00:00:00 2001 From: Saripalli Lavanya Date: Fri, 3 May 2024 11:03:38 +0530 Subject: [PATCH] podvm: fix qemu plugin missing failure during s390x rhel podvm image builds Removed required_plugins section from rhel/qemu-rhel.pkr.hcl as plugin are not available for s390x. Signed-off-by: Saripalli Lavanya --- src/cloud-api-adaptor/podvm/Makefile | 3 ++- src/cloud-api-adaptor/podvm/qcow2/rhel/qemu-rhel.pkr.hcl | 8 -------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/cloud-api-adaptor/podvm/Makefile b/src/cloud-api-adaptor/podvm/Makefile index 089de5988..ff647a8f0 100644 --- a/src/cloud-api-adaptor/podvm/Makefile +++ b/src/cloud-api-adaptor/podvm/Makefile @@ -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 diff --git a/src/cloud-api-adaptor/podvm/qcow2/rhel/qemu-rhel.pkr.hcl b/src/cloud-api-adaptor/podvm/qcow2/rhel/qemu-rhel.pkr.hcl index 906178f6d..381f03046 100644 --- a/src/cloud-api-adaptor/podvm/qcow2/rhel/qemu-rhel.pkr.hcl +++ b/src/cloud-api-adaptor/podvm/qcow2/rhel/qemu-rhel.pkr.hcl @@ -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}"