From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EE35AC7EE24 for ; Mon, 5 Jun 2023 07:59:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6577-0004sD-E9; Mon, 05 Jun 2023 03:58:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q656q-0004qP-0y for qemu-devel@nongnu.org; Mon, 05 Jun 2023 03:58:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q656n-0001K9-RD for qemu-devel@nongnu.org; Mon, 05 Jun 2023 03:58:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685951913; 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=wufvntv52Bzssb0ok2muONHrebyhsMD/4yTVZxAaVxU=; b=K81XfX5nJJHhtfJjSJJQ3DcGYCcnTkgj1ehO9E9OfQ0GnGU6KuV2ybiZ6DSeo/ATP4H1Qv NLwrTVUAN05kg32IBdNv5Y8GxTDhgoPOtpBnCLTBDaLNHYgLREtQh6C3rxcqXFwsfRjoYi mI1rHGnRe6oBRHyP/VrXMuJYZzb7KIc= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-616-MRTTLABzPuuaguFord1gfA-1; Mon, 05 Jun 2023 03:58:32 -0400 X-MC-Unique: MRTTLABzPuuaguFord1gfA-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-4f61f59c230so896544e87.2 for ; Mon, 05 Jun 2023 00:58:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685951910; x=1688543910; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wufvntv52Bzssb0ok2muONHrebyhsMD/4yTVZxAaVxU=; b=HsR/JglBAihDAOniFWAFlykYpymLiGbCKkAQXrkIYFjjp6DGm/VaETojljBbdJUNbQ Au/tr/Z5mr3BCm4/sMDE0E0Ra9QUrJ2D7FsS3Ao8qn0nQwm9YFcE646MVaVXQ5EuWIsx TzWPyoys8ovc2dB+5ecI6Oe+xrNU1GnwJTj0l5k+nWYsqfPIgYeyGoKiHw0is4wh7Gdc /57V/4FNTBY4fOvZnMXcpYRJNnN6/b6Wd6LoE/dej9PhLF7QEfH3p+EQQ7VhdFLBFkJW wmxpFD0JqVGSe5Ut7M0irs1dfTQDhJCxRoQXM01uQjdoklhLgv09cR27KiI/EXMY9nVQ y1uA== X-Gm-Message-State: AC+VfDxSR6j+eH4EYqm/Zv2/o/u3L0WjjkiT5B3BoHrF5WuE0EAizifq XtldOSbOc7RyvxgNrs8pQMB13fE3x5DlMUjq92pqWccffl0iVKvE7zvsjPeMx1li1/skZ4UoIpH 8umfctulF3fRDy2khoH5RHcbPbpbWO49Cl81AR4cOXVEUlH0NJD45+5y6bUSYmkT+7bJ0U0Htc2 Y= X-Received: by 2002:ac2:5297:0:b0:4f3:a436:ef44 with SMTP id q23-20020ac25297000000b004f3a436ef44mr4536565lfm.31.1685951909883; Mon, 05 Jun 2023 00:58:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40q8IuHKahg15KUFgB/eOEoGnWwPcrQHpQKF5pApqfprrYKC5xelisdBtVJLR031U+I06ZFQ== X-Received: by 2002:ac2:5297:0:b0:4f3:a436:ef44 with SMTP id q23-20020ac25297000000b004f3a436ef44mr4536541lfm.31.1685951909457; Mon, 05 Jun 2023 00:58:29 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id m15-20020aa7c2cf000000b00514a97b6b80sm3609602edp.78.2023.06.05.00.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 00:58:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: berrange@redhat.com, peter.maydell@linaro.org, alex.bennee@linaro.org, jsnow@redhat.com, kconsul@linux.vnet.ibm.com Subject: [PATCH 1/2] Revert "tests/requirements.txt: bump up avocado-framework version to 101.0" Date: Mon, 5 Jun 2023 09:58:22 +0200 Message-Id: <20230605075823.48871-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230605075823.48871-1-pbonzini@redhat.com> References: <20230605075823.48871-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This reverts commit ec5ffa0056389c3c10ea2de1e78366f66f4e5abc. Bumping avocado to version 101 has two issues. First, there are problems where Avocado is not logging of command lines or terminal output, and not collecting Python logs outside the avocado namespace. Second, the recent changes to Python handling mean that there is a single virtual environment for all the build, instead of a separate one for testing. Requiring a too-new version of avocado causes conflicts with any avocado plugins installed on the host: $ make check-venv make[1]: Entering directory '/home/berrange/src/virt/qemu/build' GIT ui/keycodemapdb tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 dtc VENVPIP install -e /home/berrange/src/virt/qemu/python/ VENVPIP install -r /home/berrange/src/virt/qemu/tests/requirements.txt ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts. avocado-framework-plugin-varianter-yaml-to-mux 98.0 requires avocado-framework==98.0, but you have avocado-framework 101.0 which is incompatible. avocado-framework-plugin-result-html 98.0 requires avocado-framework==98.0, but you have avocado-framework 101.0 which is incompatible. make[1]: Leaving directory '/home/berrange/src/virt/qemu/build' To avoid this issue, tests/requirements.txt should use a ">=" constraint and the version of Avocado should be limited to what distros provide in the system packages. Only Fedora has Avocado, and more specifically version 92.0 (though 98.0 is also available as a module). As a first step, this patch reverts the introduction of a too-new Avocado. Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 18 +++++++----------- tests/requirements.txt | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 0184ef22373..8294a44816c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -136,18 +136,14 @@ get-vm-image-fedora-31-%: check-venv # download all vm images, according to defined targets get-vm-images: check-venv $(patsubst %,get-vm-image-fedora-31-%, $(FEDORA_31_DOWNLOAD)) -JOBS_OPTION=$(lastword -j1 $(filter-out -j, $(filter -j%,$(MAKEFLAGS)))) - check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images - $(call quiet-command, \ - $(PYTHON) -m avocado \ - --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \ - $(if $(AVOCADO_TAGS),, \ - --filter-by-tags-include-empty \ - --filter-by-tags-include-empty-key) \ - --max-parallel-tasks $(JOBS_OPTION:-j%=%) \ - $(AVOCADO_CMDLINE_TAGS) \ - $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \ + $(call quiet-command, \ + $(PYTHON) -m avocado \ + --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \ + $(if $(AVOCADO_TAGS),, --filter-by-tags-include-empty \ + --filter-by-tags-include-empty-key) \ + $(AVOCADO_CMDLINE_TAGS) \ + $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \ "AVOCADO", "tests/avocado") check-acceptance-deprecated-warning: diff --git a/tests/requirements.txt b/tests/requirements.txt index 0e008b9aec3..07e713ef5ac 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -5,5 +5,5 @@ # Note that qemu.git/python/ is implicitly installed to this venv when # 'make check-venv' is run, and will persist until configure is run # again. -avocado-framework==101.0 +avocado-framework==88.1 pycdlib==1.11.0 -- 2.40.1