From patchwork Mon Nov 2 14:42:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11874057 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 27F2B921 for ; Mon, 2 Nov 2020 14:44:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE76122409 for ; Mon, 2 Nov 2020 14:44:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RRhKsSMQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE76122409 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:54666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZb4U-00041h-Uf for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Nov 2020 09:44:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZb2y-00023K-SA for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZb2x-00056I-1M for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604328178; 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=0UYZMAjZdsbOMrPX+8Jgmz9tN62XrUtMBK1x3PbC+Aw=; b=RRhKsSMQduGnJNwDczl75swbIy5rmF3RzvLC9IM3n2YnXQJla9epnzA9AvtlduF3Ih2EJc O8X3Hn7pTadBFPz4qtzlw88n45JPe1Wn9GVQTJlOlBsh82s7mU5q439vrcC2kbinLoQg+G vicaOIdQP2RRG9BOiVRYlVvx810l6Yo= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14-VEVnV-M1N2-UCnDOBVB5-g-1; Mon, 02 Nov 2020 09:42:56 -0500 X-MC-Unique: VEVnV-M1N2-UCnDOBVB5-g-1 Received: by mail-wr1-f70.google.com with SMTP id i1so6495425wrb.18 for ; Mon, 02 Nov 2020 06:42:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0UYZMAjZdsbOMrPX+8Jgmz9tN62XrUtMBK1x3PbC+Aw=; b=G6YL6bpJ9DaSXgsETNRMr5O+W8FqvQOEQETuspny7aDjzgtcupuKta1EHEHvGXC77q RO+8XUWXjYGRpNUJR9Gok9P2d3HfCbxXWwjHIThYqbmmCo4RUBnKSY1CTVcOxBaCrdxU aaWTJCJ47ePN43zVD/zsB1rd3ztd3ifYmHomj7xfTL4uodc09CVw8avLZNoDHWLWQD1S eZqQd34bXDf8kxt0kgOhwXWGkPmi0bF30ahQ4E0gwN74X5OBEf6YDxSgh/rgzmpBNCdO SOyBfh0wE2iOBImdh/AUNI8gYfzuvo73vGp9bMDB/LOpilSnR/B72vtQqf3aM2W3zKAE aGFg== X-Gm-Message-State: AOAM532epYSUfM7NlmU/duaz2t6lbckyEgrFFCEYgqu76jHyzWfZHDBi Z95JE3ivvyTdWV5hQVwOyU2clq51OEF/xIfNfLNZHyWaQ/j9Kr/+AgtrhSy4bmJkEZRah8KE43f zyvcbN08Xf7Km+ak= X-Received: by 2002:adf:fd8a:: with SMTP id d10mr19953668wrr.85.1604328175170; Mon, 02 Nov 2020 06:42:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwhUurGPjd7MjqRJk55FT+bsDcssvJr4f8xbzMPSaiwDsDHEzYI7k+J13o1BvOQ1u7yAhBPg== X-Received: by 2002:adf:fd8a:: with SMTP id d10mr19953642wrr.85.1604328174982; Mon, 02 Nov 2020 06:42:54 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id b8sm1715681wmj.9.2020.11.02.06.42.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 06:42:54 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: "Daniel P . Berrange" , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , Eduardo Habkost Subject: [PATCH-for-5.2? 1/5] tests/acceptance: Restrict virtio_check_params tests to X86 target Date: Mon, 2 Nov 2020 15:42:41 +0100 Message-Id: <20201102144245.2134077-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201102144245.2134077-1-philmd@redhat.com> References: <20201102144245.2134077-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/02 03:02:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Sarah Harris , Michael Rolnik , Yoshinori Sato , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Mark Cave-Ayland , Aleksandar Rikalo , Fabien Chouteau , Aurelien Jarno , KONRAD Frederic , =?utf-8?q?Herv=C3=A9_Poussin?= =?utf-8?q?eau?= , qemu-ppc@nongnu.org, Jiaxun Yang , Pavel Dovgalyuk , Paolo Bonzini , qemu-arm@nongnu.org, Antony Pavlov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We disabled the virtio_check_params tests in commit 2d6a6e238a2 ("tests/acceptance/virtio_check_params: Disable the test"), because these tests were making multiarch CI fail (virtio is multiarch). We took the big hammer, as we can restrict the tests to the X86 arch. Restore them on this single arch. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo --- tests/acceptance/virtio_check_params.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index 87e6c839d14..fecf1c094b1 100644 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -42,6 +42,12 @@ class VirtioMaxSegSettingsCheck(Test): + """ + This test should be multi-arch, however only X86 is implemented. + + :avocado: tags=arch:x86_64 + """ + @staticmethod def make_pattern(props): pattern_items = ['{0} = \w+'.format(prop) for prop in props] @@ -117,7 +123,6 @@ def seg_max_adjust_enabled(mt): return True return False - @skip("break multi-arch CI") def test_machine_types(self): # collect all machine types except 'none', 'isapc', 'microvm' with QEMUMachine(self.qemu_bin) as vm: From patchwork Mon Nov 2 14:42:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11874065 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A74D192C for ; Mon, 2 Nov 2020 14:46:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A43E22453 for ; Mon, 2 Nov 2020 14:46:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="G6lBXEbc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A43E22453 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:34838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZb6X-0007V9-Im for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Nov 2020 09:46:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZb36-00027m-2o for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43131) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZb33-00059Z-NN for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604328183; 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=j3HaWimA2sQhV0m5yDO0w67enm5B0faDw85mk9Xsiio=; b=G6lBXEbcTxcy38IKL4wZpYPKNL0bpA5crNLeK2ey5LgE/KJ/CAEVZLVQB6e1dqUkdwaLzt xFQilriODF9Ga6uZZgrl3zd9x+jP7kLgXl7Ex79XFka3iZF3qLcJjg1yeYDr+54qfauV8m RsmP95Ld45+fYW63yQyiCEjb0/fir54= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-184-zYAJKrWUPA-CnM_xmEbOSw-1; Mon, 02 Nov 2020 09:43:02 -0500 X-MC-Unique: zYAJKrWUPA-CnM_xmEbOSw-1 Received: by mail-wm1-f69.google.com with SMTP id z7so3414092wme.8 for ; Mon, 02 Nov 2020 06:43:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j3HaWimA2sQhV0m5yDO0w67enm5B0faDw85mk9Xsiio=; b=dm94oege8vn1Qrid0zA4yONaCtCE9NPHWaWTlvbCHwls4TtfNko+iIQnrSGp8TXiEP rv97ObsL4zfL8O2ms0gV2RpPMetE+lZvcTAZpeDZnB/3uZzZHXp4eyWd0ARLhgXh1Pkp Yp+dq4po4xq8RlRcQxZJ3HTAR48ZYxEA2zibZ0VJTrDKST+Agz5knlWyQOtfZfQdoKXP mOxz8F4un+IOm6tbnX21vgs0vjUay3f8vxuCHXANzHzxMdxCwl1sYBXFmdbl60tIHxk7 v0jbiFdFsY6fA3ih4s9u5WDgQ0S23glssFPuuNUHDJZ0LKGMcWShavVmBRcCdfNqTxdj 5dhQ== X-Gm-Message-State: AOAM530mUwRgXqnR1+wwmltPghXtyOmTZtlJ+RJWSnleS35ymtI1hX6R aL8YmRQkZUtALGBgkKrJeXE5f73WsQrHwQ5VX2tB6WBz73nx4iIoxVQO/Tl0dxC7KK34VB38p+1 FhmmEhDeJvuvKJ1I= X-Received: by 2002:adf:a303:: with SMTP id c3mr20547925wrb.417.1604328180671; Mon, 02 Nov 2020 06:43:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKqSrSnCfKuauKcpuql6Y2lxNqP4TC9X/JlJSZuojLMeDbMpjmMXhALtoOf8Y76G/uZTVX5Q== X-Received: by 2002:adf:a303:: with SMTP id c3mr20547894wrb.417.1604328180546; Mon, 02 Nov 2020 06:43:00 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id o186sm16176699wmb.12.2020.11.02.06.42.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 06:42:59 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: "Daniel P . Berrange" , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , Eduardo Habkost Subject: [PATCH-for-5.2? 2/5] tests/acceptance: Restore MIPS Malta multicore tests Date: Mon, 2 Nov 2020 15:42:42 +0100 Message-Id: <20201102144245.2134077-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201102144245.2134077-1-philmd@redhat.com> References: <20201102144245.2134077-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/02 03:02:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Sarah Harris , Michael Rolnik , Yoshinori Sato , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Mark Cave-Ayland , Aleksandar Rikalo , Fabien Chouteau , Aurelien Jarno , KONRAD Frederic , =?utf-8?q?Herv=C3=A9_Poussin?= =?utf-8?q?eau?= , qemu-ppc@nongnu.org, Jiaxun Yang , Pavel Dovgalyuk , Paolo Bonzini , qemu-arm@nongnu.org, Antony Pavlov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Since 42a052333a6 ("hw/misc/mips_cpc: Start vCPU when powered on") the multicore support of the MIPS Malta board has been fixed. This reverts commit 61bbce96fe4c8e3a2b7df5a67ba7dc6ba418e54b. Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/machine_mips_malta.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/acceptance/machine_mips_malta.py b/tests/acceptance/machine_mips_malta.py index 7c9a4ee4d2d..eea046141d6 100644 --- a/tests/acceptance/machine_mips_malta.py +++ b/tests/acceptance/machine_mips_malta.py @@ -100,7 +100,6 @@ def test_mips_malta_i6400_framebuffer_logo_1core(self): """ self.do_test_i6400_framebuffer_logo(1) - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_mips_malta_i6400_framebuffer_logo_7cores(self): """ :avocado: tags=arch:mips64el @@ -110,7 +109,6 @@ def test_mips_malta_i6400_framebuffer_logo_7cores(self): """ self.do_test_i6400_framebuffer_logo(7) - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_mips_malta_i6400_framebuffer_logo_8cores(self): """ :avocado: tags=arch:mips64el From patchwork Mon Nov 2 14:42:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11874063 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D07CD92C for ; Mon, 2 Nov 2020 14:46:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 614D722453 for ; Mon, 2 Nov 2020 14:46:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ks+50g+t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 614D722453 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZb6O-000772-CO for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Nov 2020 09:46:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZb3B-0002Bc-1T for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZb39-0005Bl-6E for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604328189; 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=8c2mx9+kUpRT0512oX5fGgjcKQl0QECZq9U12Mhnx9M=; b=Ks+50g+tfAqLy13/NFGANF1FTh5xxIm12FkOUU1ADx86fPwyzMx+KOYkC2B/lTniBRlfBB PQyEZiFisQfOIYBWa1OKM3HMv0YOM/sT5WHa7PM+eKhMPZshLzCSCvnKpWiJVcz+9GcrLR 8usOV3MjBxWyIt07qwbPXDa+MpDCEtc= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-6--RTO65eXMIqU4RG8XO4DqQ-1; Mon, 02 Nov 2020 09:43:07 -0500 X-MC-Unique: -RTO65eXMIqU4RG8XO4DqQ-1 Received: by mail-wr1-f69.google.com with SMTP id x16so6472282wrg.7 for ; Mon, 02 Nov 2020 06:43:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8c2mx9+kUpRT0512oX5fGgjcKQl0QECZq9U12Mhnx9M=; b=ipqKLPtSkAznf0d1d9I/DLp43ToJvwCJDYQKsEqeGeyssvsNvtubpCqmSsXR/jDdEA z22rfCa6tMdcSQL+jxYERqa5LK4mbKeXhVQtwEcxjtLThB6N1kcJA5R4J+YaLMTJjVU6 I+L8w5fW5n2v+iGfbAe+s9g7Pl6qsSVaS2asxgs+6mn8LEaOyAvNib9MW7JmKDQ82loh uGi+8cTqCZ/vnKAXN1vAknVVA2jggp2Ke0TxI7MYVKlPW98iIT0KnrU7zxYdgarvV3y0 Mqi2hm3QNrhQiw8nSyOHQMo+zIbKmEprFETf4rdbLJ04mKHJ2FRR5o1evReUeA/4GHD4 jz5Q== X-Gm-Message-State: AOAM533JmMhNJagpJA6sZYZlBuegCjO9qZdN6lXLdDSUcUvoiaFUEp0p DR+GIKRmjUMm9OYsdWWjZXIoxK8kRI0+KO7gksL7VvYRJtw3cO+YzqTaL212FUQjq+ZVEvREO5+ 1EeFvRcuQAEmHJlw= X-Received: by 2002:a7b:cb81:: with SMTP id m1mr18876536wmi.140.1604328186070; Mon, 02 Nov 2020 06:43:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxPz89buT602u6l0DoFSx6IduJRxYDNOdfAh1NT1T+FVGM6fgiGHxH2Gm/hy8KEk4Dn75vm9A== X-Received: by 2002:a7b:cb81:: with SMTP id m1mr18876518wmi.140.1604328185864; Mon, 02 Nov 2020 06:43:05 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id w4sm9067803wrk.28.2020.11.02.06.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 06:43:05 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: "Daniel P . Berrange" , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , Eduardo Habkost Subject: [PATCH-for-5.2? 3/5] tests/acceptance: Skip incomplete virtio_version tests using '@skip' Date: Mon, 2 Nov 2020 15:42:43 +0100 Message-Id: <20201102144245.2134077-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201102144245.2134077-1-philmd@redhat.com> References: <20201102144245.2134077-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/02 03:02:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Sarah Harris , Michael Rolnik , Yoshinori Sato , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Mark Cave-Ayland , Aleksandar Rikalo , Fabien Chouteau , Aurelien Jarno , KONRAD Frederic , =?utf-8?q?Herv=C3=A9_Poussin?= =?utf-8?q?eau?= , qemu-ppc@nongnu.org, Jiaxun Yang , Pavel Dovgalyuk , Paolo Bonzini , qemu-arm@nongnu.org, Antony Pavlov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Prefer skipping incomplete tests with the "@skip" keyword, rather than commenting the code. Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/virtio_version.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/virtio_version.py b/tests/acceptance/virtio_version.py index 33593c29dd0..187bbfa1f42 100644 --- a/tests/acceptance/virtio_version.py +++ b/tests/acceptance/virtio_version.py @@ -140,17 +140,20 @@ def check_all_variants(self, qemu_devtype, virtio_devid): self.assertIn('conventional-pci-device', trans_ifaces) self.assertNotIn('pci-express-device', trans_ifaces) + @skip("virtio-blk requires 'driver' parameter") + def test_conventional_devs_driver(self): + self.check_all_variants('virtio-blk-pci', VIRTIO_BLOCK) + + @skip("virtio-9p requires 'fsdev' parameter") + def test_conventional_devs_fsdev(self): + self.check_all_variants('virtio-9p-pci', VIRTIO_9P) def test_conventional_devs(self): self.check_all_variants('virtio-net-pci', VIRTIO_NET) - # virtio-blk requires 'driver' parameter - #self.check_all_variants('virtio-blk-pci', VIRTIO_BLOCK) self.check_all_variants('virtio-serial-pci', VIRTIO_CONSOLE) self.check_all_variants('virtio-rng-pci', VIRTIO_RNG) self.check_all_variants('virtio-balloon-pci', VIRTIO_BALLOON) self.check_all_variants('virtio-scsi-pci', VIRTIO_SCSI) - # virtio-9p requires 'fsdev' parameter - #self.check_all_variants('virtio-9p-pci', VIRTIO_9P) def check_modern_only(self, qemu_devtype, virtio_devid): """Check if a modern-only virtio device type behaves as expected""" From patchwork Mon Nov 2 14:42:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11874059 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 076A015E6 for ; Mon, 2 Nov 2020 14:45:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C08E4239D2 for ; Mon, 2 Nov 2020 14:45:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VLW9Ud6/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C08E4239D2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:58024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZb5T-0005Pn-Fh for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Nov 2020 09:45:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZb3G-0002GF-9Y for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZb3E-0005DP-PO for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604328194; 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=9QUU0pBZ1NcwhhSPi5zIux+LiK+R7ed8+irli08wV+4=; b=VLW9Ud6/P3QDHHVb4dTjrgCHjmkStzpq/9EiLl6B3yJ08D8muxnWOGlwi/88y1HEYs+acI cfB0rNSsvffgHzbiFe07F4DDN5eLpV/M73r89Y6JtHGJNWo97Hmwm+qkQirwUYo+1dk9L6 RtDNfN8PRAVfh75HTJt+L2TnbJ+9T+Y= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-60-KZp1FxWJPtCXm1rud6HH_A-1; Mon, 02 Nov 2020 09:43:13 -0500 X-MC-Unique: KZp1FxWJPtCXm1rud6HH_A-1 Received: by mail-wm1-f70.google.com with SMTP id t201so3424569wmt.1 for ; Mon, 02 Nov 2020 06:43:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9QUU0pBZ1NcwhhSPi5zIux+LiK+R7ed8+irli08wV+4=; b=DSA472KC2jTrvi6h1dAUQSfujthqL8mrG43QqUFKXj/cr8tn64XIuLfdbYUKapPHMC bfTlICmC4rgNGYKxtrcd1w+8NjsOz24eni+dCdrrS328CBr/mqGQUkADq5h0Fqvpw/jO JOyFePCjgWnWdaRe33QqXVBqlhL4Xj2vgRNbl+PXM81nbl+ZTxOaLb6u+S04VEel4HE1 8lh+bT/FObkoUKQsyCrj98UecTp9hayOGordQ8AmNYizgbMjmhHC3EGjeAKzLTc4iTja oIorrHosYsj9sc4KbcaXHdopsqPLRUeePRmR8Ke0Q4go8FmgBpHuyi5ypZHSzz3JbnaY T/CQ== X-Gm-Message-State: AOAM531UwskGi+sNdMdJM8G7mYiVPQVCqHEv3bUChQYj1H4uzpPtuj7m BUcUlIPDe09beW/dQwY+XDU8Qowxd4LWFipY7pngrLjci9XyaQVItmjjW37HfW92Xmhc/sdecgb cB2br3VBYAsspx6w= X-Received: by 2002:adf:eaca:: with SMTP id o10mr19308417wrn.9.1604328191789; Mon, 02 Nov 2020 06:43:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7vuZFu8Nso8MKDp9KTlduNBLUqx/mebWFEclldLiSJ0WsRHVGZUXt8JfNhn88o79CCavRjQ== X-Received: by 2002:adf:eaca:: with SMTP id o10mr19308403wrn.9.1604328191602; Mon, 02 Nov 2020 06:43:11 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id f1sm12307777wmj.3.2020.11.02.06.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 06:43:10 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: "Daniel P . Berrange" , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , Eduardo Habkost Subject: [RFC PATCH-for-5.2? 4/5] tests/acceptance: Only run tests tagged 'gating-ci' on GitLab CI Date: Mon, 2 Nov 2020 15:42:44 +0100 Message-Id: <20201102144245.2134077-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201102144245.2134077-1-philmd@redhat.com> References: <20201102144245.2134077-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/02 03:02:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Sarah Harris , Michael Rolnik , Yoshinori Sato , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Mark Cave-Ayland , Aleksandar Rikalo , Fabien Chouteau , Aurelien Jarno , KONRAD Frederic , =?utf-8?q?Herv=C3=A9_Poussin?= =?utf-8?q?eau?= , qemu-ppc@nongnu.org, Jiaxun Yang , Pavel Dovgalyuk , Paolo Bonzini , qemu-arm@nongnu.org, Antony Pavlov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" To avoid breaking our CI each time a test is added, switch from the "run all but disable some" to "only run the tagged tests on CI". This way we can add a test to the repository, and promote it to 'gating-ci' once it is proven stable enough. Signed-off-by: Philippe Mathieu-Daudé --- TODO: where to add documentation? - docs/devel/testing.rst (too big, split?) - tests/acceptance/README.rst --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 3a0524ce740..f39ba760c17 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -126,7 +126,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images $(TESTS_VENV_DIR)/bin/python -m avocado \ --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \ --filter-by-tags-include-empty --filter-by-tags-include-empty-key \ - $(AVOCADO_TAGS) \ + $(AVOCADO_TAGS) -t gating-ci \ $(if $(GITLAB_CI),,--failfast) tests/acceptance, \ "AVOCADO", "tests/acceptance") From patchwork Mon Nov 2 14:42:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11874069 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 68252921 for ; Mon, 2 Nov 2020 14:48:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F36C62084C for ; Mon, 2 Nov 2020 14:48:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KNeQVZwZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F36C62084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZb8V-00015l-0l for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Nov 2020 09:48:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZb3Q-0002Yu-8i for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZb3M-0005HD-9A for qemu-devel@nongnu.org; Mon, 02 Nov 2020 09:43:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604328203; 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=qP/8YRJtKkP03M8BPqXKBBV6xRtdXGyAn+uJzRiJSTI=; b=KNeQVZwZ8tPYWRMAcUO9t1I9i7pLgr7aOun97WTOaPzf+aaAGMgN7AsiVz8NXvKqlIk8+d KSbvnxPM8KFekZuCT1KV4nmvVvAVRV49iz1rdjASn3cuQvCw1zyUkPycmlAlqh17R2w5tc nSh+fQ1WFvb8ZgHM2L4D8hgzZsX0ZDY= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-268-1gRsHLOkNGewSIY0VRc6Aw-1; Mon, 02 Nov 2020 09:43:21 -0500 X-MC-Unique: 1gRsHLOkNGewSIY0VRc6Aw-1 Received: by mail-wr1-f69.google.com with SMTP id n14so6509167wrp.1 for ; Mon, 02 Nov 2020 06:43:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qP/8YRJtKkP03M8BPqXKBBV6xRtdXGyAn+uJzRiJSTI=; b=t7IqYA1TETahIN1J/o0gJJK5qaR9gZ3CTfEuyVGISBJeT/GBWtUMgb1kg/E4m3bG5/ jpfGShSaW+6FWW8ciHHoRk7Hwok2RMKXxE8fsqp34xMWpD82upmGqAwrjYp2SGBN2ZId IVnYa52nlsAmaDyb9ULIqJkrxQbdWi9kwNbFipX6Bgwdi5CrrHAFHCXpH6slcDgylW3M 8eF5o1KmPWAejvVw1nG6TFE69KYISKEGyQ/BCSmZ+67cOaqVh7mvnAdX8S9rqY6PYZij AKrqWVts0RI5iKiag/g+Tl23wJb9zKVHD3hSmEEXLcLqnd6klz1QWNh4+k2nXTYToHvX O3Dw== X-Gm-Message-State: AOAM533e2C4mSotrL56BGfHy79O1tGsaXFqVgoI5w9tHIS2ofjVjTyoo PBnBnyXt54pwHrUFs9vgoo7QBVeN/p5f2WTv9UCmZv423ZHcZnWMkaG9K6SN9aRc10bhfHY3/Cw dzHLHL5PZ8Qj+JUs= X-Received: by 2002:a1c:1c1:: with SMTP id 184mr18432482wmb.16.1604328197366; Mon, 02 Nov 2020 06:43:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJwMg4U4BP7IjU5IvXCbRzmmdlVzrnkOumBpr5n0MnXlH2dU74q53EEIfhniwiKez0RoEmFvRw== X-Received: by 2002:a1c:1c1:: with SMTP id 184mr18432450wmb.16.1604328196981; Mon, 02 Nov 2020 06:43:16 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id 9sm12791059wmk.5.2020.11.02.06.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 06:43:16 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: "Daniel P . Berrange" , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Cleber Rosa , Thomas Huth , Eduardo Habkost Subject: [PATCH-for-5.2? 5/5] tests/acceptance: Let stable tests use the 'gating-ci' tag Date: Mon, 2 Nov 2020 15:42:45 +0100 Message-Id: <20201102144245.2134077-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201102144245.2134077-1-philmd@redhat.com> References: <20201102144245.2134077-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/02 03:02:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Sarah Harris , Michael Rolnik , Yoshinori Sato , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Mark Cave-Ayland , Aleksandar Rikalo , Fabien Chouteau , Aurelien Jarno , KONRAD Frederic , =?utf-8?q?Herv=C3=A9_Poussin?= =?utf-8?q?eau?= , qemu-ppc@nongnu.org, Jiaxun Yang , Pavel Dovgalyuk , Paolo Bonzini , qemu-arm@nongnu.org, Antony Pavlov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Switch from "run all tests but disable some" to "only run the tests tagged as stable on CI". Declare our current set of tests as stable with the 'gating-ci' tag. Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/boot_linux.py | 10 ++++-- tests/acceptance/boot_linux_console.py | 38 ++++++++++++++++++++ tests/acceptance/cpu_queries.py | 1 + tests/acceptance/empty_cpu_model.py | 3 ++ tests/acceptance/linux_initrd.py | 4 +-- tests/acceptance/machine_arm_canona1100.py | 1 + tests/acceptance/machine_arm_integratorcp.py | 2 ++ tests/acceptance/machine_arm_n8x0.py | 2 ++ tests/acceptance/machine_avr6.py | 1 + tests/acceptance/machine_m68k_nextcube.py | 9 +++++ tests/acceptance/machine_mips_malta.py | 4 ++- tests/acceptance/machine_rx_gdbsim.py | 3 -- tests/acceptance/machine_sparc64_sun4u.py | 1 + tests/acceptance/machine_sparc_leon3.py | 1 + tests/acceptance/migration.py | 12 ++++++- tests/acceptance/pc_cpu_hotplug_props.py | 3 ++ tests/acceptance/ppc_prep_40p.py | 3 +- tests/acceptance/replay_kernel.py | 17 +++++++-- tests/acceptance/version.py | 1 + tests/acceptance/virtio_version.py | 6 ++++ tests/acceptance/vnc.py | 9 +++++ tests/acceptance/x86_cpu_model_versions.py | 1 + 22 files changed, 119 insertions(+), 13 deletions(-) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index c743e231f47..55d1ac33b6d 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -20,7 +20,6 @@ from avocado.utils import vmimage from avocado.utils import datadrainer from avocado.utils.path import find_command -from avocado import skipIf ACCEL_NOT_AVAILABLE_FMT = "%s accelerator does not seem to be available" KVM_NOT_AVAILABLE = ACCEL_NOT_AVAILABLE_FMT % "KVM" @@ -114,6 +113,7 @@ class BootLinuxX8664(BootLinux): def test_pc_i440fx_tcg(self): """ + :avocado: tags=gating-ci :avocado: tags=machine:pc :avocado: tags=accel:tcg """ @@ -124,6 +124,7 @@ def test_pc_i440fx_tcg(self): def test_pc_i440fx_kvm(self): """ + :avocado: tags=gating-ci :avocado: tags=machine:pc :avocado: tags=accel:kvm """ @@ -134,6 +135,7 @@ def test_pc_i440fx_kvm(self): def test_pc_q35_tcg(self): """ + :avocado: tags=gating-ci :avocado: tags=machine:q35 :avocado: tags=accel:tcg """ @@ -144,6 +146,7 @@ def test_pc_q35_tcg(self): def test_pc_q35_kvm(self): """ + :avocado: tags=gating-ci :avocado: tags=machine:q35 :avocado: tags=accel:kvm """ @@ -171,6 +174,7 @@ def add_common_args(self): def test_virt_tcg(self): """ + :avocado: tags=gating-ci :avocado: tags=accel:tcg :avocado: tags=cpu:max """ @@ -184,6 +188,7 @@ def test_virt_tcg(self): def test_virt_kvm_gicv2(self): """ + :avocado: tags=gating-ci :avocado: tags=accel:kvm :avocado: tags=cpu:host :avocado: tags=device:gicv2 @@ -198,6 +203,7 @@ def test_virt_kvm_gicv2(self): def test_virt_kvm_gicv3(self): """ + :avocado: tags=gating-ci :avocado: tags=accel:kvm :avocado: tags=cpu:host :avocado: tags=device:gicv3 @@ -220,6 +226,7 @@ class BootLinuxPPC64(BootLinux): def test_pseries_tcg(self): """ + :avocado: tags=gating-ci :avocado: tags=machine:pseries :avocado: tags=accel:tcg """ @@ -236,7 +243,6 @@ class BootLinuxS390X(BootLinux): chksum = '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d' - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_s390_ccw_virtio_tcg(self): """ :avocado: tags=machine:s390-ccw-virtio diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 8f433a67f84..70d89191d3d 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -98,6 +98,7 @@ class BootLinuxConsole(LinuxKernelTest): def test_x86_64_pc(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:x86_64 :avocado: tags=machine:pc """ @@ -117,6 +118,7 @@ def test_x86_64_pc(self): def test_mips_malta(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mips :avocado: tags=machine:malta :avocado: tags=endian:big @@ -150,6 +152,7 @@ def test_mips64el_malta(self): [2] https://kernel-team.pages.debian.net/kernel-handbook/ ch-common-tasks.html#s-common-official + :avocado: tags=gating-ci :avocado: tags=arch:mips64el :avocado: tags=machine:malta """ @@ -171,6 +174,7 @@ def test_mips64el_malta(self): def test_mips_malta_cpio(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mips :avocado: tags=machine:malta :avocado: tags=endian:big @@ -213,6 +217,7 @@ def test_mips_malta_cpio(self): @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') def test_mips64el_malta_5KEc_cpio(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mips64el :avocado: tags=machine:malta :avocado: tags=endian:little @@ -273,6 +278,7 @@ def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash): def test_mips_malta32el_nanomips_4k(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mipsel :avocado: tags=machine:malta :avocado: tags=endian:little @@ -285,6 +291,7 @@ def test_mips_malta32el_nanomips_4k(self): def test_mips_malta32el_nanomips_16k_up(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mipsel :avocado: tags=machine:malta :avocado: tags=endian:little @@ -297,6 +304,7 @@ def test_mips_malta32el_nanomips_16k_up(self): def test_mips_malta32el_nanomips_64k_dbg(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mipsel :avocado: tags=machine:malta :avocado: tags=endian:little @@ -309,6 +317,7 @@ def test_mips_malta32el_nanomips_64k_dbg(self): def test_aarch64_virt(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:aarch64 :avocado: tags=machine:virt """ @@ -330,6 +339,7 @@ def test_aarch64_virt(self): def test_aarch64_xlnx_versal_virt(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:aarch64 :avocado: tags=machine:xlnx-versal-virt :avocado: tags=device:pl011 @@ -355,6 +365,7 @@ def test_aarch64_xlnx_versal_virt(self): def test_arm_virt(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:virt """ @@ -375,6 +386,7 @@ def test_arm_virt(self): def test_arm_emcraft_sf2(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:emcraft-sf2 :avocado: tags=endian:little @@ -439,6 +451,7 @@ def do_test_arm_raspi2(self, uart_id): def test_arm_raspi2_uart0(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:raspi2 :avocado: tags=device:pl011 @@ -447,6 +460,7 @@ def test_arm_raspi2_uart0(self): def test_arm_exynos4210_initrd(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:smdkc210 """ @@ -489,6 +503,7 @@ def test_arm_exynos4210_initrd(self): 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_cubieboard_initrd(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:cubieboard """ @@ -531,6 +546,7 @@ def test_arm_cubieboard_initrd(self): 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_cubieboard_sata(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:cubieboard """ @@ -622,6 +638,7 @@ def test_arm_quanta_gsj(self): def test_arm_quanta_gsj_initrd(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:quanta-gsj """ @@ -660,6 +677,7 @@ def test_arm_quanta_gsj_initrd(self): 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_orangepi(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:orangepi-pc """ @@ -687,6 +705,7 @@ def test_arm_orangepi(self): 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_orangepi_initrd(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:orangepi-pc """ @@ -731,6 +750,7 @@ def test_arm_orangepi_initrd(self): 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_orangepi_sd(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:orangepi-pc :avocado: tags=device:sd @@ -786,6 +806,7 @@ def test_arm_orangepi_sd(self): @skipUnless(P7ZIP_AVAILABLE, '7z not installed') def test_arm_orangepi_bionic(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:orangepi-pc :avocado: tags=device:sd @@ -829,6 +850,7 @@ def test_arm_orangepi_bionic(self): @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') def test_arm_orangepi_uboot_netbsd9(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:orangepi-pc :avocado: tags=device:sd @@ -893,6 +915,7 @@ def test_arm_orangepi_uboot_netbsd9(self): def test_aarch64_raspi3_atf(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:aarch64 :avocado: tags=machine:raspi3 :avocado: tags=cpu:cortex-a53 @@ -915,6 +938,7 @@ def test_aarch64_raspi3_atf(self): def test_s390x_s390_ccw_virtio(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:s390x :avocado: tags=machine:s390-ccw-virtio """ @@ -935,6 +959,7 @@ def test_s390x_s390_ccw_virtio(self): def test_alpha_clipper(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:alpha :avocado: tags=machine:clipper """ @@ -956,6 +981,7 @@ def test_alpha_clipper(self): def test_ppc64_pseries(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc64 :avocado: tags=machine:pseries """ @@ -975,6 +1001,7 @@ def test_ppc64_pseries(self): def test_m68k_q800(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:m68k :avocado: tags=machine:q800 """ @@ -1010,6 +1037,7 @@ def do_test_advcal_2018(self, day, tar_hash, kernel_name, console=0): def test_arm_vexpressa9(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:vexpress-a9 """ @@ -1019,6 +1047,7 @@ def test_arm_vexpressa9(self): def test_m68k_mcf5208evb(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:m68k :avocado: tags=machine:mcf5208evb """ @@ -1027,6 +1056,7 @@ def test_m68k_mcf5208evb(self): def test_microblaze_s3adsp1800(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:microblaze :avocado: tags=machine:petalogix-s3adsp1800 """ @@ -1035,6 +1065,7 @@ def test_microblaze_s3adsp1800(self): def test_or1k_sim(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:or1k :avocado: tags=machine:or1k-sim """ @@ -1043,6 +1074,7 @@ def test_or1k_sim(self): def test_nios2_10m50(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:nios2 :avocado: tags=machine:10m50-ghrd """ @@ -1051,6 +1083,7 @@ def test_nios2_10m50(self): def test_ppc64_e500(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc64 :avocado: tags=machine:ppce500 """ @@ -1060,6 +1093,7 @@ def test_ppc64_e500(self): def test_ppc_g3beige(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc :avocado: tags=machine:g3beige """ @@ -1069,6 +1103,7 @@ def test_ppc_g3beige(self): def test_ppc_mac99(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc :avocado: tags=machine:mac99 """ @@ -1078,6 +1113,7 @@ def test_ppc_mac99(self): def test_sh4_r2d(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:sh4 :avocado: tags=machine:r2d """ @@ -1087,6 +1123,7 @@ def test_sh4_r2d(self): def test_sparc_ss20(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:sparc :avocado: tags=machine:SS-20 """ @@ -1095,6 +1132,7 @@ def test_sparc_ss20(self): def test_xtensa_lx60(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:xtensa :avocado: tags=machine:lx60 """ diff --git a/tests/acceptance/cpu_queries.py b/tests/acceptance/cpu_queries.py index 293dccb89ab..213c8976568 100644 --- a/tests/acceptance/cpu_queries.py +++ b/tests/acceptance/cpu_queries.py @@ -19,6 +19,7 @@ class QueryCPUModelExpansion(Test): def test(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:x86_64 :avocado: tags=machine:none """ diff --git a/tests/acceptance/empty_cpu_model.py b/tests/acceptance/empty_cpu_model.py index a1e59e45e4e..f60f557c054 100644 --- a/tests/acceptance/empty_cpu_model.py +++ b/tests/acceptance/empty_cpu_model.py @@ -11,6 +11,9 @@ class EmptyCPUModel(Test): def test(self): + """ + :avocado: tags=gating-ci + """ self.vm.add_args('-S', '-display', 'none', '-machine', 'none', '-cpu', '') self.vm.set_qmp_monitor(enabled=False) self.vm.launch() diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_initrd.py index a249e2f14a2..bc5a86860f4 100644 --- a/tests/acceptance/linux_initrd.py +++ b/tests/acceptance/linux_initrd.py @@ -13,7 +13,6 @@ import tempfile from avocado_qemu import Test -from avocado import skipIf class LinuxInitrd(Test): @@ -32,6 +31,8 @@ def test_with_2gib_file_should_exit_error_msg_with_linux_v3_6(self): and expect it exits with error message. Fedora-18 shipped with linux-3.6 which have not supported xloadflags cannot support more than 2GiB initrd. + + :avocado: tags=gating-ci """ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora/li' 'nux/releases/18/Fedora/x86_64/os/images/pxeboot/vmlinuz') @@ -53,7 +54,6 @@ def test_with_2gib_file_should_exit_error_msg_with_linux_v3_6(self): max_size + 1) self.assertRegex(self.vm.get_log(), expected_msg) - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_with_2gib_file_should_work_with_linux_v4_16(self): """ QEMU has supported up to 4 GiB initrd for recent kernel diff --git a/tests/acceptance/machine_arm_canona1100.py b/tests/acceptance/machine_arm_canona1100.py index 0e5c43dbcf8..25a05a32e9a 100644 --- a/tests/acceptance/machine_arm_canona1100.py +++ b/tests/acceptance/machine_arm_canona1100.py @@ -19,6 +19,7 @@ class CanonA1100Machine(Test): def test_arm_canona1100(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:canon-a1100 :avocado: tags=device:pflash_cfi02 diff --git a/tests/acceptance/machine_arm_integratorcp.py b/tests/acceptance/machine_arm_integratorcp.py index 49c8ebff78b..d61a966b165 100644 --- a/tests/acceptance/machine_arm_integratorcp.py +++ b/tests/acceptance/machine_arm_integratorcp.py @@ -54,6 +54,7 @@ def boot_integratorcp(self): def test_integratorcp_console(self): """ Boots the Linux kernel and checks that the console is operational + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:integratorcp :avocado: tags=device:pl011 @@ -67,6 +68,7 @@ def test_integratorcp_console(self): def test_framebuffer_tux_logo(self): """ Boot Linux and verify the Tux logo is displayed on the framebuffer. + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:integratorcp :avocado: tags=device:pl110 diff --git a/tests/acceptance/machine_arm_n8x0.py b/tests/acceptance/machine_arm_n8x0.py index e5741f2d8d1..94e6844664a 100644 --- a/tests/acceptance/machine_arm_n8x0.py +++ b/tests/acceptance/machine_arm_n8x0.py @@ -35,6 +35,7 @@ def __do_test_n8x0(self): @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') def test_n800(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:n800 """ @@ -43,6 +44,7 @@ def test_n800(self): @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') def test_n810(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:n810 """ diff --git a/tests/acceptance/machine_avr6.py b/tests/acceptance/machine_avr6.py index 6baf4e9c7f3..a340b63fd5c 100644 --- a/tests/acceptance/machine_avr6.py +++ b/tests/acceptance/machine_avr6.py @@ -26,6 +26,7 @@ class AVR6Machine(Test): def test_freertos(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:avr :avocado: tags=machine:arduino-mega-2560-v3 """ diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/machine_m68k_nextcube.py index 2baba5fdc26..fa027a9aff9 100644 --- a/tests/acceptance/machine_m68k_nextcube.py +++ b/tests/acceptance/machine_m68k_nextcube.py @@ -69,6 +69,9 @@ def check_bootrom_framebuffer(self, screenshot_path): @skipUnless(PIL_AVAILABLE, 'Python PIL not installed') def test_bootrom_framebuffer_size(self): + """ + :avocado: tags=gating-ci + """ screenshot_path = os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) @@ -78,6 +81,9 @@ def test_bootrom_framebuffer_size(self): @skipUnless(tesseract_available(3), 'tesseract v3 OCR tool not available') def test_bootrom_framebuffer_ocr_with_tesseract_v3(self): + """ + :avocado: tags=gating-ci + """ screenshot_path = os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) @@ -94,6 +100,9 @@ def test_bootrom_framebuffer_ocr_with_tesseract_v3(self): # that it is still alpha-level software. @skipUnless(tesseract_available(4), 'tesseract v4 OCR tool not available') def test_bootrom_framebuffer_ocr_with_tesseract_v4(self): + """ + :avocado: tags=gating-ci + """ screenshot_path = os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) diff --git a/tests/acceptance/machine_mips_malta.py b/tests/acceptance/machine_mips_malta.py index eea046141d6..d7ed035fe73 100644 --- a/tests/acceptance/machine_mips_malta.py +++ b/tests/acceptance/machine_mips_malta.py @@ -15,7 +15,6 @@ from avocado_qemu import Test from avocado_qemu import wait_for_console_pattern from avocado.utils import archive -from avocado import skipIf NUMPY_AVAILABLE = True @@ -94,6 +93,7 @@ def do_test_i6400_framebuffer_logo(self, cpu_cores_count): def test_mips_malta_i6400_framebuffer_logo_1core(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mips64el :avocado: tags=machine:malta :avocado: tags=cpu:i6400 @@ -102,6 +102,7 @@ def test_mips_malta_i6400_framebuffer_logo_1core(self): def test_mips_malta_i6400_framebuffer_logo_7cores(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mips64el :avocado: tags=machine:malta :avocado: tags=cpu:i6400 @@ -111,6 +112,7 @@ def test_mips_malta_i6400_framebuffer_logo_7cores(self): def test_mips_malta_i6400_framebuffer_logo_8cores(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mips64el :avocado: tags=machine:malta :avocado: tags=cpu:i6400 diff --git a/tests/acceptance/machine_rx_gdbsim.py b/tests/acceptance/machine_rx_gdbsim.py index 32b737b6d85..c565b4f5da1 100644 --- a/tests/acceptance/machine_rx_gdbsim.py +++ b/tests/acceptance/machine_rx_gdbsim.py @@ -10,7 +10,6 @@ import os -from avocado import skipIf from avocado_qemu import Test from avocado_qemu import exec_command_and_wait_for_pattern from avocado_qemu import wait_for_console_pattern @@ -22,7 +21,6 @@ class RxGdbSimMachine(Test): timeout = 30 KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_uboot(self): """ U-Boot and checks that the console is operational. @@ -46,7 +44,6 @@ def test_uboot(self): # FIXME limit baudrate on chardev, else we type too fast #exec_command_and_wait_for_pattern(self, 'version', gcc_version) - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_linux_sash(self): """ Boots a Linux kernel and checks that the console is operational. diff --git a/tests/acceptance/machine_sparc64_sun4u.py b/tests/acceptance/machine_sparc64_sun4u.py index 458165500ec..c94cd6d84b1 100644 --- a/tests/acceptance/machine_sparc64_sun4u.py +++ b/tests/acceptance/machine_sparc64_sun4u.py @@ -21,6 +21,7 @@ class Sun4uMachine(LinuxKernelTest): def test_sparc64_sun4u(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:sparc64 :avocado: tags=machine:sun4u """ diff --git a/tests/acceptance/machine_sparc_leon3.py b/tests/acceptance/machine_sparc_leon3.py index 2405cd7a0d7..881ef09ef6f 100644 --- a/tests/acceptance/machine_sparc_leon3.py +++ b/tests/acceptance/machine_sparc_leon3.py @@ -19,6 +19,7 @@ class Leon3Machine(Test): # and QEMU exit calling cpu_abort(), which makes this test to fail. def test_leon3_helenos_uimage(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:sparc :avocado: tags=machine:leon3_generic :avocado: tags=binfmt:uimage diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py index 792639cb693..4194539e832 100644 --- a/tests/acceptance/migration.py +++ b/tests/acceptance/migration.py @@ -64,17 +64,27 @@ def _get_free_port(self): def test_migration_with_tcp_localhost(self): + """ + :avocado: tags=gating-ci + """ dest_uri = 'tcp:localhost:%u' % self._get_free_port() self.do_migrate(dest_uri) def test_migration_with_unix(self): + """ + :avocado: tags=gating-ci + """ with tempfile.TemporaryDirectory(prefix='socket_') as socket_path: dest_uri = 'unix:%s/qemu-test.sock' % socket_path self.do_migrate(dest_uri) @skipUnless(find_command('nc', default=False), "'nc' command not found") def test_migration_with_exec(self): - """The test works for both netcat-traditional and netcat-openbsd packages.""" + """ + The test works for both netcat-traditional and netcat-openbsd packages. + + :avocado: tags=gating-ci + """ free_port = self._get_free_port() dest_uri = 'exec:nc -l localhost %u' % free_port src_uri = 'exec:nc localhost %u' % free_port diff --git a/tests/acceptance/pc_cpu_hotplug_props.py b/tests/acceptance/pc_cpu_hotplug_props.py index 08b7e632c60..3e264fa3399 100644 --- a/tests/acceptance/pc_cpu_hotplug_props.py +++ b/tests/acceptance/pc_cpu_hotplug_props.py @@ -27,6 +27,9 @@ class OmittedCPUProps(Test): :avocado: tags=arch:x86_64 """ def test_no_die_id(self): + """ + :avocado: tags=gating-ci + """ self.vm.add_args('-nodefaults', '-S') self.vm.add_args('-smp', '1,sockets=2,cores=2,threads=2,maxcpus=8') self.vm.add_args('-cpu', 'qemu64') diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_40p.py index 96ba13b8943..9e60576fcb2 100644 --- a/tests/acceptance/ppc_prep_40p.py +++ b/tests/acceptance/ppc_prep_40p.py @@ -7,7 +7,6 @@ import os -from avocado import skipIf from avocado import skipUnless from avocado_qemu import Test from avocado_qemu import wait_for_console_pattern @@ -49,6 +48,7 @@ def test_factory_firmware_and_netbsd(self): def test_openbios_192m(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc :avocado: tags=machine:40p """ @@ -62,6 +62,7 @@ def test_openbios_192m(self): def test_openbios_and_netbsd(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc :avocado: tags=machine:40p """ diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py index 00c228382bd..a231426661d 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -14,7 +14,6 @@ import logging import time -from avocado import skipIf from avocado import skipUnless from avocado_qemu import wait_for_console_pattern from avocado.utils import archive @@ -77,7 +76,6 @@ def run_rr(self, kernel_path, kernel_command_line, console_pattern, logger.info('replay overhead {:.2%}'.format(t2 / t1 - 1)) class ReplayKernelNormal(ReplayKernelBase): - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_x86_64_pc(self): """ :avocado: tags=arch:x86_64 @@ -96,6 +94,7 @@ def test_x86_64_pc(self): def test_mips_malta(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:mips :avocado: tags=machine:malta :avocado: tags=endian:big @@ -125,6 +124,7 @@ def test_mips64el_malta(self): [2] https://kernel-team.pages.debian.net/kernel-handbook/ ch-common-tasks.html#s-common-official + :avocado: tags=gating-ci :avocado: tags=arch:mips64el :avocado: tags=machine:malta """ @@ -141,6 +141,7 @@ def test_mips64el_malta(self): def test_aarch64_virt(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:aarch64 :avocado: tags=machine:virt :avocado: tags=cpu:cortex-a53 @@ -160,6 +161,7 @@ def test_aarch64_virt(self): def test_arm_virt(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:virt """ @@ -175,7 +177,6 @@ def test_arm_virt(self): self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=1) - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_cubieboard_initrd(self): @@ -211,6 +212,7 @@ def test_arm_cubieboard_initrd(self): def test_ppc64_pseries(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc64 :avocado: tags=machine:pseries """ @@ -227,6 +229,7 @@ def test_ppc64_pseries(self): def test_m68k_q800(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:m68k :avocado: tags=machine:q800 """ @@ -258,6 +261,7 @@ def do_test_advcal_2018(self, file_path, kernel_name, args=None): def test_arm_vexpressa9(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:arm :avocado: tags=machine:vexpress-a9 """ @@ -271,6 +275,7 @@ def test_arm_vexpressa9(self): def test_m68k_mcf5208evb(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:m68k :avocado: tags=machine:mcf5208evb """ @@ -282,6 +287,7 @@ def test_m68k_mcf5208evb(self): def test_microblaze_s3adsp1800(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:microblaze :avocado: tags=machine:petalogix-s3adsp1800 """ @@ -293,6 +299,7 @@ def test_microblaze_s3adsp1800(self): def test_ppc64_e500(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc64 :avocado: tags=machine:ppce500 :avocado: tags=cpu:e5500 @@ -305,6 +312,7 @@ def test_ppc64_e500(self): def test_ppc_g3beige(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc :avocado: tags=machine:g3beige """ @@ -317,6 +325,7 @@ def test_ppc_g3beige(self): def test_ppc_mac99(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:ppc :avocado: tags=machine:mac99 """ @@ -329,6 +338,7 @@ def test_ppc_mac99(self): def test_sparc_ss20(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:sparc :avocado: tags=machine:SS-20 """ @@ -340,6 +350,7 @@ def test_sparc_ss20(self): def test_xtensa_lx60(self): """ + :avocado: tags=gating-ci :avocado: tags=arch:xtensa :avocado: tags=machine:lx60 :avocado: tags=cpu:dc233c diff --git a/tests/acceptance/version.py b/tests/acceptance/version.py index 79b923d4fc0..481b94440e5 100644 --- a/tests/acceptance/version.py +++ b/tests/acceptance/version.py @@ -14,6 +14,7 @@ class Version(Test): """ + :avocado: tags=gating-ci :avocado: tags=quick """ def test_qmp_human_info_version(self): diff --git a/tests/acceptance/virtio_version.py b/tests/acceptance/virtio_version.py index 187bbfa1f42..32fed541ce9 100644 --- a/tests/acceptance/virtio_version.py +++ b/tests/acceptance/virtio_version.py @@ -149,6 +149,9 @@ def test_conventional_devs_fsdev(self): self.check_all_variants('virtio-9p-pci', VIRTIO_9P) def test_conventional_devs(self): + """ + :avocado: tags=gating-ci + """ self.check_all_variants('virtio-net-pci', VIRTIO_NET) self.check_all_variants('virtio-serial-pci', VIRTIO_CONSOLE) self.check_all_variants('virtio-rng-pci', VIRTIO_RNG) @@ -171,6 +174,9 @@ def check_modern_only(self, qemu_devtype, virtio_devid): self.assertIn('pci-express-device', ifaces) def test_modern_only_devs(self): + """ + :avocado: tags=gating-ci + """ self.check_modern_only('virtio-vga', VIRTIO_GPU) self.check_modern_only('virtio-gpu-pci', VIRTIO_GPU) self.check_modern_only('virtio-mouse-pci', VIRTIO_INPUT) diff --git a/tests/acceptance/vnc.py b/tests/acceptance/vnc.py index 3f40bc2be11..a0fe0a16a00 100644 --- a/tests/acceptance/vnc.py +++ b/tests/acceptance/vnc.py @@ -21,6 +21,9 @@ def test_no_vnc(self): self.assertFalse(self.vm.qmp('query-vnc')['return']['enabled']) def test_no_vnc_change_password(self): + """ + :avocado: tags=gating-ci + """ self.vm.add_args('-nodefaults', '-S') self.vm.launch() self.assertFalse(self.vm.qmp('query-vnc')['return']['enabled']) @@ -35,6 +38,9 @@ def test_no_vnc_change_password(self): 'Could not set password') def test_change_password_requires_a_password(self): + """ + :avocado: tags=gating-ci + """ self.vm.add_args('-nodefaults', '-S', '-vnc', ':0') self.vm.launch() self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled']) @@ -49,6 +55,9 @@ def test_change_password_requires_a_password(self): 'Could not set password') def test_change_password(self): + """ + :avocado: tags=gating-ci + """ self.vm.add_args('-nodefaults', '-S', '-vnc', ':0,password') self.vm.launch() self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled']) diff --git a/tests/acceptance/x86_cpu_model_versions.py b/tests/acceptance/x86_cpu_model_versions.py index 01ff614ec25..715329760e2 100644 --- a/tests/acceptance/x86_cpu_model_versions.py +++ b/tests/acceptance/x86_cpu_model_versions.py @@ -28,6 +28,7 @@ class X86CPUModelAliases(avocado_qemu.Test): """ Validation of PC CPU model versions and CPU model aliases + :avocado: tags=gating-ci :avocado: tags=arch:x86_64 """ def validate_aliases(self, cpus):