From nobody Tue Oct 22 22:28:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695032586; cv=none; d=zohomail.com; s=zohoarc; b=AysUrEO7i1QlHyXNP8T+315R3U2S7BwiASCvUW+eptUxsG9uwQaPO9T1l7R4IdB3Jd3bKnPYSu33otBABE/QuwErZxVZLFka/PhHbYjuF0D+25hn3FwTVQaPHEL61x+NH4CL1m6i56UvMLvfV7JS7BCW7ZeIsKmn/9Fo0lHTlXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032586; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ea/o14GTsj5HNrUyB5ryvpThfKo1is8xesNHbtldVW4=; b=GFghuJinQO+3Hjr+O+W4iLC9dq1L4Nd/D6g5i4Y1y6pjgc3/zi1Xj5BCTxJ5yCrr24aj2eNfRqe+YDXvWxXsxUnh32kDJfwu3UrngNvdpFP5MWmUc3Iy5nt0+c/g8X+fH7CnLzJDax1D2cfCJ6XZX9SAfzZZvJbQjj/7i/O2wDk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1695032586740416.245768496507; Mon, 18 Sep 2023 03:23:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-6eu3UtqGNUKAsP3fmSooPQ-1; Mon, 18 Sep 2023 06:23:01 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5D4FD801FA9; Mon, 18 Sep 2023 10:22:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4705B4011E4; Mon, 18 Sep 2023 10:22:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 72BA4194658F; Mon, 18 Sep 2023 10:22:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C8CD219466F8 for ; Mon, 18 Sep 2023 10:22:54 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id ADB4240C200A; Mon, 18 Sep 2023 10:22:54 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FDAF40C2064; Mon, 18 Sep 2023 10:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032585; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Ea/o14GTsj5HNrUyB5ryvpThfKo1is8xesNHbtldVW4=; b=fZb1mysIjV3p6XphZ9mTHhCcEjGFNEIwFyGqFnmDxuIUAknpw8Gi73u+n5M8odC+A23m5w E07uCPw4JTUPpWyp5V6+Sv9cQS8BI9NB54Ri5DAmBHAWNjXZb2TmqqRSw28o/7mROdVJ3p 1RdpURMWvAe4IH9gUmrrUuCDbPliJNc= X-MC-Unique: 6eu3UtqGNUKAsP3fmSooPQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 07/12] ci: jobs.sh: run_integration: Add/Rewrite/Reformat commentaries Date: Mon, 18 Sep 2023 12:22:43 +0200 Message-ID: <843078cd0742625d3d125dacf2bc85fddbebf246.1695032553.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695032588758100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Because of the nature of writing inline shell commands to YAML, most of the commentaries where inlined with the command not to hinder YAML readability any further. Since we moved the logic to a standalone script, we can now do whatever formatting & readability adjustments we want. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index 75ea638580..37bca452fa 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -84,10 +84,14 @@ run_website_build() { run_integration() { sudo pip3 install --prefix=3D/usr avocado-framework =20 - sudo sh -c "echo DefaultLimitCORE=3Dinfinity >> /etc/systemd/system.co= nf" # Explicitly allow storing cores globally - sudo systemctl daemon-reexec # need to reexec systemd after changing c= onfig + # Explicitly allow storing cores globally + sudo sh -c "echo DefaultLimitCORE=3Dinfinity >> /etc/systemd/system.co= nf" =20 - source /etc/os-release # in order to query the vendor-provided variab= les + # Need to reexec systemd after changing config + sudo systemctl daemon-reexec + + # Source the os-release file to query the vendor-provided variables + source /etc/os-release if test "$ID" =3D "centos" && test "$VERSION_ID" -eq 8 then DAEMONS=3D"libvirtd virtlockd virtlogd" @@ -104,6 +108,11 @@ run_integration() { sudo systemctl restart ${daemon}.socket done =20 + # Make sure the default network is started on all platforms + # The reason for the '|| true' here is solely that GitLab executes all + # Shell scripts with -e by default and virsh returns an error if one t= ries + # to start a machine/network that is already active which is both fine= and + # should also be a non-fatal error sudo virsh --quiet net-start default &>/dev/null || true =20 cd "$SCRATCH_DIR" --=20 2.41.0