From nobody Mon Feb 9 07:05:49 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657297288; cv=none; d=zohomail.com; s=zohoarc; b=WMrmObgwGLZB412qP/MoaBPaU7j8FkUp4EtwbP8riIVTqtXaq/MM89JbyIV2tlEX4Oieu725/EldYKgrPLt1971HgkefxFEGFY2jRy+55rwLv0D36Cf3ZfMVj2TRu0gKbvUVxMxIuL1YG9elfLOcLD1wF9Xk7y2tgoBhJJCzXBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657297288; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=miGTErF/7pR+SQ6jtLQkb4AvHsimconAZ0YTNQ99h+U=; b=ByPWa/rljo0isHEydJorAn2cy7ew+j90QKQ/3/wbEBAdyq4vKcIB1/43+IQbBwlkmvQ6CHGPaf8kauX7R2aXBA93hUGASWGx6ayuUP1QkDmp7nlmal1UJHgWQ/ML8M6FtT1UuvmGnl9Nns4bIG5OUGVfFT+IxX9tbw/7qPA5ito= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657297288409403.61436932053743; Fri, 8 Jul 2022 09:21:28 -0700 (PDT) Received: from localhost ([::1]:38404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9qjP-0006zx-BU for importer@patchew.org; Fri, 08 Jul 2022 12:21:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9q0j-0006o6-QJ for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:35:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:37519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9q0f-0007Mr-7t for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:35:17 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-301-4fB_UPg0N7S3pIIJSvwCCQ-1; Fri, 08 Jul 2022 11:35:09 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 825E829324AF; Fri, 8 Jul 2022 15:35:08 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1445C18EB5; Fri, 8 Jul 2022 15:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657294510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=miGTErF/7pR+SQ6jtLQkb4AvHsimconAZ0YTNQ99h+U=; b=iFsgQezDLEvFdlshHzbBtx6KoXZ8JiEbxqjzFI6jLJaG3X15nUZrpHadO6LgRZqpRUdvNO NIgn9IKN8f/Ao96OAgAjjGhCE+1lm9jvYZ7MyYf4wwS7zpx1pC4l7MUcGFmEeKpoKj/+wq 2BG6vrMrKmTJ/UeCTi01gA0drYhmBOg= X-MC-Unique: 4fB_UPg0N7S3pIIJSvwCCQ-1 From: John Snow To: qemu-devel@nongnu.org Cc: Hanna Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Daniel Berrange , Thomas Huth , Wainer dos Santos Moschetta , qemu-block@nongnu.org, Kevin Wolf , Beraldo Leal , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , John Snow Subject: [PATCH v4 06/12] tests/vm: remove ubuntu.i386 VM test Date: Fri, 8 Jul 2022 11:34:57 -0400 Message-Id: <20220708153503.18864-7-jsnow@redhat.com> In-Reply-To: <20220708153503.18864-1-jsnow@redhat.com> References: <20220708153503.18864-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657297290453100003 Ubuntu 18.04 is out of our support window, and Ubuntu 20.04 does not support i386 anymore. The debian project does, but they do not provide any cloud images for it, a new expect-style script would have to be written. Since we have i386 cross-compiler tests hosted on GitLab CI, we don't need to support this VM test anymore. Signed-off-by: John Snow Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- tests/vm/Makefile.include | 3 +-- tests/vm/ubuntu.i386 | 40 --------------------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100755 tests/vm/ubuntu.i386 diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 5f5b1fbfe68..a94f0ebf7f1 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -17,7 +17,7 @@ EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarc= h64-code.fd) =20 X86_IMAGES :=3D freebsd netbsd openbsd centos fedora haiku.x86_64 ifneq ($(GENISOIMAGE),) -X86_IMAGES +=3D ubuntu.i386 centos +X86_IMAGES +=3D centos ifneq ($(EFI_AARCH64),) ARM64_IMAGES +=3D ubuntu.aarch64 centos.aarch64 endif @@ -48,7 +48,6 @@ vm-help vm-test: @echo " vm-build-fedora - Build QEMU in Fedora VM" ifneq ($(GENISOIMAGE),) @echo " vm-build-centos - Build QEMU in CentOS VM, with = Docker" - @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM" ifneq ($(EFI_AARCH64),) @echo " vm-build-ubuntu.aarch64 - Build QEMU in ubuntu aarch64 V= M" @echo " vm-build-centos.aarch64 - Build QEMU in CentOS aarch64 V= M" diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 deleted file mode 100755 index 47681b6f87d..00000000000 --- a/tests/vm/ubuntu.i386 +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python3 -# -# Ubuntu i386 image -# -# Copyright 2017 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 sys -import basevm -import ubuntuvm - -DEFAULT_CONFIG =3D { - 'install_cmds' : "apt-get update,"\ - "apt-get build-dep -y qemu,"\ - "apt-get install -y libfdt-dev language-pack-en ninja= -build", -} - -class UbuntuX86VM(ubuntuvm.UbuntuVM): - name =3D "ubuntu.i386" - arch =3D "i386" - image_link=3D"https://cloud-images.ubuntu.com/releases/bionic/"\ - "release-20191114/ubuntu-18.04-server-cloudimg-i386.img" - image_sha256=3D"28969840626d1ea80bb249c08eef1a4533e8904aa51a327b40f37a= c4b4ff04ef" - BUILD_SCRIPT =3D """ - set -e; - cd $(mktemp -d); - sudo chmod a+r /dev/vdb; - tar -xf /dev/vdb; - ./configure {configure_opts}; - make --output-sync {target} -j{jobs} {verbose}; - """ - -if __name__ =3D=3D "__main__": - sys.exit(basevm.main(UbuntuX86VM, DEFAULT_CONFIG)) --=20 2.34.3