From nobody Mon May 13 13:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1695032706; cv=none; d=zohomail.com; s=zohoarc; b=IFhG5207lBPuvggrLY1Prln7OVsPxKP32Xteq8I1W8SejHSurg9cB47oKP/PVyVjulg+mACmK5cIBEgfeZcIVnwXCoeRgOhHr0j17wxgJFXunEWHPk7lCkG1+69d98pqy8qfagrZUyfOP74b1w9Zpn4LMGOeiEpQRaCHqSUAgg0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032706; 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=doh4T2ohvQ1Oc0+uMZ8tNvlD8o67gEBKvG2NoWfUtQQ=; b=byLj3obhZn05arfS7Ulyb0XbkgkfpAjogyhZn6+uNxgjxt3ZC9XscN/21R6+Oxpze3afiGhSZmo8uQoY1901mtWC+b5WmRPl1tWcXr3WGbNiLjR0VRIfD8qcJrQTkZC4qMBsvdrf1N3VfyMSv60kQUHNimfMiBYiz80u0zwAZj8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1695032706442427.7345829184919; Mon, 18 Sep 2023 03:25: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-367-Y315YzqNP3aSqZEVH0Q8Og-1; Mon, 18 Sep 2023 06:22:57 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 A6986100BAB1; Mon, 18 Sep 2023 10:22:52 +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 8CF5B40C6EA8; Mon, 18 Sep 2023 10:22:52 +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 3CB3119465A3; Mon, 18 Sep 2023 10:22:52 +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 3EA45194658C for ; Mon, 18 Sep 2023 10:22:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2FB0A40C2070; Mon, 18 Sep 2023 10:22:50 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id A804040C2064; Mon, 18 Sep 2023 10:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032705; 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=doh4T2ohvQ1Oc0+uMZ8tNvlD8o67gEBKvG2NoWfUtQQ=; b=Y7qBs67uW+A7RFX4qXq6F2L1cGvAH8ggVWIJJZga7n6FUxktZ8+dQXRQlR5/xgGuTKEDhW hfamtzhirsKzDFU7bDrEdK3aa80m713JM/hqc5cJGdcjOSf/BWw6xOQzd6asP8v776zrQi 5I+iMOlvTeIZPtaL6TbBaKsRSxUzQVo= X-MC-Unique: Y315YzqNP3aSqZEVH0Q8Og-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 01/12] syntax-check: Drop the shell's 'check for minus' rule Date: Mon, 18 Sep 2023 12:22:37 +0200 Message-ID: <4c8c90a613cedcb1b94a1abf40e4c5170fe6560a.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.2 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: 1695032706766100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Apparently we've only had it because the -[ao] options weren't portable at the time, but according to https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html both are defined in POSIX.1-2017 revision which is old enough for all our supported platforms to have adopted it already. Therefore, drop the rule. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- build-aux/syntax-check.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index d7cf109fbd..5718768193 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1201,15 +1201,6 @@ sc_prohibit_double_semicolon: halt=3D"Double semicolon detected" \ $(_sc_search_regexp) =20 -_ptm1 =3D use "test C1 && test C2", not "test C1 -''a C2" -_ptm2 =3D use "test C1 || test C2", not "test C1 -''o C2" -# Using test's -a and -o operators is not portable. -# We prefer test over [, since the latter is spelled [[ in configure.ac. -sc_prohibit_test_minus_ao: - @prohibit=3D'(\ (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 1695032579612138.78520926615954; Mon, 18 Sep 2023 03:22:59 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-14-OqNmF4TEOJC0iOKII1TPHA-1; Mon, 18 Sep 2023 06:22:55 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 441A5380673C; Mon, 18 Sep 2023 10:22:52 +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 2ECA3492C37; Mon, 18 Sep 2023 10:22:52 +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 CAB931946597; Mon, 18 Sep 2023 10:22:51 +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 1CC6E194658C for ; Mon, 18 Sep 2023 10:22:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E559740C2070; Mon, 18 Sep 2023 10:22:50 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A73240C2064; Mon, 18 Sep 2023 10:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032578; 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=XTvmduSIb/6Z2GMN8TJSYrrAQeZ8m5OdMcoIR5XaguE=; b=WexEoJqCtkgY0YftdvQkpOvxEPJw9i1ulVQZsp/ou0g1OUDpcrD3Zuhn5It6XMVFJQobsA H5/MazF2tUdADfaG9LdUjCghw8tkuz/emcvISBachIywNi8Lo6NmI0oUPJKABnpNWz/BiE ZG51Qp06fRkkEBRXOInzAffO+VVa8zM= X-MC-Unique: OqNmF4TEOJC0iOKII1TPHA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 02/12] ci: integration: Extract the integration CI main recipe to jobs.sh Date: Mon, 18 Sep 2023 12:22:38 +0200 Message-ID: <87e71159f08c9f6bac3cae58d9d069f61f7cb374.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.10 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: 1695032580260100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Follow what's been done to other jobs in .gitlab-ci.yml and extract the shell logic from YAML to a function in ci/jobs.sh Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/integration-template.yml | 36 ++---------------------------------- ci/jobs.sh | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 111a115286..e87ffaf9aa 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -27,33 +27,6 @@ .install-deps: &install-deps - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/* libvirt-python-= rpms/* =20 - # Avocado >98.0 fails with the nwfilter TCK tests, so stick with 98.0 fo= r now - - sudo pip3 install --prefix=3D/usr avocado-framework - - -.enable-core-dumps: &enable-core-dumps - - 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 - - -.enable-libvirt-debugging: &enable-libvirt-debugging - - source /etc/os-release # in order to query the vendor-provided variab= les - - if test "$ID" =3D "centos" && test "$VERSION_ID" -lt 9; - then - DAEMONS=3D"libvirtd virtlockd virtlogd"; - else - DAEMONS=3D"virtinterfaced virtlockd virtlogd virtnetworkd virtnodede= vd virtnwfilterd virtproxyd virtqemud virtsecretd virtstoraged"; - fi - - for daemon in $DAEMONS; - do - LOG_OUTPUTS=3D"1:file:/var/log/libvirt/${daemon}.log"; - LOG_FILTERS=3D"3:remote 4:event 3:util.json 3:util.object 3:util.dbu= s 3:util.netlink 3:node_device 3:rpc 3:access 1:*"; - sudo augtool set /files/etc/libvirt/${daemon}.conf/log_filters "'$LO= G_FILTERS'" &>/dev/null; - sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$LO= G_OUTPUTS'" &>/dev/null; - sudo systemctl --quiet stop ${daemon}.service; - sudo systemctl restart ${daemon}.socket; - done - =20 .collect-logs: &collect-logs - set +e @@ -78,14 +51,9 @@ before_script: - mkdir "$SCRATCH_DIR" - *install-deps - - *enable-core-dumps - - *enable-libvirt-debugging - - sudo virsh net-start default &>/dev/null || true; script: - - cd "$SCRATCH_DIR" - - git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git - - cd libvirt-tck - - sudo avocado --config avocado.config run --job-results-dir "$SCRATCH= _DIR"/avocado + - source ci/jobs.sh + - run_integration after_script: - test "$CI_JOB_STATUS" =3D "success" && exit 0; - *collect-logs diff --git a/ci/jobs.sh b/ci/jobs.sh index eb4a4e29cf..2bc6f86e45 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -80,3 +80,35 @@ run_website_build() { =20 run_build } + +run_integration() { + # Avocado >98.0 fails with the nwfilter TCK tests, so stick with 98.0 = for now + sudo pip3 install --prefix=3D/usr avocado-framework + + 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 + + source /etc/os-release # in order to query the vendor-provided variab= les + if test "$ID" =3D "centos" && test "$VERSION_ID" -lt 9 + then + DAEMONS=3D"libvirtd virtlockd virtlogd" + else + DAEMONS=3D"virtinterfaced virtlockd virtlogd virtnetworkd virtnode= devd virtnwfilterd virtproxyd virtqemud virtsecretd virtstoraged" + fi + for daemon in $DAEMONS + do + LOG_OUTPUTS=3D"1:file:/var/log/libvirt/${daemon}.log" + LOG_FILTERS=3D"3:remote 4:event 3:util.json 3:util.object 3:util.d= bus 3:util.netlink 3:node_device 3:rpc 3:access 1:*" + sudo augtool set /files/etc/libvirt/${daemon}.conf/log_filters "'$= LOG_FILTERS'" &>/dev/null + sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$= LOG_OUTPUTS'" &>/dev/null + sudo systemctl --quiet stop ${daemon}.service + sudo systemctl restart ${daemon}.socket + done + + sudo virsh net-start default &>/dev/null || true + + cd "$SCRATCH_DIR" + git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git + cd libvirt-tck + sudo avocado --config avocado.config run --job-results-dir "$SCRATCH_D= IR"/avocado +} --=20 2.41.0 From nobody Mon May 13 13:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1695032711; cv=none; d=zohomail.com; s=zohoarc; b=nhY5IusXdffztJsDpp842KdC5wRYyr9QHBjLs1E6BKkAgelxR5VN2Yrt+VD3KS1CmmQ6scaUR2U1Rpvfup+IfUHCFUxaoepVL4v+5wdUm2ZkOm9AfvZ4sI+tGXLD6dRpga5NtbGB5K4ZOhrgh7IvgVNDUMVRkf/VPeXp7Qa5EZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032711; 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=VQUASmmy0+0IoE5ZyEwpzL92zpCt+v61MqUCQ0WKquU=; b=GEmN9Rm4Ph0SlkCExZH1Xuxy1QQZCOK2Uq5n4aF7P1+jOG8qrtIotGPKFTdl5ECgjE3FDlzvkPVxVSHyv69YVe9b6DtTwI9U/SoHx6ZYLM7NicgdCShBiFreYubOJwfSOuxSoR3DuJCEQ6dwihcqdUHnBz62d6otWRQ9c3fgTRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1695032711215373.2684360701036; Mon, 18 Sep 2023 03:25:11 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-314-QSVhs4gMM4yzMAw_GZM66w-1; Mon, 18 Sep 2023 06:22:57 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 445D429ABA0D; Mon, 18 Sep 2023 10:22:54 +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 30C57492C37; Mon, 18 Sep 2023 10:22:54 +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 0E4511946597; Mon, 18 Sep 2023 10:22:54 +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 C3B82194658C for ; Mon, 18 Sep 2023 10:22:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A954040C200D; Mon, 18 Sep 2023 10:22:51 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D97E40C2009; Mon, 18 Sep 2023 10:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032710; 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=VQUASmmy0+0IoE5ZyEwpzL92zpCt+v61MqUCQ0WKquU=; b=E0miek35H3Wpb1HSHY4Jq/WirmzBvgnyUEhrdWRjNPHZfHoMa1RPQLW3HoPdJR6WaykMw1 wWNuKFGgVjOlhPVEtX+HSo/Cx2t34XZxI2aS+8BiyUeFBOPEmK7L7yxvsPZ6WeOpms1geA 9wCt9ViL+OwJqdzMI9DKuiEE8u/GCBg= X-MC-Unique: QSVhs4gMM4yzMAw_GZM66w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 03/12] ci: integration: Adjust the check for CentOS Stream version Date: Mon, 18 Sep 2023 12:22:39 +0200 Message-ID: <3ec2943ee3ef2a5d2288dabf18d8bf21f9b7527a.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.10 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: 1695032711779100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported versions of Fedora and CentOS Stream 9 default to modular setup, it's probably better if we cosmetically adjust the CentOS Stream version check to make it explicit that monolithic daemon services ought to be started only on Stream 8. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index 2bc6f86e45..adb798d127 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -89,7 +89,7 @@ run_integration() { sudo systemctl daemon-reexec # need to reexec systemd after changing c= onfig =20 source /etc/os-release # in order to query the vendor-provided variab= les - if test "$ID" =3D "centos" && test "$VERSION_ID" -lt 9 + if test "$ID" =3D "centos" && test "$VERSION_ID" -eq 8 then DAEMONS=3D"libvirtd virtlockd virtlogd" else --=20 2.41.0 From nobody Mon May 13 13:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1695032581; cv=none; d=zohomail.com; s=zohoarc; b=mhy+DHJmUp7Tx/gI5iyq7hwtDxuNftWArTCykG33Zxr/bUiCtEnUJ2SQo9Wea1TjAaOXrAUMPFsx3HAY3aEcIi7iMurBLCiPlsxeMmsCH1u+ySyAfWMGrziRRu8zNnWmqGq0Dd6U6+VEP9wG1Gtq5f4z2K6nguSjfRjzajo3Xsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032581; 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=4CQUoAWCsv25S79d0klBmvjwJereSKjsOMI5bULGYqQ=; b=JgliU56bot6nmoiLEJBIbfUSmChjKLhne5bAXka0DRIh+cWyqKLrLYRJy1tRUgXiavU6PBCphmrVw4sa8PnaYjhPYLoxTrhHmGNUkyFADj+GMLeFzX8HFFriX2sXiKXT74Y/fRj1pf6zkmdmb3bqC++wyouWWnIKbQKq0izqV08= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1695032581790639.4483258822917; Mon, 18 Sep 2023 03:23:01 -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-303-W8vXQ9MFOuSD8kWdsi72lg-1; Mon, 18 Sep 2023 06:22:58 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 0FC6880D692; Mon, 18 Sep 2023 10:22:55 +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 E892B492B05; Mon, 18 Sep 2023 10:22:54 +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 43B1519466E7; Mon, 18 Sep 2023 10:22:54 +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 8FCF3194658C for ; Mon, 18 Sep 2023 10:22:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6F42240C200A; Mon, 18 Sep 2023 10:22:52 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id E533C40C2064; Mon, 18 Sep 2023 10:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032580; 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=4CQUoAWCsv25S79d0klBmvjwJereSKjsOMI5bULGYqQ=; b=Aa9GWYOfMeGfOaPLGHjWtSMgxUprSCjrjLRYgz7kpVjsiXF02fYXtYDDQWwrODmsd9Q6Ab kGaSNyteTxvnmdmpgmcChU1hhfEOPafWSamZqzc/vs1Ol8g514QuxhyAfGtr1a2WDQ+5O+ qw1VnGFuXd73f3abdGl51f/XX0FdBJU= X-MC-Unique: W8vXQ9MFOuSD8kWdsi72lg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 04/12] ci: integration: Drop the 'install-deps' hidden job and reference Date: Mon, 18 Sep 2023 12:22:40 +0200 Message-ID: <9a611f9f8fd479a912bb6c58200099285036d627.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.10 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: 1695032582292100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Since the section now only consists of a single command, we can happily move the command to the main integration template job body. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/integration-template.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index e87ffaf9aa..544264c3d5 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -24,10 +24,6 @@ - sudo make install =20 =20 -.install-deps: &install-deps - - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/* libvirt-python-= rpms/* - - .collect-logs: &collect-logs - set +e - shopt -s nullglob @@ -50,7 +46,7 @@ stage: integration_tests before_script: - mkdir "$SCRATCH_DIR" - - *install-deps + - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/* libvirt-pytho= n-rpms/* script: - source ci/jobs.sh - run_integration --=20 2.41.0 From nobody Mon May 13 13:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1695032583; cv=none; d=zohomail.com; s=zohoarc; b=KBhrCEhQnlaOnCUlqRyZJVrMtvVkzh8cUx4Yp6D7Hw8lKApGLOgDInG/H3hUTsR2Hk88JarOxmpoUXB8zh8r6917ECwVfovNuRZvxZpPwfEGSX6J1F+t9QK3azrYGBxGWGh2z/LgMNGiMphN778jDCkKPPHGrGRILb1k0RdCayc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032583; 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=nIOCe+L5770pGTbwpC327KlEMvC6PzvfgiYxqQs4IFs=; b=F78MJXDnOJSi+WkDGdmLWrOJD8y9NhSr7uVrFym2vVKqvSzz1XIOxuX3ooZAmkrH2zxw2Gc4fBiZKMoTkieTb9G5A7NMdkdIU1JnYUHetPmZiJq0FL27TuZJ1+eKobWMvPMm+T42R5HgsPxqSparCIcef5iTxZb5HY8QhIJZk2Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1695032583741822.0296553051362; Mon, 18 Sep 2023 03:23:03 -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-215-pb6DLQz2N2C3Gvs4t4G3Qw-1; Mon, 18 Sep 2023 06:22:58 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 899EA811E86; Mon, 18 Sep 2023 10:22:55 +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 74E882156701; Mon, 18 Sep 2023 10:22:55 +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 7739E19466F3; Mon, 18 Sep 2023 10:22:54 +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 48C59194658C for ; Mon, 18 Sep 2023 10:22:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 32AC440C200A; Mon, 18 Sep 2023 10:22:53 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9D5940C2064; Mon, 18 Sep 2023 10:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032582; 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=nIOCe+L5770pGTbwpC327KlEMvC6PzvfgiYxqQs4IFs=; b=MjPA7VBtGTq6LLajthI07SWIqnjtAHD2JGrkBMXhye+doIaZBoCWyWZsZteVM50kDSUWwC /DjuP6x80XR4gqD2TlROihLlB/TruqeINFPhujPUA2nFkH8OVg2Xbs0sItlLmaMFPeGBIV 7t7VS4FrO8Kgtj6c5LbLKYnyATZzJsw= X-MC-Unique: pb6DLQz2N2C3Gvs4t4G3Qw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 05/12] ci: jobs.sh: Drop comment about the need for Avocado 98.0 Date: Mon, 18 Sep 2023 12:22:41 +0200 Message-ID: <42ea8c22a71beb090ba32f194933075c82e014ee.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.6 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: 1695032586248100005 Content-Type: text/plain; charset="utf-8"; x-default="true" We needed v98.0 due to a bug in the past and have been installing the latest Avocado for a while, yet we kept the comment by a mistake. Besides, looks like v98.0 ignores the avocado.config file in the TCK repo instructing it to run the test suite sequentially leading to test stability issues, so abandoning the v98.0 was a good thing in the end. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index adb798d127..04e776e9be 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -82,7 +82,6 @@ run_website_build() { } =20 run_integration() { - # Avocado >98.0 fails with the nwfilter TCK tests, so stick with 98.0 = for now 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 --=20 2.41.0 From nobody Mon May 13 13:50:50 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=1695032584; cv=none; d=zohomail.com; s=zohoarc; b=WSv88aHGJAHb/v2B57sZEt0FqCMhjNmtu00pQDA+v+rROjN63/NOcutElImU04/4ENVqB9jnhKRTotfARLUleNuXbBo+iyrhCggBwln59sA2g4Y0ft6m4GVydgYY5sbJamMpnYsFbMk0VQa6NL2wN3I0IONPFWVamZmR81uBIA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032583; 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=fTBZbDW3zpmLwD36zQ3s+cxAuL+Bu9sC6Ls1lATkxDI=; b=jTQksP16P3woo3KOeu/2peqxNXx6sfg13xF0RMdE+WQK1aPRo7pQBmTo0rwA04eY4tqyETMRpw4CpdcQfLmqJpkT2I6pOD/mdqhcEHIAl1iPFTIpNLCbxihGaNG1jRU48ttsjlZvyDa3GhOuSBDcuRn1h6IAhxaIgthNND9vXdI= 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 1695032583991438.00510542080156; Mon, 18 Sep 2023 03:23:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-548-HcnY3EZLNGykR-8vpVb1OA-1; Mon, 18 Sep 2023 06:22:59 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 7A4983C025D8; Mon, 18 Sep 2023 10:22:56 +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 5EF07C154CA; Mon, 18 Sep 2023 10:22:56 +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 AD6781946597; Mon, 18 Sep 2023 10:22:55 +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 03444194658C for ; Mon, 18 Sep 2023 10:22:54 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E936340C200A; Mon, 18 Sep 2023 10:22:53 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CC3A40C2070; Mon, 18 Sep 2023 10:22:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032583; 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=fTBZbDW3zpmLwD36zQ3s+cxAuL+Bu9sC6Ls1lATkxDI=; b=FE38cWoUBr5hx8FYwFlCIDFOx0iI4Fjt4BjOVWOLK8Ww3Bs4atZhUUgI1QD6rr6lTvohIQ xl76NhZ4o2rCw/NHtA/KLFFLu7VsE7BPQHs8OLIqIK4AjKmBeBrI88RzrlvET6ALWmqKcP pvZe+k5b9wq65zTKYh0sZ6y4n/KUKlk= X-MC-Unique: HcnY3EZLNGykR-8vpVb1OA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 06/12] ci: jobs.sh: integration: Use --quiet with virsh Date: Mon, 18 Sep 2023 12:22:42 +0200 Message-ID: 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.8 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: 1695032584693100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We've not been interested in any extra output from the command at all since we always redirected both stdout and stderr to /dev/null. Future patch will change that slightly, so --quiet will start making sense. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index 04e776e9be..75ea638580 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -104,7 +104,7 @@ run_integration() { sudo systemctl restart ${daemon}.socket done =20 - sudo virsh net-start default &>/dev/null || true + sudo virsh --quiet net-start default &>/dev/null || true =20 cd "$SCRATCH_DIR" git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git --=20 2.41.0 From nobody Mon May 13 13:50:50 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 From nobody Mon May 13 13:50:50 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=1695032589; cv=none; d=zohomail.com; s=zohoarc; b=BhZUaq8kRMUNyn1DxmEzdKzRBDD5wjdDkS3dBxw9/lOEvd3cyFZS98GIK1ClGgShmMEdWLHonw99vQNBDgXiwq0B9k2p6WvzPW+qbHSWDOxIo5mXlYEQSscuuI351b5+XANWEc+UUWIF/smfRLzEA8OpdyJT2laTFs3Y6O3wSyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032589; 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=IUSLUvKlBmFS7fFcl0OzTaOMt4w7/pMfeCo79XhTcBg=; b=iq6NGUntSWFMYNoNoVk599/5CmbOFTmw+6WdM+Ah+DuhJdrKccJUQyumEb6K025j9As1MNw8LpingluyHIFKSKTyyIyPdMZkeMQ1D3MjlKW1WuQa25m0lNY7FsYFXdCLWiOeu67sl/NFTCxk8ou/DyJa4TMIoVMOuwLc1C4YWCw= 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 1695032589767908.9122799364304; Mon, 18 Sep 2023 03:23:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-362-J-sGW59_Mj2qe27N2hSBOA-1; Mon, 18 Sep 2023 06:23:06 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 7ABD93810D2F; Mon, 18 Sep 2023 10:23:03 +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 530B740C6E78; Mon, 18 Sep 2023 10:23:03 +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 2ECB319465A4; Mon, 18 Sep 2023 10:23:02 +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 9D0EE19465A4 for ; Mon, 18 Sep 2023 10:23:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 79A6B40C200C; Mon, 18 Sep 2023 10:22:55 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8C3A40C2064; 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=1695032588; 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=IUSLUvKlBmFS7fFcl0OzTaOMt4w7/pMfeCo79XhTcBg=; b=ivg31Sp73r79wYnm+7F8mLMZF7mOeAIWv8tD+KKBmgLw/bU6TffemngzlMz31kttj2Q21Q dC4zXJ132ROdAnrWgX6bwJYEshn/MjA3z+5hk/cH/wvQ8kv6f5KZIOZkHkL/KeyLVqWrrO ft68jCoDdF9AT5WvjoJdK1/FOIgrA24= X-MC-Unique: J-sGW59_Mj2qe27N2hSBOA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 08/12] ci: jobs: run_integration: Make POSIX-compliant Date: Mon, 18 Sep 2023 12:22:44 +0200 Message-ID: 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.2 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: 1695032590281100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Neither '&>' nor 'source' are defined in POSIX. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index 37bca452fa..f4e83dda2e 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -91,7 +91,7 @@ run_integration() { sudo systemctl daemon-reexec =20 # Source the os-release file to query the vendor-provided variables - source /etc/os-release + . /etc/os-release if test "$ID" =3D "centos" && test "$VERSION_ID" -eq 8 then DAEMONS=3D"libvirtd virtlockd virtlogd" @@ -102,8 +102,8 @@ run_integration() { do LOG_OUTPUTS=3D"1:file:/var/log/libvirt/${daemon}.log" LOG_FILTERS=3D"3:remote 4:event 3:util.json 3:util.object 3:util.d= bus 3:util.netlink 3:node_device 3:rpc 3:access 1:*" - sudo augtool set /files/etc/libvirt/${daemon}.conf/log_filters "'$= LOG_FILTERS'" &>/dev/null - sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$= LOG_OUTPUTS'" &>/dev/null + sudo augtool set /files/etc/libvirt/${daemon}.conf/log_filters "'$= LOG_FILTERS'" 2>/dev/null 1>&2 + sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$= LOG_OUTPUTS'" 2>/dev/null 1>&2 sudo systemctl --quiet stop ${daemon}.service sudo systemctl restart ${daemon}.socket done @@ -113,7 +113,7 @@ run_integration() { # 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 + sudo virsh --quiet net-start default 2>/dev/null 1>&2 || true =20 cd "$SCRATCH_DIR" git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git --=20 2.41.0 From nobody Mon May 13 13:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1695032584; cv=none; d=zohomail.com; s=zohoarc; b=ifSHLWQPsHpu9/QOrB8/u/tFDnMEkwRgIG3TvCPXTymZOf9mEfdCRoxsVrZvMuzJUp59bmHidp4wFb8SL4HmVsbCx38F8nMhEzeFj+4JG4o/W5hndN41EKv3vuVTonZx4LTcywNwnnqxUOqwas8oH+S6by1QMOKCfF4+UcircYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032584; 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=tTjf0kvVwa4wKDU00tZN617gXKvpQ3dRPDt90OwJTvY=; b=RmzgILJ4Y9au/Wn/qjpjZ8RCtR7Wnbz14nBrAqQV9UPqJK91PQPhHVtT+di0sEOnRyufZTE+B9a/riOX99GlXifThLIWGal8MtteRvOjqysIdx6ZsBa02M5vR8zMVzSYSyyHZU9QXdKsYFQdVQIFYPZjgG03+XlI1TmRSZssyE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1695032584476240.5000568407902; Mon, 18 Sep 2023 03:23:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-433-xcgp_ZCNPb-s3BJf4ocjlw-1; Mon, 18 Sep 2023 06:23:00 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 1304A1C05147; Mon, 18 Sep 2023 10:22:58 +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 F1FE9C0FE03; 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 A7C6A194658F; Mon, 18 Sep 2023 10:22:57 +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 48B8E19465A4 for ; Mon, 18 Sep 2023 10:22:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 347CD40C2064; Mon, 18 Sep 2023 10:22:56 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE5E640C2070; Mon, 18 Sep 2023 10:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032583; 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=tTjf0kvVwa4wKDU00tZN617gXKvpQ3dRPDt90OwJTvY=; b=Ox+Zs4cRw1LD3xFq9d8moMBEL9QWNSOEFl1lH6w6YyJs+hG2+z4mmMrjcTemorWXaeBdTD IgrD1K2T9p9G+bWg3j6mR4gAmG4e3x2gR2WK77HJivbdmrxb3hRyGt1B+VXTf3K+ZwAD0Q d6+2vuqN7MSrAKUHtlAlZhLBkmFfsuE= X-MC-Unique: xcgp_ZCNPb-s3BJf4ocjlw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 09/12] ci: jobs.sh: run_cmd: Use eval to run commands Date: Mon, 18 Sep 2023 12:22:45 +0200 Message-ID: <8713e3a18682410ecb3ac639ffbadb59ca7c4203.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.8 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: 1695032584694100002 Content-Type: text/plain; charset="utf-8"; x-default="true" We tried to evade usage of eval in commit 6214ae55f6a, but trying to use I/O redirections with a command doesn't have the desired effect, because when Shell eats the redirection it is applied to anything inside the run_cmd function, even the print command we use for debugging purposes. In order to print all commands and use the redirection only on the actual execution of a given command, let's adopt eval on "$@" and allow passing redirections as strings later on. Future patches will demonstrate this. Signed-off-by: Erik Skultety --- ci/jobs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index f4e83dda2e..3a89cb1a69 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -15,7 +15,7 @@ fi GIT_ROOT=3D"$(git rev-parse --show-toplevel)" run_cmd() { printf "\e[32m[RUN COMMAND]: '%s'\e[0m\n" "$*" - "$@" + eval "$@" } =20 run_meson_setup() { @@ -70,7 +70,7 @@ run_rpmbuild() { run_cmd rpmbuild \ --clean \ --nodeps \ - --define "_without_mingw 1" \ + --define "'_without_mingw 1'" \ -ta build/meson-dist/libvirt-*.tar.xz } =20 --=20 2.41.0 From nobody Mon May 13 13:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1695032589; cv=none; d=zohomail.com; s=zohoarc; b=VzokfRHYKP7ie27LVr6uGU3VwNxo1qAOLnzEj1vjEc+PmA3DRIA0MzmM652Zub1GtJ0KsfdACashZk4puxxnCqDP6aEavzltTe2P/TAGJJ0KijQLBHPZMaKw8+TXqnO4aa4cxFSeUBbHRoCwKLQMwyCJVFSSO5pbelssg4kyr4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032589; 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=XqVp2ToKQdN3h9Es7d54+U1qZhRF3/0yoRbdav5ReVM=; b=YRM64yEKsScsYbhvFLb7U9C0ollkdcEz5A129TvTCinCcUhCweM4d8WjMAr2pWmjIrvC9wSsNUtM7/hXIe+i68JqREMB4PmNlehwKCo6yYbQ0jQX6kA2iSUWFCErGnk50PuOHbGN0ws7pcZKQPUdRmlUbAndy0ZVV3txgQJtKzk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1695032588973446.5691007741648; Mon, 18 Sep 2023 03:23:08 -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-483-lodzqoq_MtqjF9ENQEmZBg-1; Mon, 18 Sep 2023 06:23:04 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 495F118172C2; Mon, 18 Sep 2023 10:23:01 +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 3121B49BB9A; Mon, 18 Sep 2023 10:23:01 +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 E73B019466E6; Mon, 18 Sep 2023 10:22:57 +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 08C4119465A2 for ; Mon, 18 Sep 2023 10:22:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EDDE940C2009; Mon, 18 Sep 2023 10:22:56 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7186640C2064; Mon, 18 Sep 2023 10:22:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032588; 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=XqVp2ToKQdN3h9Es7d54+U1qZhRF3/0yoRbdav5ReVM=; b=IbUXTPRvIREV9HY3ap/XVf/CQNHfZkVjcuajXuh12qp00d3fQmmtLcFFPxYSUOKvV3lRXF LBGHTaJESl3yXk3y1UT+AYl9SlMnUSRzZKc+8T2hpNJS+zO2KuOQ5rITzbyl4Ghrt5cJ62 j3VPrVctvVCHehrSinheVge/HRipJT4= X-MC-Unique: lodzqoq_MtqjF9ENQEmZBg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 10/12] ci: jobs: integration: Execute raw commands via 'run_cmd' helper Date: Mon, 18 Sep 2023 12:22:46 +0200 Message-ID: <52e4d6b6e9068ee6e3cf71a329f48e1bd2cdbcd5.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.10 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: 1695032589299100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Unfortunately, once we go down the line of running our own scripts as part of GitLab CI jobs rather than open coding Shell in YAML, we lose the benefit of seeing each line the script executes. The downside of the default YAML however is that we have to maintain the same piece of code on 2 places in that case. Let's adopt what we use with other container jobs and prefix each shell command with 'run_cmd' which will dump it in the logs before executing. Flow control expressions and structures are a problem though in this regard, so let's just print some important values for debugging purposes. Signed-off-by: Erik Skultety --- ci/jobs.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index 3a89cb1a69..27add3d105 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -82,16 +82,16 @@ run_website_build() { } =20 run_integration() { - sudo pip3 install --prefix=3D/usr avocado-framework + run_cmd sudo pip3 install --prefix=3D/usr avocado-framework =20 # Explicitly allow storing cores globally - sudo sh -c "echo DefaultLimitCORE=3Dinfinity >> /etc/systemd/system.co= nf" + run_cmd sudo sh -c "echo DefaultLimitCORE=3Dinfinity >> /etc/systemd/s= ystem.conf" # Explicitly allow storing cores globally =20 # Need to reexec systemd after changing config - sudo systemctl daemon-reexec + run_cmd sudo systemctl daemon-reexec # need to reexec systemd after ch= anging config =20 # Source the os-release file to query the vendor-provided variables - . /etc/os-release + run_cmd . /etc/os-release if test "$ID" =3D "centos" && test "$VERSION_ID" -eq 8 then DAEMONS=3D"libvirtd virtlockd virtlogd" @@ -102,10 +102,10 @@ run_integration() { do LOG_OUTPUTS=3D"1:file:/var/log/libvirt/${daemon}.log" LOG_FILTERS=3D"3:remote 4:event 3:util.json 3:util.object 3:util.d= bus 3:util.netlink 3:node_device 3:rpc 3:access 1:*" - sudo augtool set /files/etc/libvirt/${daemon}.conf/log_filters "'$= LOG_FILTERS'" 2>/dev/null 1>&2 - sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$= LOG_OUTPUTS'" 2>/dev/null 1>&2 - sudo systemctl --quiet stop ${daemon}.service - sudo systemctl restart ${daemon}.socket + run_cmd sudo augtool set /files/etc/libvirt/${daemon}.conf/log_fil= ters "'$LOG_FILTERS'" "2>/dev/null 1>&2" + run_cmd sudo augtool set /files/etc/libvirt/${daemon}.conf/log_out= puts "'$LOG_OUTPUTS'" "2>/dev/null 1>&2" + run_cmd sudo systemctl --quiet stop ${daemon}.service + run_cmd sudo systemctl restart ${daemon}.socket done =20 # Make sure the default network is started on all platforms @@ -113,10 +113,10 @@ run_integration() { # 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 2>/dev/null 1>&2 || true + run_cmd sudo virsh --quiet net-start default "2>/dev/null 1>&2" || true =20 - cd "$SCRATCH_DIR" - git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git - cd libvirt-tck - sudo avocado --config avocado.config run --job-results-dir "$SCRATCH_D= IR"/avocado + run_cmd cd "$SCRATCH_DIR" + run_cmd git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git + run_cmd cd libvirt-tck + run_cmd sudo avocado --config avocado.config run --job-results-dir "$S= CRATCH_DIR"/avocado } --=20 2.41.0 From nobody Mon May 13 13:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1695032589; cv=none; d=zohomail.com; s=zohoarc; b=FXCpdaLsFIRRyAKUQko7oLqFz1NvpRaVhKLVZ+YEix/zN+zs63vIIDZ1mS+4s03/j915/xl1LeIoFOTYDF+Knz51cQmsjjaocRfC9VgZ+afAE8x1gH2Y4zJ6BIVtcooEApYjnBOOHWWAna8peJR51piue5RcAODYTD5FJrto7ik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032589; 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=A+kxmOuvek0DBhb64Uo9GB0UIQ4eiVg3Anp8FsmHnQg=; b=CNwbKZnlRgFdc0c/m34HcvpMNgPJw5iq2FBqrsk4za2K/XIVZDZuhOA/5rZe0DaZ8BwhgeepCSZYZi7NkdIJVESGFvLLxf3Vqkp9hANDMb8xpf8hcV09gg3MVv4QbIa+P7PgdM08VSUkCCaRAvEgg+7L+ohEMLweKJwnJ/+QInk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1695032589951608.2720343018643; Mon, 18 Sep 2023 03:23:09 -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-513-amM7GuOkPoyX--Odrp8aOQ-1; Mon, 18 Sep 2023 06:23:05 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 4DC88945930; Mon, 18 Sep 2023 10:23:02 +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 3892940C2064; Mon, 18 Sep 2023 10:23:02 +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 116CF19466F5; Mon, 18 Sep 2023 10:23:01 +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 B565419465B7 for ; Mon, 18 Sep 2023 10:22:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AF80040C2070; Mon, 18 Sep 2023 10:22:57 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34A3240C2064; Mon, 18 Sep 2023 10:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032589; 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=A+kxmOuvek0DBhb64Uo9GB0UIQ4eiVg3Anp8FsmHnQg=; b=RsfsY/7qLRARDqKFAvNY2RnbdFNrQuhpqM4Nhj06QFk6Cx/fs4q1jgix9h3lZEOJZywHhC T2e0h0t2GxMr6EFqGs6CDXD0fG0ijY9VA/CDM9Ray/xadhdBqNXibfuoEusjDIqTYesDgm hiV+0stLJiz6iC6ne953RhUJnw8jKfA= X-MC-Unique: amM7GuOkPoyX--Odrp8aOQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 11/12] ci: jobs: run_integration: Print DAEMONS variable for debugging Date: Mon, 18 Sep 2023 12:22:47 +0200 Message-ID: <7b08fa7dc7462cdbd502ea51268578333aa95c6e.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.1 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: 1695032591293100007 Content-Type: text/plain; charset="utf-8"; x-default="true" One advantage that GitLab's YAML has with Shell commands is that every single line is printed out as is, including control structures. In order to see whether the logic did the same thing and the tests are going to operate on the right set of daemons (monolithic vs modular), lets print the DAEMONS variable that we set depending on the distro we execute the tests on. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/jobs.sh b/ci/jobs.sh index 27add3d105..e10769527a 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -98,6 +98,8 @@ run_integration() { else DAEMONS=3D"virtinterfaced virtlockd virtlogd virtnetworkd virtnode= devd virtnwfilterd virtproxyd virtqemud virtsecretd virtstoraged" fi + + echo "DAEMONS=3D$DAEMONS" for daemon in $DAEMONS do LOG_OUTPUTS=3D"1:file:/var/log/libvirt/${daemon}.log" --=20 2.41.0 From nobody Mon May 13 13:50:50 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=1695032646; cv=none; d=zohomail.com; s=zohoarc; b=RVXIcP3pSNGj5sRtvXUtm9ZgV81rEXL/5Z7lRTjOeiG2MYbimX/LefnPc4bXgRNxuHYxRFKDyhw8BVqjrue4OBLpZyL/DM2cjcG1UXQIBbl6/K7v6+A+/ACZikZG9ln88m63doJNmUe+bi3mMkBSTuV2dOx78S8zkdMRNEpHqVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032646; 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=30gt134Tvmi14DTQ7+Cs0yUXzHZ4SCLSrwhs+oIfVaA=; b=XTlgh+Nz1qq8f3Kc8RHw5Y5RNml8Zx224qWjVQDrcB9Xxql0Z9FHnMWYWfcjj9Th5sugDDiWzUH3jJINizJlMNoHf6I5dg7dS32E5zGlubLxa/M2zWiJEXIO0aksr2p2QIkEFvspZWGW6nsp6ycoX/G/iJ1kIdOrT+zY8BLaAx0= 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 1695032646047461.3746171649432; Mon, 18 Sep 2023 03:24: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-169-eaynQqBFPOqgnWlHMmvMzA-1; Mon, 18 Sep 2023 06:23:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 349D58060EC; Mon, 18 Sep 2023 10:23:03 +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 104131402743; Mon, 18 Sep 2023 10:23:03 +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 4A0AE19466FC; Mon, 18 Sep 2023 10:23:01 +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 7AF7219465A4 for ; Mon, 18 Sep 2023 10:22:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7554540C2070; Mon, 18 Sep 2023 10:22:58 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id EAF2840C2064; Mon, 18 Sep 2023 10:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032645; 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=30gt134Tvmi14DTQ7+Cs0yUXzHZ4SCLSrwhs+oIfVaA=; b=VjYYdNVFBIOMFfRmyrrH76Mz7nJrkUiQbx4F4VvZzJVHfd6UJsxbhpUKoZWXqcLf3CDNzi /c+cb80YDswtBJ8BUjJ+fjhg9LfCmcyxNmFgEAhl0hwH5iDRaMGWG8tTByYkjxJgAJO5y8 vnxxONJUszwVcdipQuzzH0hd6qk5aIE= X-MC-Unique: eaynQqBFPOqgnWlHMmvMzA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 12/12] ci: jobs.sh: Define and create SCRATCH_DIR for local executions Date: Mon, 18 Sep 2023 12:22:48 +0200 Message-ID: <56be15e8a896d3ff07a03ce73d8b71efd76ba638.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.7 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: 1695032647878100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Running outside of GitLab will likely not have the variable set and hence the execution would fail. To make sure we always start with a clean scratch dir (which may or may not be the best thing), create it with 'mktemp'. The main reason for a temporary directory is to ensure a clean environment for the job every time run_integration function is run. For repeated interactive use case, it is imperative that the developer takes care of their environment. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/jobs.sh b/ci/jobs.sh index e10769527a..6e3d681af1 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -117,6 +117,13 @@ run_integration() { # should also be a non-fatal error run_cmd sudo virsh --quiet net-start default "2>/dev/null 1>&2" || true =20 + # SCRATCH_DIR is normally set inside the GitLab CI job to /tmp/scratch. + # However, for local executions inside a VM we need to make sure some + # scratch directory exists and also that it is created outside of /tmp= for + # storage space reasons (if multiple project repos are to be cloned). + SCRATCH_DIR=3D"${SCRATCH_DIR:=3D$GIT_ROOT/ci/scratch)}" + + test ! -d "$SCRATCH_DIR" && run_cmd mkdir "$SCRATCH_DIR" run_cmd cd "$SCRATCH_DIR" run_cmd git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git run_cmd cd libvirt-tck --=20 2.41.0