From bc6d20c5e8439b9808e976fd728ae6b566dea5de Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 27 Apr 2026 14:51:13 +0100 Subject: [PATCH] Drop the vmware_insecure image Signed-off-by: James Le Cuirot --- .github/workflows/ci.yaml | 2 +- build_library/vm_image_util.sh | 66 ------------------- .../changes/2026-04-27-vmware-insecure.md | 1 + ci-automation/vms.sh | 2 +- .../oem-vagrant-key/files/cloud-config.yml | 4 -- .../oem-vagrant-key/files/grub.cfg | 3 - .../coreos-base/oem-vagrant-key/metadata.xml | 4 -- .../oem-vagrant-key-0.0.3-r1.ebuild | 22 ------- 8 files changed, 3 insertions(+), 101 deletions(-) create mode 100644 changelog/changes/2026-04-27-vmware-insecure.md delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/cloud-config.yml delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3-r1.ebuild diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b5399f2c0a..6edd023009 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -191,7 +191,7 @@ jobs: if echo "$formats" | tr ' ' '\n' | grep -q '^vmware'; then formats=$(echo "$formats" | tr ' ' '\n' | sed '/vmware.*/d') - formats+=" vmware vmware_insecure vmware_ova vmware_raw" + formats+=" vmware vmware_ova vmware_raw" fi if echo "$formats" | tr ' ' '\n' | grep -q -P '^(ami|aws)'; then formats=$(echo "$formats" | tr ' ' '\n' | sed '/ami.*/d' | sed '/aws/d') diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 9f76c22f72..03ead828ab 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -35,7 +35,6 @@ VALID_IMG_TYPES=( vagrant_vmware_fusion virtualbox vmware - vmware_insecure vmware_ova vmware_raw xen @@ -60,7 +59,6 @@ VALID_OEM_PACKAGES=( scaleway stackit vagrant - vagrant-key vagrant-virtualbox virtualbox vmware @@ -191,12 +189,6 @@ IMG_vmware_ova_OEM_SYSEXT=oem-vmware IMG_vmware_raw_OEM_PACKAGE=common-oem-files IMG_vmware_raw_OEM_SYSEXT=oem-vmware -## vmware_insecure -IMG_vmware_insecure_DISK_FORMAT=vmdk_scsi -IMG_vmware_insecure_DISK_LAYOUT=vm -IMG_vmware_insecure_CONF_FORMAT=vmware_zip -IMG_vmware_insecure_OEM_PACKAGE=oem-vagrant-key - ## parallels IMG_parallels_BUNDLE_FORMAT=pvm_tgz IMG_parallels_DISK_FORMAT=hdd @@ -937,64 +929,6 @@ EOF fi } -_write_vmware_zip_conf() { - local src_name=$(basename "$VM_SRC_IMG") - local dst_name=$(basename "$VM_DST_IMG") - local dst_dir=$(dirname "$VM_DST_IMG") - local vmx_path="${dst_dir}/$(_src_to_dst_name "${src_name}" ".vmx")" - local vmx_file=$(basename "${vmx_path}") - local zip="${dst_dir}/$(_src_to_dst_name "${src_name}" ".zip")" - - _write_vmx_conf "$1" - - # Move the disk/vmx to tmp, they will be zipped. - mv "${VM_DST_IMG}" "${VM_TMP_DIR}/${dst_name}" - mv "${vmx_path}" "${VM_TMP_DIR}/${vmx_file}" - cat > "${VM_TMP_DIR}/insecure_ssh_key" < "${VM_README}" < - - - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3-r1.ebuild deleted file mode 100644 index 019f35f0bc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2013 The CoreOS Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="OEM suite for login access via Vagrant's ssh key." -HOMEPAGE="" -SRC_URI="" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -# no source directory -S="${WORKDIR}" - -src_install() { - insinto "/oem" - doins "${FILESDIR}/cloud-config.yml" - doins "${FILESDIR}/grub.cfg" -}