Re: [PATCH 4/4] tests/vm: remove plain centos image

2024-05-21 Thread Thomas Huth

On 21/05/2024 14.53, Alex Bennée wrote:

This isn't really used and we have lighter weight docker containers
for testing this stuff directly.

Signed-off-by: Alex Bennée 
---
  tests/vm/Makefile.include |  1 -
  tests/vm/centos   | 51 ---
  2 files changed, 52 deletions(-)
  delete mode 100755 tests/vm/centos


Reviewed-by: Thomas Huth 




[PATCH 4/4] tests/vm: remove plain centos image

2024-05-21 Thread Alex Bennée
This isn't really used and we have lighter weight docker containers
for testing this stuff directly.

Signed-off-by: Alex Bennée 
---
 tests/vm/Makefile.include |  1 -
 tests/vm/centos   | 51 ---
 2 files changed, 52 deletions(-)
 delete mode 100755 tests/vm/centos

diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index ac56824a87..13ed80f72d 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -45,7 +45,6 @@ vm-help vm-test:
@echo "  vm-build-netbsd - Build QEMU in NetBSD VM"
@echo "  vm-build-openbsd- Build QEMU in OpenBSD VM"
 ifneq ($(GENISOIMAGE),)
-   @echo "  vm-build-centos - Build QEMU in CentOS VM, 
with Docker"
 ifneq ($(EFI_AARCH64),)
@echo "  vm-build-ubuntu.aarch64 - Build QEMU in ubuntu aarch64 
VM"
@echo "  vm-build-centos.aarch64 - Build QEMU in CentOS aarch64 
VM"
diff --git a/tests/vm/centos b/tests/vm/centos
deleted file mode 100755
index d25c8f8b5b..00
--- a/tests/vm/centos
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-#
-# CentOS 8 Stream image
-#
-# Copyright 2018, 2022 Red Hat Inc.
-#
-# Authors:
-#  Fam Zheng 
-#
-# This code is licensed under the GPL version 2 or later.  See
-# the COPYING file in the top-level directory.
-#
-
-import os
-import sys
-import subprocess
-import basevm
-import time
-
-class CentosVM(basevm.BaseVM):
-name = "centos"
-arch = "x86_64"
-BUILD_SCRIPT = """
-set -e;
-cd $(mktemp -d);
-export SRC_ARCHIVE=/dev/vdb;
-sudo chmod a+r $SRC_ARCHIVE;
-tar -xf $SRC_ARCHIVE;
-make docker-test-block@centos9 {verbose} J={jobs} NETWORK=1;
-make docker-test-quick@centos9 {verbose} J={jobs} NETWORK=1;
-"""
-
-def build_image(self, img):
-cimg = 
self._download_with_cache("https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qcow2;)
-img_tmp = img + ".tmp"
-subprocess.check_call(['cp', '-f', cimg, img_tmp])
-self.exec_qemu_img("resize", img_tmp, "50G")
-self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()])
-self.wait_ssh()
-self.ssh_root_check("touch /etc/cloud/cloud-init.disabled")
-self.ssh_root_check("dnf update -y")
-self.ssh_root_check("dnf install -y dnf-plugins-core")
-self.ssh_root_check("dnf config-manager --set-enabled powertools")
-self.ssh_root_check("dnf install -y podman make ninja-build git 
python3")
-self.ssh_root("poweroff")
-self.wait()
-os.rename(img_tmp, img)
-return 0
-
-if __name__ == "__main__":
-sys.exit(basevm.main(CentosVM))
-- 
2.39.2