From patchwork Fri Dec 20 02:46:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 13916063 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 E812DE77184 for ; Fri, 20 Dec 2024 02:47:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOT2B-0001nz-E3; Thu, 19 Dec 2024 21:46:35 -0500 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 1tOT2A-0001nO-4j; Thu, 19 Dec 2024 21:46:34 -0500 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOT28-0000He-Kq; Thu, 19 Dec 2024 21:46:33 -0500 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-7f46d5d1ad5so1032261a12.3; Thu, 19 Dec 2024 18:46:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734662790; x=1735267590; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6vzF34pQlizNqgzOprBJ7Xal/hRzhdpRE+opT1pviwc=; b=dyZOaxL287GF65W5uATQ0e2BfLFqBqrmHvqNngQnxGhBGK2AWT068OVt16vjmp3ytE UQt3ynjyDvVQlkhm9oE/c41qaOqTBYpw+KJbrxRXv1O8pG88SZHHzBs3Up4RJiCrSTdb De6Xykcoy2VfFQu1z/yOJdu/KnaK5iyy5XPxIqOeEl5mFKNflXtU3rb7ZISAlWiBV3jY A8n9DwuSFfz2Mececim0zUqcUEviJRhDAOMYc7YbfDh/4hZUCxhFKfNGBgPOvkggtxEI nlAgOxB3Y2gwjFG1v9YR1UxneNkcPP1Ns31qBTxy1C10amGGFZbUz0K8DlDTk8WYtWB0 bBgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734662790; x=1735267590; 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=6vzF34pQlizNqgzOprBJ7Xal/hRzhdpRE+opT1pviwc=; b=ZDZHnpNRnhKVkXSz0X02khOySMMYuqznrA+JXNw0f5SCd6iBTlJPaE9GUWP5dfeZ9b +8ErPYX1Xv70OybVIXMWZv1Cqvi4+w2gE1bjByLK4GJG/KcA0SnxFbNpV0bhYzQBckEh oTCNhxm1FsGlvJyHc/aHkCr7T00PkcvTzJwFAU0m8zS+9HDZDm7RWOMA1deu9ltAgxPf 3yX9ryHueAO6WN1WvAzQOq38B/Mwqb5wKh/0g8lUAZnH7d2RsK7hqeTBKwELnIUlJtJv DGU+puDFhgJ+G6wAj2N5xQu5E/vflg3xtduE7GepGa5IULPo7lstB55zP8gEnyZwffCN 8nwg== X-Forwarded-Encrypted: i=1; AJvYcCUf6PrW2hFxTbJ82yv3ku5efZZB6hEARFmWEVLSb40KUZQt6ZZWXe/sYFbdpYPyM7Bn8UDJwvLNfQ==@nongnu.org X-Gm-Message-State: AOJu0YymAvmhlIYAL3eGs9rR9/oMe3sK5F96P6OP8w2qgu3pYxpIuaf8 thNt5I1e20Z2tZ0zmEuz9+8x8FUD9i7XU0tzNkYkSfLpN2TYc/KLgu6uEQ== X-Gm-Gg: ASbGnctTI1EbKjyQhzK4vUp3guJ4g8vNoO66hNDnp50AO5/HMQNz2cGGB//SbdvSt9C Eb7+uG3hZ4SRSq2xRY6tT05f/7nvrCULG12Dkb4Xk6o2Q8OHF3wU4jkmzD22pgfBp1BB4YlAWCF SvjDB+i/FKKOkk8EOyiUEB8OeBsmJzmqwwtKv6yB3aB8vkOKIqxhuk+fZlvM8A1Uvym53ctR0KY k0GB57TWacjio/EGyODxZ17RMpd+mg7gFJBb0lDop9QTC0fSY9Veh8MHGfqytJlcUo06+H9UZ6O 1mL1P9FH6A== X-Google-Smtp-Source: AGHT+IEftn4n0MISXaBfqwq4/icw4vxQsRl6dSYGaCwLrA2cFFnCPe2C/ex2ih4Mxxcc54YZVxdLWQ== X-Received: by 2002:a05:6a21:680d:b0:1e1:ac4f:d322 with SMTP id adf61e73a8af0-1e5e0484559mr2467555637.14.1734662790558; Thu, 19 Dec 2024 18:46:30 -0800 (PST) Received: from wheely.local0.net (14-200-18-130.tpgi.com.au. [14.200.18.130]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad8dba99sm2037830b3a.92.2024.12.19.18.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 18:46:30 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Daniel Henrique Barboza , Harsh Prateek Bora , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-ppc@nongnu.org Subject: [PATCH 1/4] tests/functional: Don't fail the whole test if a pre-cache fetch fails Date: Fri, 20 Dec 2024 12:46:14 +1000 Message-ID: <20241220024617.1968556-2-npiggin@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241220024617.1968556-1-npiggin@gmail.com> References: <20241220024617.1968556-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=npiggin@gmail.com; helo=mail-pg1-x535.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.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 If any pre-cache downloads fail, the entire functional test run is failed. Signed-off-by: Nicholas Piggin --- tests/functional/qemu_test/asset.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/functional/qemu_test/asset.py b/tests/functional/qemu_test/asset.py index f126cd5863a..f82b07e7027 100644 --- a/tests/functional/qemu_test/asset.py +++ b/tests/functional/qemu_test/asset.py @@ -102,7 +102,8 @@ def fetch(self): return str(self.cache_file) if os.environ.get("QEMU_TEST_NO_DOWNLOAD", False): - raise Exception("Asset cache is invalid and downloads disabled") + raise Exception("Failed to fetch asset %s, not found in cache " + "and downloads are disabled", self.url) self.log.info("Downloading %s to %s...", self.url, self.cache_file) tmp_cache_file = self.cache_file.with_suffix(".download") @@ -162,7 +163,13 @@ def precache_test(test): for name, asset in vars(test.__class__).items(): if name.startswith("ASSET_") and type(asset) == Asset: log.info("Attempting to cache '%s'" % asset) - asset.fetch() + try: + asset.fetch() + except: + # Asset pre-cache should not be fatal. An error is printed + # and the test itself will fail if it is unable to get the + # assert. + pass log.removeHandler(handler) def precache_suite(suite): From patchwork Fri Dec 20 02:46:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 13916067 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 F0570E77184 for ; Fri, 20 Dec 2024 02:47:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOT2H-0001vD-Ue; Thu, 19 Dec 2024 21:46:42 -0500 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 1tOT2G-0001tw-15; Thu, 19 Dec 2024 21:46:40 -0500 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOT2D-0000IA-2a; Thu, 19 Dec 2024 21:46:38 -0500 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-7292a83264eso1306481b3a.0; Thu, 19 Dec 2024 18:46:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734662794; x=1735267594; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m/gqB0EFOflediWblib/x6PojT1X7ZGctVzz4h+o860=; b=i38KUUF6RVCIMLhgP4HvwMFrrsrn6xHtkZ+DPYr3AsTfixW4h18yQ5jJh8DkgD7vgp 1flleHwe8hfzlOh2eev8zdHTI+E4odZ8BHKnyjh+kThcYe/WPVPkMvTyqcH3TpPU4qfh TPYjFXU4T9IHLsYA9fvgtmSIhZl9S37VzH9I8J7FyothlxtcDKcfDpJDYWkShqEccFjS nnUaal6faJGs5+3fYbWLfdYm7tGw0/fzO3IJrm6HCg3HdkthfMsE/Cg+Jlldfwn3hrSy xElWuzTfarv66lqIJUOnx7bVQm2VOGuljbrHg7GAJ/NpCitycTgl/yse7DxgrQdp3mO3 ne1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734662794; x=1735267594; 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=m/gqB0EFOflediWblib/x6PojT1X7ZGctVzz4h+o860=; b=uyAzfbxr7WSWT5dml4YoqAvu633GdKcO3Z7oZXsFbUsZ/DD81QPSz3owRBQnKqvR09 n+X6USVGMubrFEA+gZit8nTLiNFYHAsVY6ZLrrKXKjg2ljz0nOitRU+KAwfKR7pf0zR5 UjVpGur65iN0Jg2qsHp20bohNQJdcWITRkMw65WwIXxbE7JeGWT14/4bxDbmHbCAWeez iKRDbfj0uj40MUJwBvg6ChXNFWBhru37ln2ncSznF2H2gA4UdOcBmoDAtQQS8xVXnQmn c69OJKogxFX4aiuaInf735FQvS9hdq/u1EWaHON2Bktv15k82VuR8PMWOWubCYdhu4np gI9A== X-Forwarded-Encrypted: i=1; AJvYcCW8FubsH2WFhMwhcKI3CRyYiyeBWgHZZdzgAVW4BYi9eVpJt/F/9NDvHuWUdrs17U7vBPGFELpweg==@nongnu.org X-Gm-Message-State: AOJu0Yz+rO3yHkJVauV4OnTaGs6iyX/pj64c5lKfJnjWNLIL/xZ6WwWa R5ZFuLS9bsNIJ23UbO5qWQKMkpwZvB3wnMZ3FJ5K6rkjOhbxkG4Ak66goQ== X-Gm-Gg: ASbGncsVGMts0OfYUeL3mE5RME1D5cJbKpW5GrpAxsJ1Y5n1H5LlTMm2p277jdOSZVs VMBP5VvdwAqR5iEhXd5H5czei2alyv2RZSM6lzK+LF1hulX+eMa4eSk+zGu3+5o24/vFUXI+8dx jvqPkR2R7/SFO/9ALBUf9k/V9dLAJWe4mApVxQ6Dr/l2FFxyrEp0DdjSoNb4OFIbmJ7Vy4pXE1N PtyVktATDyJ5lmvh9+Escueq6Uwh4u4OVjcDAwyDSgbydMMaPu5/rmEO5tYipAysODWKMZZv897 io6ISXnGpg== X-Google-Smtp-Source: AGHT+IFf9N30gN8QAQPjV3GJSValNAtE+UfHt2DeURUnnucrg+j8T4D0UEkQzyWc66bU042Hv5JVjw== X-Received: by 2002:a05:6a21:3994:b0:1db:d932:ddcc with SMTP id adf61e73a8af0-1e5e049f462mr2328172637.19.1734662794491; Thu, 19 Dec 2024 18:46:34 -0800 (PST) Received: from wheely.local0.net (14-200-18-130.tpgi.com.au. [14.200.18.130]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad8dba99sm2037830b3a.92.2024.12.19.18.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 18:46:34 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Daniel Henrique Barboza , Harsh Prateek Bora , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-ppc@nongnu.org Subject: [PATCH 2/4] tests/functional/test_ppc64_hv: Simplify console handling Date: Fri, 20 Dec 2024 12:46:15 +1000 Message-ID: <20241220024617.1968556-3-npiggin@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241220024617.1968556-1-npiggin@gmail.com> References: <20241220024617.1968556-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=npiggin@gmail.com; helo=mail-pf1-x435.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.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 Since functional tests have character-based console output parsing, there is no need for strange hacks to work around old line-based. Signed-off-by: Nicholas Piggin --- tests/functional/test_ppc64_hv.py | 43 ++++++++++++++----------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc64_hv.py index d97b62e364f..afc8b9a3106 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -12,6 +12,7 @@ from unittest import skipIf, skipUnless from qemu_test import QemuSystemTest, Asset from qemu_test import wait_for_console_pattern, exec_command +from qemu_test import exec_command_and_wait_for_pattern import os import time import subprocess @@ -102,31 +103,28 @@ def do_start_alpine(self): "id=drive0,read-only=true") self.vm.launch() - wait_for_console_pattern(self, 'Welcome to Alpine Linux 3.18') - exec_command(self, 'root') + ps1='localhost:~#' wait_for_console_pattern(self, 'localhost login:') - wait_for_console_pattern(self, 'You may change this message by editing /etc/motd.') + exec_command_and_wait_for_pattern(self, 'root', ps1) # If the time is wrong, SSL certificates can fail. - exec_command(self, 'date -s "' + datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S' + '"')) - exec_command(self, 'setup-alpine -qe') - wait_for_console_pattern(self, 'Updating repository indexes... done.') + exec_command_and_wait_for_pattern(self, 'date -s "' + datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S' + '"'), ps1) + ps1='alpine:~#' + exec_command_and_wait_for_pattern(self, 'setup-alpine -qe', ps1) def do_stop_alpine(self): - exec_command(self, 'poweroff') + exec_command(self, 'echo "TEST ME"') wait_for_console_pattern(self, 'alpine:~#') + exec_command(self, 'poweroff') + wait_for_console_pattern(self, 'reboot: Power down') self.vm.wait() def do_setup_kvm(self): - exec_command(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/main > /etc/apk/repositories') - wait_for_console_pattern(self, 'alpine:~#') - exec_command(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/community >> /etc/apk/repositories') - wait_for_console_pattern(self, 'alpine:~#') - exec_command(self, 'apk update') - wait_for_console_pattern(self, 'alpine:~#') - exec_command(self, 'apk add qemu-system-ppc64') - wait_for_console_pattern(self, 'alpine:~#') - exec_command(self, 'modprobe kvm-hv') - wait_for_console_pattern(self, 'alpine:~#') + ps1='alpine:~#' + exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/main > /etc/apk/repositories', ps1) + exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/community >> /etc/apk/repositories', ps1) + exec_command_and_wait_for_pattern(self, 'apk update', ps1) + exec_command_and_wait_for_pattern(self, 'apk add qemu-system-ppc64', ps1) + exec_command_and_wait_for_pattern(self, 'modprobe kvm-hv', ps1) # This uses the host's block device as the source file for guest block # device for install media. This is a bit hacky but allows reuse of the @@ -145,15 +143,12 @@ def do_test_kvm(self, hpt=False): '-kernel /media/nvme0n1/boot/vmlinuz-lts ' '-append \'usbcore.nousb ' + append + '\'') # Alpine 3.18 kernel seems to crash in XHCI USB driver. - wait_for_console_pattern(self, 'Welcome to Alpine Linux 3.18') - exec_command(self, 'root') + ps1='localhost:~#' wait_for_console_pattern(self, 'localhost login:') - wait_for_console_pattern(self, 'You may change this message by editing /etc/motd.') - exec_command(self, 'poweroff >& /dev/null') - wait_for_console_pattern(self, 'localhost:~#') + exec_command_and_wait_for_pattern(self, 'root', ps1) + exec_command(self, 'poweroff') wait_for_console_pattern(self, 'reboot: Power down') - time.sleep(1) - exec_command(self, '') + # Now wait for the host's prompt to come back wait_for_console_pattern(self, 'alpine:~#') def test_hv_pseries(self): From patchwork Fri Dec 20 02:46:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 13916064 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 45E15E77184 for ; Fri, 20 Dec 2024 02:47:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOT2J-0001w8-F7; Thu, 19 Dec 2024 21:46:43 -0500 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 1tOT2I-0001vI-Kz; Thu, 19 Dec 2024 21:46:42 -0500 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOT2G-0000Is-Sj; Thu, 19 Dec 2024 21:46:42 -0500 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-728eccf836bso1298444b3a.1; Thu, 19 Dec 2024 18:46:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734662798; x=1735267598; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vX6+uBltyHiZ0BPxDZL7s7smm+LPm95s74gnZrKNeBI=; b=CzKEBwQqjWI8dPW0XKqFpl2osLNYeIGXj73LGSe/aJobd6h4aBz2D4VpIl3lTv4TM0 +9qBWbpH0urevD2uJlW1R7Qtk5MxVvgPti4N/2qGDOo6w3zX//zmD/xWxCv57ewb/sv/ lneIL9aRoEgdWSRd3mkz57JNe0ByVUUKH2VC2enH2xlNUW1mPMOQ9PEyE4mTuUDShZ0L OrCTkUh8dy3z/tBpUBomgtB8F4CFOW1cg8DxMzivOhb+mN2EbcTClXtooL5RlJhAaPS0 39x6PNSvW2tfPfyV7tNh6z+xDpJdA5qsZCsk0E+ExVy9bJvSerPmBnYEARK+A1RaXL8k mAdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734662798; x=1735267598; 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=vX6+uBltyHiZ0BPxDZL7s7smm+LPm95s74gnZrKNeBI=; b=ggDkUlXxv+e/s9+pvzKHMqPBv4mHHLYRVbegViZf//QZQqEm2AMgT3XdEemQuQKm82 AflnR2Jj3AH1zmaYiUKov3aft9jTyrNslaUuwPhZB9LohrAJYSHgrkDUsnAQjUjHHU8C wFHDJZ/sbvyvoLI0kxH61B0u+fDiXHHmX9pZxoGcRbDaT58l/bVzs6gYU83xCOVbpvGz 4dzkkMygcvfU50JJ4uJ0/ddPSf7Xe+qWYzXVLqADzcbnDX1+Wzk4JbhqHWxu+Sb6p4RJ Gu8pota10zZQPfFBDekzBcRo4TXceKVonhAj3OegY/Q//l1jwJoDZVmVtOufnyEDPbv+ 1jRQ== X-Forwarded-Encrypted: i=1; AJvYcCVcJYRbT7Pe3f5MUjCY34iOadNBTyCBFQpIASzFNRkINVbtComs+b0pY5bgZUut61AnPUxR5D6ZBQ==@nongnu.org X-Gm-Message-State: AOJu0Yzm5oFabeUH2hHQT9gcGBziI3ZwZsaCnGdPyEGVTqDBm8Sl1/uM tzuWAFb29QH75OkCIxZik9EYQHoKDRxk/FuSwPYF5tfCCxG5McRfGKymNw== X-Gm-Gg: ASbGncs+BN8FFkn5eTIC8CQLCQuQjbErLq3alVxcRW6gqeWY1I1Siq+NE3+4skx9MPI RXcf0JrxlWRJPF9WMq/75gpRktZkX2lWX09ukxQendBPz6ZG+f7Vz1ag9VNRi6JfBBfNESuuyDS JmOOxZ1OSptzIG52CB9mPqdCjrL1FO/NSCJidQZt8NucWb+FabPGli9ZE5B+zkyRfXbK60rvthq WCYr34zvY6JBpezA5A7dpBz3ljDS19tyZJTLpwIoutFjNThTxcH1USCm9Gn5mjLblgCnY0rYpke cU/iAATlQg== X-Google-Smtp-Source: AGHT+IF+WLq2t4DBQAqYqIzF12tvo6xGOmDessvLOJwgk0RcZ9U0Gjph46uUoQyvnDLbe3MmKloHpg== X-Received: by 2002:a05:6a21:1505:b0:1e0:9cc2:84b1 with SMTP id adf61e73a8af0-1e5e0800447mr2488509637.30.1734662798509; Thu, 19 Dec 2024 18:46:38 -0800 (PST) Received: from wheely.local0.net (14-200-18-130.tpgi.com.au. [14.200.18.130]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad8dba99sm2037830b3a.92.2024.12.19.18.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 18:46:38 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Daniel Henrique Barboza , Harsh Prateek Bora , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-ppc@nongnu.org Subject: [PATCH 3/4] tests/functional/test_ppc64_hv: Update repo management Date: Fri, 20 Dec 2024 12:46:16 +1000 Message-ID: <20241220024617.1968556-4-npiggin@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241220024617.1968556-1-npiggin@gmail.com> References: <20241220024617.1968556-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=npiggin@gmail.com; helo=mail-pf1-x430.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.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 `setup-apkrepos` can be used to set repos rather than open-coding URLs. Signed-off-by: Nicholas Piggin --- tests/functional/test_ppc64_hv.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc64_hv.py index afc8b9a3106..62e1a0f3a2d 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -110,6 +110,10 @@ def do_start_alpine(self): exec_command_and_wait_for_pattern(self, 'date -s "' + datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S' + '"'), ps1) ps1='alpine:~#' exec_command_and_wait_for_pattern(self, 'setup-alpine -qe', ps1) + exec_command_and_wait_for_pattern(self, 'setup-apkrepos -c1', ps1) + exec_command_and_wait_for_pattern(self, 'apk update', ps1) + # Could upgrade here but it usually should not be necessary + # exec_command_and_wait_for_pattern(self, 'apk upgrade --available', ps1) def do_stop_alpine(self): exec_command(self, 'echo "TEST ME"') @@ -120,9 +124,6 @@ def do_stop_alpine(self): def do_setup_kvm(self): ps1='alpine:~#' - exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/main > /etc/apk/repositories', ps1) - exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.18/community >> /etc/apk/repositories', ps1) - exec_command_and_wait_for_pattern(self, 'apk update', ps1) exec_command_and_wait_for_pattern(self, 'apk add qemu-system-ppc64', ps1) exec_command_and_wait_for_pattern(self, 'modprobe kvm-hv', ps1) From patchwork Fri Dec 20 02:46:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 13916066 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 44CB0E7718A for ; Fri, 20 Dec 2024 02:47:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOT2O-0001yJ-CT; Thu, 19 Dec 2024 21:46:48 -0500 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 1tOT2M-0001xJ-Ek; Thu, 19 Dec 2024 21:46:46 -0500 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOT2K-0000JU-RM; Thu, 19 Dec 2024 21:46:46 -0500 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-72764c995e5so893280b3a.2; Thu, 19 Dec 2024 18:46:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734662802; x=1735267602; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ozzd5pDOTq1/IYcv7geWeZ29LCOfsyB2PUifZhowjvc=; b=Ak+3AfPfA8eOzx6zG6nDmC5GV6b+Pmaec7L56lfZMvhzITlvKYDkdmkaxQ6JhRDaDv UVT9pGA7bI+QhaWjRMAkfsEWgNANHTZR4RYgawHNDwQz7s2jH6vuPvVrdCWvuIhRGXwT 1ZhutXaCnzzC0qILhFiXqljoYd86u60ReW6VQgobh+09tueKkxyuTwFifIGrwPYs6+aW K/ES+/dc04zgcF+OML8XaS9rGv3QEm0J/jgKTqHMLrj256FKVQfVMyPmypt00C/KoZSq 8jRdDul4AaFhl+hvBLf1A3LAQuqISrAZaGXxwg1V9cXG18X7acHeFiI1C9L7a3qJKrYH eqiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734662802; x=1735267602; 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=Ozzd5pDOTq1/IYcv7geWeZ29LCOfsyB2PUifZhowjvc=; b=M5iAkz8xpMeVgj5mKM4PzRgjLCXGxaHE23HC6V3yagVXFRDEHnsdnDL+iDwGzj8NAE nBWZ797cy87v1H76Zd4iDe1iJoKPoVlhOsmkvHR+COnLRMNZvhpuS9LBsvtkfHuA7iXo Q1104u9UfSU2KWr1XZ3PYSIz6SJzSAgZDwFGfrZ/cdYd+36tmvwtIBrF//zRo0PV1MGK ii428wNIzehy8yGSN580iht7bHo/SXqbQ2mCmljZHmb/ynVadRu77Auh2s0QvvyXyyHb LRVS1VizczLAQnID3VCBN4+UUf0LX+EBkHJvqiv7vD/5XRdJ5yyF64qIBIx6rVNvWe5P siOA== X-Forwarded-Encrypted: i=1; AJvYcCUHUWKTUL7CECgbzbRRj689YrgockaJ0JPj53s6sdaiE2eaMWVJxF6OBycSFbQ4EoPZyrlkJ61pJg==@nongnu.org X-Gm-Message-State: AOJu0YyeWDxjA5GK76btkUptLCDdNBKWmIrCufVStSCBTssX2/iRRV0e sRZ3EkD6uHRAhZdYeDMX0mWqnMchUvHcuw30c9I0qtY4w8228xvXo3iGYg== X-Gm-Gg: ASbGncsV5Muv4b55DjamkSMLJXLgvbVzOc4RDTceA6of9wSch8lmxbZjMgezuZR97qW eEacXlD1L0C3vFFcW17I1NxV0jAQJqY0Qbx25ELlNlmFiJlMrSuvrImSXBTvkQUyl4l+SPAqJbl rNnhKyvwFYYu6r9xfuy6wNjdqwQCg+7rD+MTB6dUfkjDQLRDhu3gvJVu3R+j0dwKi4XxImPmxJd moGkfb7Mf4zCdHmzfkyW3m15nJFSy3dTPP91PQefxvH3F/UxJrPCr4hTn8GfjtRqQxuxiVAot9A FGhGEYXfdg== X-Google-Smtp-Source: AGHT+IEIL17gJrwBAmS8zSAsb7500PRFyMoNAEbNGFGn4aMC7cB0tYnN1hW647/+XwXIbmdoRYXL+g== X-Received: by 2002:a05:6a21:c8c:b0:1e1:a48f:1246 with SMTP id adf61e73a8af0-1e5e0818c00mr2421680637.45.1734662802561; Thu, 19 Dec 2024 18:46:42 -0800 (PST) Received: from wheely.local0.net (14-200-18-130.tpgi.com.au. [14.200.18.130]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad8dba99sm2037830b3a.92.2024.12.19.18.46.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 18:46:42 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Daniel Henrique Barboza , Harsh Prateek Bora , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-ppc@nongnu.org Subject: [PATCH 4/4] tests/functional/test_ppc64_hv: Update to Alpine 3.21.0 Date: Fri, 20 Dec 2024 12:46:17 +1000 Message-ID: <20241220024617.1968556-5-npiggin@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241220024617.1968556-1-npiggin@gmail.com> References: <20241220024617.1968556-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=npiggin@gmail.com; helo=mail-pf1-x42f.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.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 Signed-off-by: Nicholas Piggin --- tests/functional/test_ppc64_hv.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc64_hv.py index 62e1a0f3a2d..f5ff0993ff5 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -56,9 +56,9 @@ class HypervisorTest(QemuSystemTest): good_message = 'VFS: Cannot open root device' ASSET_ISO = Asset( - ('https://dl-cdn.alpinelinux.org/alpine/v3.18/' - 'releases/ppc64le/alpine-standard-3.18.4-ppc64le.iso'), - 'c26b8d3e17c2f3f0fed02b4b1296589c2390e6d5548610099af75300edd7b3ff') + ('https://dl-cdn.alpinelinux.org/alpine/v3.21/' + 'releases/ppc64le/alpine-standard-3.21.0-ppc64le.iso'), + '7651ab4e3027604535c0b36e86c901b4695bf8fe97b908f5b48590f6baae8f30') def extract_from_iso(self, iso, path): """ @@ -143,7 +143,7 @@ def do_test_kvm(self, hpt=False): '-initrd /media/nvme0n1/boot/initramfs-lts ' '-kernel /media/nvme0n1/boot/vmlinuz-lts ' '-append \'usbcore.nousb ' + append + '\'') - # Alpine 3.18 kernel seems to crash in XHCI USB driver. + # Alpine 3.21 kernel seems to crash in XHCI USB driver. ps1='localhost:~#' wait_for_console_pattern(self, 'localhost login:') exec_command_and_wait_for_pattern(self, 'root', ps1)