From nobody Thu May 9 09:51:21 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=1695114938; cv=none; d=zohomail.com; s=zohoarc; b=QE0wUuMLkryjZ0V2KFQcWuJwHSsVbBoKd/dVFnyC92Jb5S6lJgpHNBNCHOtjoX1RKFbXXu99d8ScLCHCITJ9NGYrVi1+o2JhIcd6K96IWehsP7J7aIHTVFzPUJ2fDUDV8zqm5xba1p9XOFJNSDt1Y8X4uD3mLZCt7MPONEk01UE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695114938; 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=JWifkhz7pu8R5u05ahaNywkWGicKTTrTHMXA1NFupKU=; b=JRCuMcwZib2qFNH9/NoTlu3Ctmjs1tpBnn+hjT0sLpUl7A/5q+O/S7+BqM6Lg/0civo2J4K+fzLKpqcaA1dj6kGr/+pTMPq3TlFBhtlWxioN6jhSc6fmg9GHATA5jTWxDFERMGhZ5SRvcLAyFuq4Sbo5vKyS57FBFsXiye1qaKw= 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 1695114938255355.5690228405373; Tue, 19 Sep 2023 02:15:38 -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-635-oE1MdbxANVKV-IrQ1XcLCw-1; Tue, 19 Sep 2023 05:15:35 -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 43BF9101A590; Tue, 19 Sep 2023 09:15:33 +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 2DC68C154CA; Tue, 19 Sep 2023 09:15:33 +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 D74DC19465BA; Tue, 19 Sep 2023 09:15:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 05270194658C for ; Tue, 19 Sep 2023 09:15:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DC995215670B; Tue, 19 Sep 2023 09:15:09 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 405A02156701; Tue, 19 Sep 2023 09:15:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695114937; 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=JWifkhz7pu8R5u05ahaNywkWGicKTTrTHMXA1NFupKU=; b=QkK2k8r0mV7MR5Lx/OrdXZE9YseQD5sZ/44Xgpj/rcwPJ1o5PC9GqgnJxDGmom4BiCMzmX oC6O09jr2MOa0OaqkRMaWjlkWBQW0f4yezPimxVGAwyb6yHBUWldPEIBqGiMaoUD6p8gD7 Pu7R6vRDbfshsWXagIrPvanauGfGDHw= X-MC-Unique: oE1MdbxANVKV-IrQ1XcLCw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 01/12] syntax-check: Drop the shell's 'check for minus' rule Date: Tue, 19 Sep 2023 11:14:56 +0200 Message-ID: <9df8f0648fbbf2e63d9d930e6291bde5e218f009.1695114836.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695114938574100005 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, so we can drop the check. However, the above has also marked -[ao] as obsolescent stating that: "[OB] Obsolescent The functionality described may be removed in a future version of this volume of POSIX.1-2017. Strictly Conforming POSIX Applications and Strictly Conforming XSI Applications shall not use obsolescent features." It is however unlikely that the shell implementations would drop support for -[ao] despite POSIX potentially removing them. 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.129.124]) by mx.zohomail.com with SMTPS id 1695114932088499.62354251289344; Tue, 19 Sep 2023 02:15:32 -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-591-0swsWa-nMAeTSt6x9bd2MA-1; Tue, 19 Sep 2023 05:15:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 C5D51101A529; Tue, 19 Sep 2023 09:15:26 +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 0920720268CB; Tue, 19 Sep 2023 09:15:24 +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 9C2CC194658D; Tue, 19 Sep 2023 09:15:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B5118194658C for ; Tue, 19 Sep 2023 09:15:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A299B215671F; Tue, 19 Sep 2023 09:15:10 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 133652156701; Tue, 19 Sep 2023 09:15:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695114931; 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=6q2UErpvHU06Z5f1TNL/xYhcNUMCp1p4D5e4VaWvTWs=; b=GDA/HtmlhRuZ82PAP5lZJti8LjYbRTJ/H4Uy7bWklLFkNwNBgxcXjNM/u3xu7dImcr2oFl /iIU2WJG4V98xznKrhT1s8yvKRAKyodFS2CLEYPT8f7giL/1uVZoS4mt65+vtYeiMsWL7c eLA1cjX3XzwEpUYiJ6XxSTKLKsndNQU= X-MC-Unique: 0swsWa-nMAeTSt6x9bd2MA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 02/12] ci: integration: Extract the integration CI main recipe to jobs.sh Date: Tue, 19 Sep 2023 11:14:57 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695114933765100001 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 Thu May 9 09:51:22 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=1695115024; cv=none; d=zohomail.com; s=zohoarc; b=NG+H1hwGKjz3FYNyqXe/ge858teWuioGnZN10v8wrJKl6txYA4sUaQUNHA/65nPdyuQHvKovbh23BfZEyoOENTeG1ShdD1Cy4QgqqSWvwS/mKcVJbYe3s0zVbWpohoQJED6MDnmDJPIStBR9ARtmKTHHSCS1PQ73qcWnk/VcKxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695115024; 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=9Eio8W1QvTQX2wY5LRC9fHR050d8hfegazj1RWvACxQ=; b=EMtq92D26JMdUXoM+1fh9yoY5wuzYCTCANz5UxtPjv7Xj5MsDQxTZcDkF/K+46JeJJmJfmBGDI85iQPqPfBIaBKcMc+CtYPaycPxW03xqMlNmDlB3BR/0hHMJeOnCaQahtG2WtBOqz6PQnYfbOmc2Ku/w7TlI95NHcQd57R9GIQ= 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 1695115024301779.4212552002127; Tue, 19 Sep 2023 02:17: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-130-hfcfroHiNKWqof22r1R98g-1; Tue, 19 Sep 2023 05:16:15 -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 185373822E80; Tue, 19 Sep 2023 09:16:13 +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 034B140C2064; Tue, 19 Sep 2023 09:16:13 +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 9853919465B5; Tue, 19 Sep 2023 09:15:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 91A73194658C for ; Tue, 19 Sep 2023 09:15:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 755B22156711; Tue, 19 Sep 2023 09:15:11 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA3652156701; Tue, 19 Sep 2023 09:15:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695115023; 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=9Eio8W1QvTQX2wY5LRC9fHR050d8hfegazj1RWvACxQ=; b=TK6nfic+0URK9YUuYvcF9cgi65fStPEvM3q7d5Wqy1aDtQVoZ3FuH3UMERwOnPDEAoEfAs FKd9wB9FP2b0mJVz8Z4p57sX9januxCt2RyWOsHSv59t9YBFfVGcIbWZ86obqoy0kL2LiP qj0ghSP+7fYwoJUKAF58LDDQPIYLtac= X-MC-Unique: hfcfroHiNKWqof22r1R98g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 03/12] ci: integration: Adjust the check for CentOS Stream version Date: Tue, 19 Sep 2023 11:14:58 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695115025425100001 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 Thu May 9 09:51:22 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=1695114983; cv=none; d=zohomail.com; s=zohoarc; b=ZO0rUjiSlSlOx3INkAbe/VwqwM9xa4rT2ewhs5RDgfkMWslS+sbZkLDn76mYICvIBbvpIFZYxiZYX32eYSArCe5CgiPJPNmKWfX1qRM3LgjXl/wPrq91mPY51FI+YguL7BvAJkhUnSkAIxs0dVcyTU0wxu4LIZ+23+GXzVHfnXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695114983; 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=AV5ykWADBYb7IxEC1WUxIcpg4NyldsorN+xHkzmvj1k=; b=mi67HWUoRisdHtpKrvatPhnVDXHUcAT2ll5JlEjnS2OsJV7KLsaQ1jq/QirQtIfr9ntWSXdn3WTSrjx8FDOiaHAMxYxSx7kx0GkNAzWdgvvg+EOELXKaiXFCiuQOqShCv4MNWjFr+NuRYo8I15UVrLaa61urI/yqeYz/qGJRF8I= 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 1695114983546295.3730591916566; Tue, 19 Sep 2023 02:16:23 -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-575-esdY3Ze0NcSH7SGi0843uQ-1; Tue, 19 Sep 2023 05:16:20 -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 41942101A529; Tue, 19 Sep 2023 09:16:18 +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 2C610492B16; Tue, 19 Sep 2023 09:16:18 +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 262D41946A76; Tue, 19 Sep 2023 09:15:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6B147194658C for ; Tue, 19 Sep 2023 09:15:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 55391200A35C; Tue, 19 Sep 2023 09:15:12 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD4682156701; Tue, 19 Sep 2023 09:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695114982; 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=AV5ykWADBYb7IxEC1WUxIcpg4NyldsorN+xHkzmvj1k=; b=ARlmuWW9HoZekrFRlomJ6b/z99exiVoM/m2dzt+CNR22dlD0I0SIicd/St0r4D+Sww7CLu Gs6qqA6pfmPTN+r9RvtD9s/A+dNEEAOCidaGVF9R4cF0UBRvyXP4N1nwqiMH4687tLqNFV kNHKHw2I7hZqeezKv3+Z88zruApAzOA= X-MC-Unique: esdY3Ze0NcSH7SGi0843uQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 04/12] ci: integration: Drop the 'install-deps' hidden job and reference Date: Tue, 19 Sep 2023 11:14:59 +0200 Message-ID: <9fe54c3fad2bd08e574c1948d5cf88b3deb5e05b.1695114836.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695114984720100001 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 Thu May 9 09:51:22 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=1695115036; cv=none; d=zohomail.com; s=zohoarc; b=dtpqpzj35Gg7rxSZVUAj5SqvOTgLGfJDHjF80MO1afyEjqUlMKPLI5qv9WdJvbauHOA6xctwEPB0Kum5b0Zvt+BgS3bb/67Qi3i49rRrs+bfkj6Wq0OUfrZj04Ot1+ZXfX894HdMIJR+X04LMJ5FwPNztY5uTJUd8/sKg1e4cbc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695115036; 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=w3/FuN+2KKid84zP/QLW3XsOUB/A1mD4gYhFBV+ylVo=; b=S//sn2hrZhr7OJdGcsoAwvECZYtWWc3upQK8dJG+Kg/KMc0c24ILpNrziKprepkxn7yaHXAKBDaAUNoljS8r1ipmpmrgFu3TExQv8vGeG/n1YZd9fwBpmgQwMMgpF0MqbWSQrs6JGmOZA3tO9w7qvgsA0GfFMuAnUE6ycKzgac4= 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 16951150361121019.9544560006512; Tue, 19 Sep 2023 02:17:16 -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-558-QL_qD8cxMoOgOK96eWQf4A-1; Tue, 19 Sep 2023 05:16:34 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 3845D3C02B4F; Tue, 19 Sep 2023 09:16:32 +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 E741320268CB; Tue, 19 Sep 2023 09:16:31 +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 5F60E19452C0; Tue, 19 Sep 2023 09:15:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 42492194658C for ; Tue, 19 Sep 2023 09:15:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1C5002156720; Tue, 19 Sep 2023 09:15:13 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80758200A6D2; Tue, 19 Sep 2023 09:15:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695115035; 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=w3/FuN+2KKid84zP/QLW3XsOUB/A1mD4gYhFBV+ylVo=; b=ROhNhQ6pSJycaQX+P81LzwNvrI7kg8HbZRJEMFZyovB6wh8KvCrXQHg9l0qZpjDjQtxw09 7YTv4JO5hyc0CsVyxb3a95xMKhZM86nPqCL/90BaQVT1IXXDYejgLABqhnCS1tRABQJm8w nCsc42RlRVGzZBE2pCw3IwepgTPjbO4= X-MC-Unique: QL_qD8cxMoOgOK96eWQf4A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 05/12] ci: jobs.sh: Drop comment about the need for Avocado 98.0 Date: Tue, 19 Sep 2023 11:15:00 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695115038312100001 We needed v98.0 in commit c9a65eb8 due to a bug in Avocado in the past and have been installing the latest Avocado for a while since commit 91774931, 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 in commit 91774931 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 Thu May 9 09:51:22 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=1695114998; cv=none; d=zohomail.com; s=zohoarc; b=fo6H/5NDsgyDUtZZzJOCFId0eDmjBJVZELWn2/bAG+Z+KoidYMkeYnP3BT8kPtKDaQ4EDxJO2ngIoQSkYGnaB7a64HRM3cMATkrbusF+SKVV8LpgAuRICgjEhJg7vydwpcD6V7UTNOJrSMSG0lHwHiZtHIzU/8+CBmAEOsprXjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695114998; 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=tF9s4NjLcrFgbobMbDck1kAo++8zAf9Sik5H8qTpTwE=; b=have4BtA1oeYKCB12/KocAQ0a7+nJjZJsdESb3izJg73nNf4gI2ZZxq0tvgaPh0R+gbpGVlvnV+FPDNZbYkolzWxFSBC+LIbjpkEbpI1vdzwOMdCsK0UaPfvmG4F4Kw5oR98GSSyPBSAKr5LyAZVeBXlkd0xcDjcjKm/zq02n2U= 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 1695114998022609.3415311235568; Tue, 19 Sep 2023 02:16:38 -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-558-WVI5EGxxMlCnPm_XX40pyQ-1; Tue, 19 Sep 2023 05:16:34 -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 4ADCE1C04B40; Tue, 19 Sep 2023 09:16:32 +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 06095492B16; Tue, 19 Sep 2023 09:16:32 +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 EB1BB1946594; Tue, 19 Sep 2023 09:16:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 08B4B194658C for ; Tue, 19 Sep 2023 09:15:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E2CA521B2413; Tue, 19 Sep 2023 09:15:13 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5358C200A6D2; Tue, 19 Sep 2023 09:15:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695114997; 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=tF9s4NjLcrFgbobMbDck1kAo++8zAf9Sik5H8qTpTwE=; b=PNOz6cWE9Oix43dDCIQV8blvUydcHL5ITMTEEthvPfdUmwYC36QSTkDFFdu/WDB/TQl8h2 gKE6c/yu3yCFlhyswjyUS6RpKDrlBl5QXAXw7Q/7k5fnMlvRXphiouk3d2EIYHQREQdcvM VVVSNRQiiJfrCdmmq1etl3U0ry46clU= X-MC-Unique: WVI5EGxxMlCnPm_XX40pyQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 06/12] ci: jobs.sh: integration: Use --quiet with virsh Date: Tue, 19 Sep 2023 11:15:01 +0200 Message-ID: <6774d17a050d3ac2d21960f9f85875433bb68302.1695114836.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695114999027100001 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 Thu May 9 09:51:22 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=1695114962; cv=none; d=zohomail.com; s=zohoarc; b=G8ZreCLWqwHDP5H2E4Ee0DeixHmfg3yqgmyQ86gtyBBxf5mY4TFPiyQgbDXivoBbD61jV+oXZsTX+WSXoCxuhAUcw79/ieSk51hzpsv3o14amX2vV5gMlMyBq2hB+/113JL7EPb+FpoYC3R303zQbzyTmblPynydzjGyMcyr82k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695114962; 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=H21cL7V6zCAm3QmyAngeW37btD1pLP+G0XpzRLnhRYU=; b=Wm/hwcMCbrZ+6lfTsgRZ1MSAdtEh9c11djIZ+hXNO/j3+aT/yu35tPgrPNJinG7K9MyMyJgVtZif5Im9BvQLqn/qRhl3occNL81D1+4868Gsq2J5STsxPZjZ8djmbDlLkWIWNXjaVwDFj85HUSlvv2yDbhVrPfurdmKOPD5lc1E= 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 1695114962972561.7602130019787; Tue, 19 Sep 2023 02:16:02 -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-442-ArIH1A-8NyeC9lz5LdLsGA-1; Tue, 19 Sep 2023 05:15:54 -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 B7060811E7E; Tue, 19 Sep 2023 09:15:51 +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 A336F492B16; Tue, 19 Sep 2023 09:15:51 +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 1366019466EF; Tue, 19 Sep 2023 09:15:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 21F7A19466EE for ; Tue, 19 Sep 2023 09:15:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B474921B2415; Tue, 19 Sep 2023 09:15:14 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2567521B2414; Tue, 19 Sep 2023 09:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695114961; 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=H21cL7V6zCAm3QmyAngeW37btD1pLP+G0XpzRLnhRYU=; b=Md03zzNvJvQ0qjLo0oKNd36ixNM6/Mr5OPys5/fJhSPsK018hb1QicBzlrPddy4xQFlkZM 5kQUtMIyW3zrFSBGwPkE3zsXWd0eYbozQbVOjpeYBsKBOa1e+5DoI9MbX+n9NPWNL6cQOm Ppx/0UPSq9EDUYtSK9VG5A+bvOja4Rc= X-MC-Unique: ArIH1A-8NyeC9lz5LdLsGA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 07/12] ci: jobs.sh: run_integration: Add/Rewrite/Reformat commentaries Date: Tue, 19 Sep 2023 11:15:02 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695114964861100001 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 Thu May 9 09:51:22 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=1695114958; cv=none; d=zohomail.com; s=zohoarc; b=fwBX4CslQo9q69T7iVMYIgYBvt+Z1lGB4sJiygtHIJGPIx0ZgA7/OgQqbBSo3/H2ncNMQSLQ1Hu41ue5ysFHeAFnZ5Glh9JEvOioYCouBELeyYSt2e0Eul+ACDk7Q0VF6H8IftqfJwnwginAfRthtf1MDXkhs1KIQpbqk44hGvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695114958; 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=JxkQl143qoK0l9ZSbpVvdwc4EwFfnQqh9ZyJsQtzO9I=; b=Q9fTj3GBlNUByhmzb0QMb7oXfAahQ7FQgurpINO57UtZXDRpnfpXBhxlOHkbnip14f1BwqHfQkk1i2x8/dNBPD6hAtbq/gmww+RnOwv1L5Ux5/7Bqw2mViSi7jdyzH8Ox6lKBoxls7nNCooBkm9p1Xm3vh8lAzPV4dLcgNoKZpc= 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 169511495839590.79921475063384; Tue, 19 Sep 2023 02:15:58 -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-696-YtZEvUksONOlTrn-4nQqVw-1; Tue, 19 Sep 2023 05:15:54 -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 DFFBD3822E86; Tue, 19 Sep 2023 09:15:51 +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 CB8D140C2064; Tue, 19 Sep 2023 09:15:51 +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 2DC5F194658D; Tue, 19 Sep 2023 09:15:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9CC70194658C for ; Tue, 19 Sep 2023 09:15:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 886A9215670B; Tue, 19 Sep 2023 09:15:15 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC37E21B2414; Tue, 19 Sep 2023 09:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695114957; 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=JxkQl143qoK0l9ZSbpVvdwc4EwFfnQqh9ZyJsQtzO9I=; b=Y2ntsCzsDgh6Ma5+gVGFDq+0IbOYUGsohAMRCcXivFpenasLlYdwSOtoLATlgbV7906yUr 8Q8xNyv1JwF4tEFjNtnBkReD/cdpzT975mmM/5Z/cQRjAnpTh1Su0r4RLq16rhdLftzekl vUGAOyxuwwf7+Y0Ncbnwqu+kfsbFNOQ= X-MC-Unique: YtZEvUksONOlTrn-4nQqVw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 08/12] ci: jobs.sh: run_integration: Make POSIX-compliant Date: Tue, 19 Sep 2023 11:15:03 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695114960254100001 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..b52e45cc8c 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'" 1>/dev/null 2>&1 + sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$= LOG_OUTPUTS'" 1>/dev/null 2>&1 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 1>/dev/null 2>&1 || true =20 cd "$SCRATCH_DIR" git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git --=20 2.41.0 From nobody Thu May 9 09:51:22 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=1695114979; cv=none; d=zohomail.com; s=zohoarc; b=CKUf0WQ9nSs5xhCawob0gA/MP2JghQicXJxGTYLWUKPTAaRKblz2Cc7oDMa4ue0RKuIamwl6TYaBs9uy+Nu0PWC5WJvgTKzf0L03T9Z/F9o+bmxJmMPnztvyUX8nyDXTXdObo0hA56P5fFYZV7u+KyTnfj7G5iVCISZmAWiMmoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695114979; 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=PQ5mt3OFig8KtIDC6k26p/5F/fUah4Att7EyMl710gc=; b=HAQ3XtuR2KNwhR586Flb+CkM203lZ/3jQbeNKOFCne79pImWNk/Oa0wnybQ5VMdLcdsgWU5DJtRcpDRU3ayMccjEtWF4eNFNddtomn/fqWvtF2RcIREucLT7mBJdBsah5BiDle07ZXhvly9YijQkflBRFwaUA+d11FzdLhvDMJI= 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 1695114979286636.3807685405816; Tue, 19 Sep 2023 02:16:19 -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-jK_N_2sTP_KaD3Ye_I1kMg-1; Tue, 19 Sep 2023 05:16:16 -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 CB6F085A5BA; Tue, 19 Sep 2023 09:16:13 +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 B5FFA401408; Tue, 19 Sep 2023 09:16:13 +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 E2B6D1946A68; Tue, 19 Sep 2023 09:15:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 43EF6194658C for ; Tue, 19 Sep 2023 09:15:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3EF39215671F; Tue, 19 Sep 2023 09:15:16 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id BEA10215670B; Tue, 19 Sep 2023 09:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695114978; 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=PQ5mt3OFig8KtIDC6k26p/5F/fUah4Att7EyMl710gc=; b=T99sRD7Exo+57a9+dgiwd8REuKjTeabv9deYjlAeaMM/HoqUd5POMnDlWC+az32owDp/9U 0/OeAtzyCc8WSk3dp+BywiG2BZUy5AEknE8XgxCkHx4DC9gAiAS3L7qGSFZONs8SKqWpa8 MvaUvkub9GN9df9Zd73asUDazbi5Pxs= X-MC-Unique: jK_N_2sTP_KaD3Ye_I1kMg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 09/12] ci: jobs.sh: Introduce a quiet version of run_cmd Date: Tue, 19 Sep 2023 11:15:04 +0200 Message-ID: <8fc223a69df958b02413fd5bc16d9e5d96ae212e.1695114836.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1695114980681100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We've started using the run_cmd helper function to log what kind of command is being executed as well as actually executing the command. The problem however is doing I/O redirections for commands which we don't wish to see any output for whatever reason. Now, if the redirection is applied at parameter passing to run_cmd it's going to be applied to the debug print as well. Let's introduce another helper, run_cmd_quiet which takes care of the I/O redirection and executes the command completely silently. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/jobs.sh b/ci/jobs.sh index b52e45cc8c..8ae3b87228 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -18,6 +18,11 @@ run_cmd() { "$@" } =20 +run_cmd_quiet() { + printf "\e[32m[RUN COMMAND]: '%s'\e[0m\n" "$*" + "$@" 1>/dev/null 2>&1 +} + run_meson_setup() { run_cmd meson setup build --error -Dsystem=3Dtrue $MESON_OPTS $MESON_A= RGS || \ (cat "${GIT_ROOT}/build/meson-logs/meson-log.txt" && exit 1) --=20 2.41.0 From nobody Thu May 9 09:51:22 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=1695115026; cv=none; d=zohomail.com; s=zohoarc; b=nQOO56w/UF9sKwcRKIqYNll3aprsoZ2aL8/yIYxPDVIRKA1ecxbSbgj90lnj4+hKPSXIHWrcbaLWQVntBYwdqUQl2cTfvv19yZOW0AjZR5FsAlt2SGQGbpS+wAI/4CcG5tCV8obP1x71O2VQwkDVlIDnjnpNSmzbrOZwD9BgO8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695115026; 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=jLDCx9B/C1IItOio3wraUQq4O5xSUChR7EnOZaSd9DE=; b=HZJMTHgDKFLF+wzBwpRlZ+346mBRYqx7wVIEZ3XCHCvNgwupfRLS/33syWNgSq2I/utg20mwb3eGNlCHZf1132lSf62/uV3jknih108NUXrSKS4fMxF63Lwd8+yF8G78P9Cbi1Bv9jopbBY1uA6RqyvO5XRHZDQ5DRTtSkVUw4A= 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 1695115026555538.2732830774074; Tue, 19 Sep 2023 02:17:06 -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-399-RvtqL22sOASLhPiUOTmRvQ-1; Tue, 19 Sep 2023 05:16:04 -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 2F2DE3C02B4A; Tue, 19 Sep 2023 09:16: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 15D54140273C; Tue, 19 Sep 2023 09:16: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 6813619466FF; Tue, 19 Sep 2023 09:15:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EFA30194658C for ; Tue, 19 Sep 2023 09:15:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EAB442156711; Tue, 19 Sep 2023 09:15:16 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76A432156701; Tue, 19 Sep 2023 09:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695115025; 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=jLDCx9B/C1IItOio3wraUQq4O5xSUChR7EnOZaSd9DE=; b=DtCrNoKn17596sf0jSuE+QaxAPcYL6brMVT/SIbcqZhmVsXDmLZg7rLJJTDLbtbCY27Vdp ShaiuoEjeZRSW4xUkzEjqBSXIeXpF7v+BTiKCq7hTNBKMeU/Ytk0TfG4b2ZIQ3NutzkBdh xR6JZG21uj/xHtp2ig2ITJMcdiqsO/w= X-MC-Unique: RvtqL22sOASLhPiUOTmRvQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 10/12] ci: jobs.sh: integration: Execute commands via 'run_cmd[_quiet]' helpers Date: Tue, 19 Sep 2023 11:15:05 +0200 Message-ID: <65f0a0043b3bfe4c67d94c8922530a00495fa91c.1695114836.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1695115028046100001 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' or 'run_cmd_quiet' 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index 8ae3b87228..861e561039 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -87,16 +87,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" =20 # Need to reexec systemd after changing config - sudo systemctl daemon-reexec + run_cmd sudo systemctl daemon-reexec =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" @@ -107,10 +107,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'" 1>/dev/null 2>&1 - sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$= LOG_OUTPUTS'" 1>/dev/null 2>&1 - sudo systemctl --quiet stop ${daemon}.service - sudo systemctl restart ${daemon}.socket + run_cmd_quiet sudo augtool set /files/etc/libvirt/${daemon}.conf/l= og_filters "'$LOG_FILTERS'" + run_cmd_quiet sudo augtool set /files/etc/libvirt/${daemon}.conf/l= og_outputs "'$LOG_OUTPUTS'" + run_cmd_quiet sudo systemctl --quiet stop ${daemon}.service + run_cmd_quiet sudo systemctl restart ${daemon}.socket done =20 # Make sure the default network is started on all platforms @@ -118,10 +118,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 1>/dev/null 2>&1 || true + run_cmd_quiet sudo virsh --quiet net-start default || 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 Thu May 9 09:51:22 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=1695114975; cv=none; d=zohomail.com; s=zohoarc; b=Dw55/CPNdDZgBiS5oH18ateMB+I1UxnrcplwTj2ngob8n80MPlRBrzomONKq2bXbWwbCw6oYgwpz4F/0b+6RLaoWlyX3Ea0SX87rmwwFMaDBHZE+511HLC3P1g4EA2F+uE07bS1c94NJh1iopVn0tinp6WNYxMQ1uTDL0930ifY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695114975; 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=TYVMNBCaDuoaNRGys/L8KOidjwYNaDHJJokdWGCIJzs=; b=fAKdbwFHEI94yMLpyoA6cphcdSLosUZBYeG082h3JW4+pHKCaAhf7Xr9DgqCqFxvM4AJAwrH2VARuP0KVBEitd/pFAtiM1LmVNgJ4ysRliq7Rp5EMrsYzxV8Ju+LtxYzRRzhJk3C6ORzgGW2oNnREOZCQF36WQqFfRk6dQIz2WA= 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 1695114975143684.6990592734287; Tue, 19 Sep 2023 02:16:15 -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-256-e4-8uGOoMrCqecfFLfruqw-1; Tue, 19 Sep 2023 05:16:10 -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 5798A185A78E; Tue, 19 Sep 2023 09:16:08 +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 42925140273C; Tue, 19 Sep 2023 09:16:08 +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 5AA9F19465B1; Tue, 19 Sep 2023 09:15:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C26C2194658C for ; Tue, 19 Sep 2023 09:15:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BD90E215670B; Tue, 19 Sep 2023 09:15:17 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E5262156701; Tue, 19 Sep 2023 09:15:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695114974; 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=TYVMNBCaDuoaNRGys/L8KOidjwYNaDHJJokdWGCIJzs=; b=Yz82LKRgzt6tkTMpu3W+uaUvCUnC7DbzGnV6PjUD2cr5sbci6DJm9+7KdXHIkjGQ7ijQ3s rjTvbTbss3TcQQpVDzPEEIpu8Z5Tz+BTJdKWX0z8LvxCguQIkZKLX2mdfG1gizWoK644fm ytkfZLFdYPayI1JhEzMXDe6d5RI4vZ8= X-MC-Unique: e4-8uGOoMrCqecfFLfruqw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 11/12] ci: jobs.sh: run_integration: Print DAEMONS variable for debugging Date: Tue, 19 Sep 2023 11:15:06 +0200 Message-ID: <35dc46a7093b748d69bc877b9897b3b6e70901e4.1695114836.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695114976599100001 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 861e561039..2e6888232f 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -103,6 +103,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 Thu May 9 09:51:22 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=1695114998; cv=none; d=zohomail.com; s=zohoarc; b=D8z5nLa+vcyuvwMl/32vjtOaykLyPzGk1mPSw/DGkgIXEIBASncpWPb2YYvNC0i6o8FkAUK++FGECVdb2cyopOYEuPvww+jNDHXi1fIMDL84yM/+iyIdiH2XZokTzsnC5ma69Wo/IIhkos2FxXRi5sJLVJR76TIHjhte0FBbooA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695114998; 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=us+RiNLsdkBz5mz8/3P4xxdcA1dsvdtYXE88j4K1g1c=; b=ZQkxWzADrdf2iiIhMkOv1Ufcgtp0uTK+pm6QHs4ft1qr5SMbhm8PiZY1sSe7ZLUjAReOJPm1VTYQEj+Bc2gFo8Jb9S1XgNSi2RZEkRWW697Zn6mpHNquGmoKZMvd+33oSqMmpWhphnLkiZ0ZxncgtFgHOE81EBT7swCjn3+Lh2s= 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 1695114998295116.76315802677584; Tue, 19 Sep 2023 02:16:38 -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-626-rBFsPpS1OmaCMzuPRPouIg-1; Tue, 19 Sep 2023 05:16:34 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 85A528039C8; Tue, 19 Sep 2023 09:16:32 +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 70891167F8; Tue, 19 Sep 2023 09:16:32 +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 93D9E19452CD; Tue, 19 Sep 2023 09:15:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 966D3194658C for ; Tue, 19 Sep 2023 09:15:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 91B022156711; Tue, 19 Sep 2023 09:15:18 +0000 (UTC) Received: from orca.brq.redhat.com (unknown [10.43.2.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 016282156701; Tue, 19 Sep 2023 09:15:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695114997; 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=us+RiNLsdkBz5mz8/3P4xxdcA1dsvdtYXE88j4K1g1c=; b=LTipbh4XGcBhD6QOMuOOWWUG75RgcaZOHoZagq9iFSypoCuVHwb8GBR9EE5paZFAMZfkJU X1SlZfdV9czfJZsqDH1qiH5I/JmXd+9Y5oqWDX+Jy9+RUzRTKk+eN1p9Mn9Vu0Gy8X7Ucy V80+K+nIhzlrXHySx5X24mBS9TQ2c+0= X-MC-Unique: rBFsPpS1OmaCMzuPRPouIg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v3 12/12] ci: jobs.sh: Define and create SCRATCH_DIR for local executions Date: Tue, 19 Sep 2023 11:15:07 +0200 Message-ID: <8edaf5c45b1601650ec14dbeaae00b8635d3a65e.1695114836.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695114999085100002 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 2e6888232f..ba522258a1 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -122,6 +122,13 @@ run_integration() { # should also be a non-fatal error run_cmd_quiet sudo virsh --quiet net-start default || 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