From nobody Fri Nov 22 02:25:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1729521371; cv=none; d=zohomail.com; s=zohoarc; b=heO/1UvYfoDd+ufuTkW/I0HYeV5HOD4lVfomoo1govkudGbCX8TIQJ53cxIYZXPSogYD2I3AZDGRwSOAfF/iJMcE+XuPuOULUT1HFEkMr+7QVxB++DlkH8anH8EV/yIIeh+WaHB9JzsLcl3/kBwoIu5xtnOSLV+uehqBkdzou/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729521371; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PPCHulRaSrD9EnHHmG1DTpUULk+3NsrkYOUB7K+zHIQ=; b=guPhK9ULNkRTrDUiL3+MI7JcEFkGDL2E/jpzwIfj52lARew2VQTVEZmn1m76JTpkCe0huP6+8oi5JMx7+Yqri4Dw5LKJ27LVY7yzLxlPMes552vMfx71oo+IfaK3voI6kfpyUdiCDQQx2L78dDt6V9wEZjfHa5gNgKoRS0wYwTM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1729521371491832.8784552922832; Mon, 21 Oct 2024 07:36:11 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.823578.1237598 (Exim 4.92) (envelope-from ) id 1t2tVb-00045M-Fm; Mon, 21 Oct 2024 14:35:47 +0000 Received: by outflank-mailman (output) from mailman id 823578.1237598; Mon, 21 Oct 2024 14:35:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t2tVb-00045F-BA; Mon, 21 Oct 2024 14:35:47 +0000 Received: by outflank-mailman (input) for mailman id 823578; Mon, 21 Oct 2024 14:35:46 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t2tVa-0003qm-Si for xen-devel@lists.xenproject.org; Mon, 21 Oct 2024 14:35:46 +0000 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [2a00:1450:4864:20::635]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c0fb9749-8fb9-11ef-99a3-01e77a169b0f; Mon, 21 Oct 2024 16:35:44 +0200 (CEST) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a99fa009adcso251164566b.0 for ; Mon, 21 Oct 2024 07:35:44 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66c6b1d8sm1999394a12.72.2024.10.21.07.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2024 07:35:42 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c0fb9749-8fb9-11ef-99a3-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1729521343; x=1730126143; darn=lists.xenproject.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=PPCHulRaSrD9EnHHmG1DTpUULk+3NsrkYOUB7K+zHIQ=; b=nnsgEdalGKTRAagQOv+viymd557Ppeaqi5QrtObVJoOSasuKqFqOlwAod7DFROc2uR lnaWXXEPab/sTgy0FdfUPW+G8vRgcBRCPzqRN7KLvd0ONZEgK0JIgl6Gz2mkvnmXasv7 gHfuCgSVO4e1EwG4NzMNwkllInuOO+eKbujXQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729521343; x=1730126143; 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=PPCHulRaSrD9EnHHmG1DTpUULk+3NsrkYOUB7K+zHIQ=; b=VrnqZjiB8YahuPatTHWaB8z/pm29rFMCShhiXpnM50H0judhdLZZVMt55Ntrt3YMeq WKQH7o38mNFYNvlUYAdls0tM0sQEG0MiG6fEdxXE+1xb4fqzC1GXfmYb0ImeOIpkgkkd qRcTZDdLx87mchPG5yof4JrZKCweeUQry/eMU3giTPL4fAmT+2INGVEbLLZXpA2G67Om JpPK2UEuziWtPjH48eyo7i5Kbr1P2yZiFXHD0TMbadjVsZk4/DAddd7FGYgi9MwRQWFy JKoaNvQWHu/D9ehj+XUnRdl/dBZSXfWWlV19W6Xo9qeCVEj0zyblzRuOqgiW7zw+uC67 VpDA== X-Gm-Message-State: AOJu0YyrIpnpVK7a6fnAPgvYiOVOKVLBjBpUKn91rgynudIwGVNw0BsO 1VR1/dWY4BE8wd2DaM8PqQxSXojsSkrwHOkr0dhMxV7smd8atG5JlAcUvub/dDMua9XB4AU69k4 g X-Google-Smtp-Source: AGHT+IF/YKBje1/sjQyLcv3cwySNfu272LXfSKucSlUmr6D4l1TBu+bJ4V3sTFepZXPB8g7FfCCWKQ== X-Received: by 2002:a05:6402:5412:b0:5cb:6841:ede5 with SMTP id 4fb4d7f45d1cf-5cb6841ee4emr7993078a12.28.1729521343064; Mon, 21 Oct 2024 07:35:43 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , "Daniel P . Smith" , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein Subject: [PATCH 1/3] CI: Minor cleanup to qubes-x86-64.sh Date: Mon, 21 Oct 2024 15:35:37 +0100 Message-Id: <20241021143539.3898995-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241021143539.3898995-1-andrew.cooper3@citrix.com> References: <20241021143539.3898995-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1729521372757116600 * List all the test_variants and summerise what's going on * Use case rather than an if/else chain for $test_variant * Fix indentation inside the case block No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- CC: Marek Marczykowski-G=C3=B3recki CC: Daniel P. Smith CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein --- automation/scripts/qubes-x86-64.sh | 84 ++++++++++++++++++------------ 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index bfa60c912a64..306304e9219f 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -2,6 +2,13 @@ =20 set -ex =20 +# One of: +# - "" PV dom0, PVH domU +# - dom0pvh PVH dom0, PVH domU +# - dom0pvh-hvm PVH dom0, HVM domU +# - pci-hvm PV dom0, HVM domU + PCI Passthrough +# - pci-pv PV dom0, PV domU + PCI Passthrough +# - s3 PV dom0, S3 suspend/resume test_variant=3D$1 =20 ### defaults @@ -19,17 +26,18 @@ vif =3D [ "bridge=3Dxenbr0", ] disk =3D [ ] ' =20 -### test: smoke test & smoke test PVH & smoke test HVM -if [ -z "${test_variant}" ] || [ "${test_variant}" =3D "dom0pvh" ] || [ "$= {test_variant}" =3D "dom0pvh-hvm" ]; then - passed=3D"ping test passed" - domU_check=3D" +case "${test_variant}" in + ### test: smoke test & smoke test PVH & smoke test HVM + ""|"dom0pvh"|"dom0pvh-hvm") + passed=3D"ping test passed" + domU_check=3D" ifconfig eth0 192.168.0.2 until ping -c 10 192.168.0.1; do sleep 1 done echo \"${passed}\" " - dom0_check=3D" + dom0_check=3D" set +x until grep -q \"${passed}\" /var/log/xen/console/guest-domU.log; do sleep 1 @@ -37,12 +45,12 @@ done set -x echo \"${passed}\" " -if [ "${test_variant}" =3D "dom0pvh" ] || [ "${test_variant}" =3D "dom0pvh= -hvm" ]; then - extra_xen_opts=3D"dom0=3Dpvh" -fi + if [ "${test_variant}" =3D "dom0pvh" ] || [ "${test_variant}" =3D = "dom0pvh-hvm" ]; then + extra_xen_opts=3D"dom0=3Dpvh" + fi =20 -if [ "${test_variant}" =3D "dom0pvh-hvm" ]; then - domU_config=3D' + if [ "${test_variant}" =3D "dom0pvh-hvm" ]; then + domU_config=3D' type =3D "hvm" name =3D "domU" kernel =3D "/boot/vmlinuz" @@ -52,17 +60,18 @@ memory =3D 512 vif =3D [ "bridge=3Dxenbr0", ] disk =3D [ ] ' -fi - -### test: S3 -elif [ "${test_variant}" =3D "s3" ]; then - passed=3D"suspend test passed" - wait_and_wakeup=3D"started, suspending" - domU_check=3D" + fi + ;; + + ### test: S3 + "s3") + passed=3D"suspend test passed" + wait_and_wakeup=3D"started, suspending" + domU_check=3D" ifconfig eth0 192.168.0.2 echo domU started " - dom0_check=3D" + dom0_check=3D" until grep 'domU started' /var/log/xen/console/guest-domU.log; do sleep 1 done @@ -79,19 +88,20 @@ xl dmesg | grep 'Finishing wakeup from ACPI S3 state' |= | exit 1 ping -c 10 192.168.0.2 || exit 1 echo \"${passed}\" " + ;; =20 -### test: pci-pv, pci-hvm -elif [ "${test_variant}" =3D "pci-pv" ] || [ "${test_variant}" =3D "pci-hv= m" ]; then + ### test: pci-pv, pci-hvm + "pci-pv"|"pci-hvm") =20 - if [ -z "$PCIDEV" ]; then - echo "Please set 'PCIDEV' variable with BDF of test network adapte= r" >&2 - echo "Optionally set also 'PCIDEV_INTR' to 'MSI' or 'MSI-X'" >&2 - exit 1 - fi + if [ -z "$PCIDEV" ]; then + echo "Please set 'PCIDEV' variable with BDF of test network ad= apter" >&2 + echo "Optionally set also 'PCIDEV_INTR' to 'MSI' or 'MSI-X'" >= &2 + exit 1 + fi =20 - passed=3D"pci test passed" + passed=3D"pci test passed" =20 - domU_config=3D' + domU_config=3D' type =3D "'${test_variant#pci-}'" name =3D "domU" kernel =3D "/boot/vmlinuz" @@ -104,7 +114,7 @@ pci =3D [ "'$PCIDEV',seize=3D1" ] on_reboot =3D "destroy" ' =20 - domU_check=3D" + domU_check=3D" set -x -e interface=3Deth0 ip link set \"\$interface\" up @@ -115,22 +125,28 @@ echo domU started pcidevice=3D\$(basename \$(readlink /sys/class/net/\$interface/device)) lspci -vs \$pcidevice " - if [ -n "$PCIDEV_INTR" ]; then - domU_check=3D"$domU_check + if [ -n "$PCIDEV_INTR" ]; then + domU_check=3D"$domU_check lspci -vs \$pcidevice | fgrep '$PCIDEV_INTR: Enable+' " - fi - domU_check=3D"$domU_check + fi + domU_check=3D"$domU_check echo \"${passed}\" " =20 - dom0_check=3D" + dom0_check=3D" tail -F /var/log/xen/qemu-dm-domU.log & until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest= -domU.log; do sleep 1 done " -fi + ;; + + *) + echo "Unrecognised test_variant '${test_variant}'" >&2 + exit 1 + ;; +esac =20 # DomU mkdir -p rootfs --=20 2.39.5