From 08ede194826b370b18707bd5968923e5215058c1 Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Tue, 24 Sep 2024 11:28:14 +0500 Subject: [PATCH 1/2] PMM-7 Pull ova box from s3 instead of vagrant cloud. --- build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Makefile b/build/Makefile index c7dc4e9795..12ef2db958 100644 --- a/build/Makefile +++ b/build/Makefile @@ -22,7 +22,7 @@ fetch-el9: -o ${PACKER_CACHE_DIR}/id_rsa_vagrant chmod 600 ${PACKER_CACHE_DIR}/id_rsa_vagrant test -f ${PACKER_CACHE_DIR}/box/oracle9.ova \ - || wget --progress=dot:giga https://vagrantcloud.com/bento/boxes/oracle-9.0/versions/202207.20.0/providers/virtualbox.box -O ${PACKER_CACHE_DIR}/box/oracle9.ova + || wget --progress=dot:giga https://pmm-build-cache.s3.us-east-2.amazonaws.com/VBOXES/oracle9-202401.31.0.box -O ${PACKER_CACHE_DIR}/box/oracle9.ova # NOTE: image from vagrant registry is twice as large test -f ${PACKER_CACHE_DIR}/box/box.ovf \ From baf413b1d7862932536771071d768da95ea4cc20 Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Tue, 24 Sep 2024 14:31:23 +0500 Subject: [PATCH 2/2] Update build/Makefile Co-authored-by: Alex Demidoff --- build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Makefile b/build/Makefile index 12ef2db958..069f29a9e9 100644 --- a/build/Makefile +++ b/build/Makefile @@ -22,7 +22,7 @@ fetch-el9: -o ${PACKER_CACHE_DIR}/id_rsa_vagrant chmod 600 ${PACKER_CACHE_DIR}/id_rsa_vagrant test -f ${PACKER_CACHE_DIR}/box/oracle9.ova \ - || wget --progress=dot:giga https://pmm-build-cache.s3.us-east-2.amazonaws.com/VBOXES/oracle9-202401.31.0.box -O ${PACKER_CACHE_DIR}/box/oracle9.ova + || curl -fL https://pmm-build-cache.s3.us-east-2.amazonaws.com/VBOXES/oracle9-202401.31.0.box -o ${PACKER_CACHE_DIR}/box/oracle9.ova # NOTE: image from vagrant registry is twice as large test -f ${PACKER_CACHE_DIR}/box/box.ovf \