From nobody Sun May 19 04:35:07 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=1674811633; cv=none; d=zohomail.com; s=zohoarc; b=iArNUcpG8EtgGaNvtzA+OY4/C+yY2vCjaBtMfFtlfUb+bvtwu19n9gnHKClh9wSGvZIXk+kOk0UH/cppSxf5Pthf5m62g9TsM1jerNG2obtgTKJjGDtQy/GBM+f3fw7ma7w+nnlO4NV0OFhWIRf1FeWxZ/Ojkch3U9uF+igMvt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674811633; 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=P4xtQRvsKZ5hPho6n5mYC8P6CpWCapVmE/Rml1VOAbA=; b=jA+I7h9j/b+0j2qF37lwoBKl4MDf/w2413oUf/P++IwaK3H4yhWOM4D63ZSn1Gxf8x4kZwJns0FKBY7ue6uk/j7BL2oFZ1ZjRFepWMyRXDB5eThbzEBx4FRZrjJyzmIH6JOIk6wmcS0XYNycmX0sxmSVT72t8cwU0j9+mx9hRJs= 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 1674811633973378.70406674870367; Fri, 27 Jan 2023 01:27:13 -0800 (PST) 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-120-wrewwKtyN4OvhOxWld_g3A-1; Fri, 27 Jan 2023 04:27:09 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 526D2800B30; Fri, 27 Jan 2023 09:27:07 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B9F9492B02; Fri, 27 Jan 2023 09:27:05 +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 BFECF194658D; Fri, 27 Jan 2023 09:26:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0F763194658C for ; Fri, 27 Jan 2023 09:26:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E6BD614171C0; Fri, 27 Jan 2023 09:26:58 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-168.brq.redhat.com [10.40.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64F3014171BE; Fri, 27 Jan 2023 09:26:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674811632; 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=P4xtQRvsKZ5hPho6n5mYC8P6CpWCapVmE/Rml1VOAbA=; b=d9spb2P9IFXHVxnG0KtwctJ2L3Aw64Fb36tdDCbm5LypoaAKuEBugIwoyIjvRUDd5PGPFS 9VxNNzNeR53H9wg2YZIdQHgnF423hi8C9d7UKRz5j++/eOaaV9hwQ1aKY65WEL2x03liEu 4Qgpx9Vt9v5kvhoBr1BrVd+qbbM+OFA= X-MC-Unique: wrewwKtyN4OvhOxWld_g3A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/8] syntax-check: Drop the shell's 'check for minus' rule Date: Fri, 27 Jan 2023 10:26:49 +0100 Message-Id: <2e1314f64dd3b5b8217fe64edcbda36b671a3a1d.1674811615.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1674811635759100005 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 --- 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 96d322ee04..7b07fd4712 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1183,15 +1183,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 1674811640791573.6087932806387; Fri, 27 Jan 2023 01:27:20 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-532-vmgRrnxNP2yfCh-lU49YmA-1; Fri, 27 Jan 2023 04:27:14 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DD4923C22749; Fri, 27 Jan 2023 09:27:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C891A7AD4; Fri, 27 Jan 2023 09:27:11 +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 B8A591946A47; Fri, 27 Jan 2023 09:27:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C10A21946594 for ; Fri, 27 Jan 2023 09:26:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B23AE14171C1; Fri, 27 Jan 2023 09:26:59 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-168.brq.redhat.com [10.40.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 310B114171BE; Fri, 27 Jan 2023 09:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674811639; 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=fPVaXEREcbltMINAsWr7P6FUyeXDK/or3reDV1FPBpk=; b=MUwuSrC1+o6ET0wKXjwPmkeN5LCpS6YsyVfMvPX4XhL+dO66vh8CIWcFLuIHmbIG6GUc4S IhN1qkKirLCYlSHmjFHcw/teNnUzCPhgFkc8JST61o+lDAEWz9Dl5szWcDeOaorCfL82dG 34HFxcRPhbl++VT4yC0x/QppO8VX0gs= X-MC-Unique: vmgRrnxNP2yfCh-lU49YmA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/8] ci: Move the SCRATCH_DIR from /tmp Date: Fri, 27 Jan 2023 10:26:50 +0100 Message-Id: <184abc93fe245d722b50f373f00259493cb42130.1674811615.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674811641800100001 Content-Type: text/plain; charset="utf-8"; x-default="true" In case /tmp is mounted as an in-memory file system, we're fairly storage limited. This might pose a problem in VM scenarios if we build multiple projects in there or download some data needed for testing. Therefore, move the scratch to /home. Also, take the opportunity and rename scratch to 'vroot' as primarily we're building other projects in this directory, the fact that we also store other data is only a secondary use case for it. Signed-off-by: Erik Skultety --- ci/integration-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 9141d5cedf..15c36d7a29 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -91,7 +91,7 @@ - test "$CI_JOB_STATUS" =3D "success" && exit 0; - *collect-logs variables: - SCRATCH_DIR: "/tmp/scratch" + SCRATCH_DIR: "/var/tmp/scratch" artifacts: name: logs expire_in: 1 day --=20 2.39.1 From nobody Sun May 19 04:35:07 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=1674811633; cv=none; d=zohomail.com; s=zohoarc; b=LBBAsDBv+sQae/PJ4xhwUMVNGbKyY/ct2/GonL96Ma7vEsXuPKRSDXyRwLSQChNyFyh+H4EzCmUK4zfWz8KSy8THvH9O9iDZwCJKDCE8iKwoZ4lHk3lpC835b32uPdZlWc32WByPV/RaZbjyZO/g5VLllAMgrISv0zZC5m4WRZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674811633; 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=raH4YuIRThssQ5BdU818Y9myk6O28DR/HBCFSzJvN44=; b=mhxkGH8M+JdPCNjeaX52WKNZqhExFTA2LbcNjS+8V504OE5l4s2vhiMKpxjBk8SaHvC32vFueoL/JAX38RjSWuzZ+x/ezt/JLcQkHymndcD9Nw+h3IHJpKzwvCDmHXknI1p37BrP8zF2aJ9AY1fzxUsx9AUj3sNABuorAnVSZBI= 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 1674811633284981.0643354330415; Fri, 27 Jan 2023 01:27:13 -0800 (PST) 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-99-tLAFhD2SOB2GWRt07i_dNg-1; Fri, 27 Jan 2023 04:27:11 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B342085C6E2; Fri, 27 Jan 2023 09:27:08 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A16381121314; Fri, 27 Jan 2023 09:27: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 ECD521946A5E; Fri, 27 Jan 2023 09:27:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8A5D719465B8 for ; Fri, 27 Jan 2023 09:27:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7E6F414171C0; Fri, 27 Jan 2023 09:27:00 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-168.brq.redhat.com [10.40.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id F16BC14171BE; Fri, 27 Jan 2023 09:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674811632; 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=raH4YuIRThssQ5BdU818Y9myk6O28DR/HBCFSzJvN44=; b=ausN6qhdOV4d3fOuWttLF5XsHTdHqKj+bGFJ12jMMUjtPI7NyXItMn1OYITTV4P5dUkBx5 EziNWk3LWcHUPxeXy1HHw7LygtZLcsgDvkCYmz9KZSKolop8ky/UE5t6Fl/rbFxN5Nm70W LVjb18Ql66y+wGXTMfCcuAy48m0YV3I= X-MC-Unique: tLAFhD2SOB2GWRt07i_dNg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 3/8] ci: integration: Extract several hidden job definitions to a script Date: Fri, 27 Jan 2023 10:26:51 +0100 Message-Id: <8ac0b41478c9977b9a6ac07ac6496b0054859dfa.1674811615.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.3 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: 1674811633784100002 Content-Type: text/plain; charset="utf-8"; x-default="true" This will allow us to re-use the script in other scenarios like local executions where up until now one had to copy-paste the recipe line-by-line. Signed-off-by: Erik Skultety --- ci/integration-template.yml | 36 +----------------------------------- ci/integration.sh | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 35 deletions(-) create mode 100644 ci/integration.sh diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 15c36d7a29..802cba9420 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -27,34 +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=3D=3D98.0 - - -.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 || - test "$ID" =3D "fedora" && test "$VERSION_ID" -lt 35; - 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 @@ -79,14 +51,8 @@ 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 + - chmod +x ci/integration.sh && ci/integration.sh after_script: - test "$CI_JOB_STATUS" =3D "success" && exit 0; - *collect-logs diff --git a/ci/integration.sh b/ci/integration.sh new file mode 100644 index 0000000000..21795518c3 --- /dev/null +++ b/ci/integration.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +# Avocado >98.0 fails with the nwfilter TCK tests, so stick with 98.0 for = now +sudo pip3 install --prefix=3D/usr avocado-framework=3D=3D98.0 + +sudo sh -c "echo DefaultLimitCORE=3Dinfinity >> /etc/systemd/system.conf" = # Explicitly allow storing cores globally +sudo systemctl daemon-reexec # need to reexec systemd after changing config + +source /etc/os-release # in order to query the vendor-provided variables +if test "$ID" =3D "centos" && test "$VERSION_ID" -lt 9 || + test "$ID" =3D "fedora" && test "$VERSION_ID" -lt 35 +then + DAEMONS=3D"libvirtd virtlockd virtlogd" +else + DAEMONS=3D"virtinterfaced virtlockd virtlogd virtnetworkd virtnodedevd= 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.dbus = 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_DIR"/= avocado --=20 2.39.1 From nobody Sun May 19 04:35:07 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=1674811636; cv=none; d=zohomail.com; s=zohoarc; b=kMn2PczZy6ZgawFGP+8BPWI/GQT/nSIC6ZWH9kMb7iYRSPeXHtwsvxsiy5peyAEtzamVfGkyjseFzEB91l3/eh6nciJ7nTBm2Y4vwKyiHofB0xozobbujwJ/zz2JQS4cZ8o0G3mkbE+2c51pNNuYfBBYFwrfDQhHg2AzJoB1j4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674811636; 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=9HqS3+Gu+LuNcRV1WjV3Png0ir4IxPR8H6ooPfGXtHU=; b=nTOX3nrF8fVm/oc4DddtZDPMAMrnfAHrUA8lwTPk65wfOQfgqLzQPfYdViCPttc6phoA/NYv/GvomPbeVwYvmy5kmka4UVV8ccdg3lKse1xygz2r4r9MMLC0E5Aw0smg+TQ+7JulMxXrvoLltR3jJEbxTobiRJGXhGMu0ZZ7iOI= 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 167481163686064.66898387104106; Fri, 27 Jan 2023 01:27:16 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-306-WAA_kyKPPyujXWmoGxdpTg-1; Fri, 27 Jan 2023 04:27:13 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BABD73C22744; Fri, 27 Jan 2023 09:27:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5C482166B26; Fri, 27 Jan 2023 09:27:11 +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 30C831946A6F; Fri, 27 Jan 2023 09:27:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6888519465B8 for ; Fri, 27 Jan 2023 09:27:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4A5D21400AFC; Fri, 27 Jan 2023 09:27:01 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-168.brq.redhat.com [10.40.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDACE14171BE; Fri, 27 Jan 2023 09:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674811635; 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=9HqS3+Gu+LuNcRV1WjV3Png0ir4IxPR8H6ooPfGXtHU=; b=TG7QUiTa8ScgRHuSJR9L2elK23zPJhy3trkYoSw6Pcmmr2ROyRl7Eevej/LXV/XGoSYnyW wAM7YwXsmU9vYPTPas8kn0UlKyOfssrlbo8/qqAo6wOfAwrgGU9G396Jo0a/TVKeY7Z7Cq RbFu9o8RWIUWv73ChE9Tq6KjXFbr5JI= X-MC-Unique: WAA_kyKPPyujXWmoGxdpTg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 4/8] ci: integration: Drop the 'install-deps' hidden job and reference Date: Fri, 27 Jan 2023 10:26:52 +0100 Message-Id: <3f4551e9a71dd0373845dad1302bc9a39e60e790.1674811615.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1674811637777100007 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 --- 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 802cba9420..1425510d4f 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: - chmod +x ci/integration.sh && ci/integration.sh after_script: --=20 2.39.1 From nobody Sun May 19 04:35:07 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=1674811645; cv=none; d=zohomail.com; s=zohoarc; b=O56C6/iPJBbCKZi4nQ5eLzo6NxRe/UDjuefe49zxHbnygAeQa4Sgk8+yf9iy6Bsr2p36cziUCETN4YmahM2Qg2oF4zjk1XIZIlNPaVMblKNEPQ3N8y1aX62Lt30s+yxxN90PVaVaPMn5Tx7NEgMbw6/1HPbwmi/aKoepxHrQHKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674811645; 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=82kybFqXni4CZd1rNAZ0OWeLRNQV4RAzIKBxvPdlLf8=; b=k+MYM9YgM6FvCCb5UfH7HNZSZ2P1jaWqEWrHjGQ37dKAgI+bvK22bqIeXghPO6C80YfTMLMcjOu7424zilg9OX9XYM2Od1mFFkKYg1nvFEsQ62otxspA/3qRuBPIAOxLXwZHwXcPSlek2Xik8e/5Y3izhKNlo5gLmredMexkmSU= 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 1674811645028273.4315610600016; Fri, 27 Jan 2023 01:27:25 -0800 (PST) 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-221-a_lF1XsbPTKXxN3INpGchw-1; Fri, 27 Jan 2023 04:27:20 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 49D91100F90A; Fri, 27 Jan 2023 09:27:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36F992026D76; Fri, 27 Jan 2023 09:27:17 +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 689B31946A7C; Fri, 27 Jan 2023 09:27:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2272F19465B8 for ; Fri, 27 Jan 2023 09:27:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 172C714171C1; Fri, 27 Jan 2023 09:27:02 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-168.brq.redhat.com [10.40.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8993714171BE; Fri, 27 Jan 2023 09:27:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674811643; 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=82kybFqXni4CZd1rNAZ0OWeLRNQV4RAzIKBxvPdlLf8=; b=S9AhyPy5f/OQk9hxSu6Hs8CEyIU5kFa6O7KOSmBecFWRTpziRUjlx1IqUL4EAvX+/6BPHs vDlJZJpuXpg2l/aYRoLWD7Y+Or7zkl2jJrIV4eWZXpVwwtOcrzy+nYUmiZfjw2qReW+MF/ hstHvLI7KOXzGg6bEFbHdoc0PuFkUqo= X-MC-Unique: a_lF1XsbPTKXxN3INpGchw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 5/8] ci: integration-template: Drop the '-lt Fedora 35' check Date: Fri, 27 Jan 2023 10:26:53 +0100 Message-Id: <7c905227533f7aedd19e3f0149efcf8cceff46f8.1674811615.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674811645825100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We no longer support Fedora 35 or older. While at it, we can also tailor the rest of the check to CentOS Stream 8 only since all other supported Red Hat like platforms have moved onto modular daemons setup already. Signed-off-by: Erik Skultety --- ci/integration.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/integration.sh b/ci/integration.sh index 21795518c3..160aecf00d 100644 --- a/ci/integration.sh +++ b/ci/integration.sh @@ -7,8 +7,7 @@ sudo sh -c "echo DefaultLimitCORE=3Dinfinity >> /etc/system= d/system.conf" # Explic sudo systemctl daemon-reexec # need to reexec systemd after changing config =20 source /etc/os-release # in order to query the vendor-provided variables -if test "$ID" =3D "centos" && test "$VERSION_ID" -lt 9 || - test "$ID" =3D "fedora" && test "$VERSION_ID" -lt 35 +if test "$ID" =3D "centos" && test "$VERSION_ID" -eq 8 then DAEMONS=3D"libvirtd virtlockd virtlogd" else --=20 2.39.1 From nobody Sun May 19 04:35:07 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=1674811641; cv=none; d=zohomail.com; s=zohoarc; b=JVAsv4mRRQm6+8LY5YP1VaI4SuOJCAD7lL5YS0mKQ9+Oruw7B9NO0Nxnixlgb6HBcBXRYw1rUfnG0ORb8aqKe2IdRAUduT3SwRiYbW5tZ8IcE+gy0u59yF679R4GQmiYC8DOU2lAiQ7QOhzLlUO9CleSS5PkFse3QXVlpqNs9YU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674811641; 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=RWs5T2MrrRY6W+OS7Yp18fRBs/HKQQpzVDohCrPXXyQ=; b=EZI0MD4tVBDgHXy0MUssGsVzLhx9RVgQ/Nge3u6K45HG4ntU5/XmM4OgcuuKKjIxN36vJuKfrU7B7G4J/LD2OnR5C55JBkJI8B9NU4MIpwHjYlDT2iXh54WxA9CvRDl0w5hLe6tBm4pXU0tv3139Z3GXrFHWL9g/Qv+ytnUi5VY= 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 1674811641093856.5304156637291; Fri, 27 Jan 2023 01:27:21 -0800 (PST) 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-403-nOj_qYPkP7uCxx6zwIKr2Q-1; Fri, 27 Jan 2023 04:27:16 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EAD2B830F85; Fri, 27 Jan 2023 09:27:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3DD31121318; Fri, 27 Jan 2023 09:27: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 9D2B419451EC; Fri, 27 Jan 2023 09:27:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E21B819465B8 for ; Fri, 27 Jan 2023 09:27:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D748D1400AFC; Fri, 27 Jan 2023 09:27:02 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-168.brq.redhat.com [10.40.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 563FF14171BE; Fri, 27 Jan 2023 09:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674811640; 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=RWs5T2MrrRY6W+OS7Yp18fRBs/HKQQpzVDohCrPXXyQ=; b=gvvGWmFBNLWkMICovamBascbUEs1bsuHwjMahfT0pw1IxTcBVCeWmQzGdn5m1x3Mm+3VeS aoxs2iNb8NokNAlS06HzY5g62WjwlrgmENwkShxf+XOkGWO3s+NlOQiWY9tZ/LZe8g8trL OLqXO6WJLO/mt98V5LP5SFHyb5wGUCY= X-MC-Unique: nOj_qYPkP7uCxx6zwIKr2Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 6/8] ci: integration.sh: Add/Rewrite/Reformat commentaries Date: Fri, 27 Jan 2023 10:26:54 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.3 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: 1674811641810100002 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 --- ci/integration.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ci/integration.sh b/ci/integration.sh index 160aecf00d..cbf2b0f1b4 100644 --- a/ci/integration.sh +++ b/ci/integration.sh @@ -3,10 +3,15 @@ # Avocado >98.0 fails with the nwfilter TCK tests, so stick with 98.0 for = now sudo pip3 install --prefix=3D/usr avocado-framework=3D=3D98.0 =20 -sudo sh -c "echo DefaultLimitCORE=3Dinfinity >> /etc/systemd/system.conf" = # Explicitly allow storing cores globally -sudo systemctl daemon-reexec # need to reexec systemd after changing config +# Explicitly allow storing cores globally +sudo sh -c "echo DefaultLimitCORE=3Dinfinity >> /etc/systemd/system.conf" + +# 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 =20 -source /etc/os-release # in order to query the vendor-provided variables if test "$ID" =3D "centos" && test "$VERSION_ID" -eq 8 then DAEMONS=3D"libvirtd virtlockd virtlogd" @@ -23,6 +28,7 @@ do sudo systemctl restart ${daemon}.socket done =20 +# Make sure the default network is started on all platforms sudo virsh net-start default &>/dev/null || true =20 cd "$SCRATCH_DIR" --=20 2.39.1 From nobody Sun May 19 04:35:07 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=1674811648; cv=none; d=zohomail.com; s=zohoarc; b=a9buA3rXlkgBeu2Xb+cWLD90AiRUEgBJn/ZGelG4oAyCQNybAYc5rH73kHwjzXXUtKPpwGB0Tda4/GaHS3mAptvKoPVTXgd0l6fkiSAVBaPxn0CW6jc/A2lM7kJZVLcMxD4wxZ63sDNMgJVyzIKB2TFYLnV/tHJq2T7E//0ICpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674811648; 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=jmC+klJ1QRdA2BS7QccatIi8Lq7xRcz1tJtavpLD4Bs=; b=NmQitOZZ292Jf3DiwK97Pz9dE/fo6u1BSXAa0KiKk3/rO5o0NIAt9AgBFgQIBhEfnx8nja2KglXoPeNaxgVpgcP/s2rDbaa175GrLP0c9BIpx2SlqCRuicgzcP7j++cTrio6GUFmicuLmmZqs7K3HZJNNnUvjhbgZ0t4ZziPrXg= 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 1674811648023394.5342205261602; Fri, 27 Jan 2023 01:27:28 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-133-MXjeepbcNYKtrTMbQC5Jzg-1; Fri, 27 Jan 2023 04:27:21 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C652F1C075BA; Fri, 27 Jan 2023 09:27:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B376840C200D; Fri, 27 Jan 2023 09:27:17 +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 3A9591949748; Fri, 27 Jan 2023 09:27:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AE52619465B8 for ; Fri, 27 Jan 2023 09:27:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A359714171C1; Fri, 27 Jan 2023 09:27:03 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-168.brq.redhat.com [10.40.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21B8E14171BE; Fri, 27 Jan 2023 09:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674811647; 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=jmC+klJ1QRdA2BS7QccatIi8Lq7xRcz1tJtavpLD4Bs=; b=JmOFO8dWTeXDLErl6pAwGPjg2WJLZrKLV71Xj9pNRxGO1bp0nLwV3dOJqlKqWdm9CA5gSC oAUlBKkTx6vgcNZN3BF59qc3dgBeSpd/0eilKcck21T4bltz+ppK8zP+V4k8C4L+uVFFXW OWDNjktEeQeNSlWL1g+tMRXkUHQ8Oyk= X-MC-Unique: MXjeepbcNYKtrTMbQC5Jzg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 7/8] ci: integration.sh: Replace 'test' with '[' operator Date: Fri, 27 Jan 2023 10:26:55 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1674811650031100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Since we now have a standalone script instead of inlined shell commands in a YAML, we can adopt the common syntax for if-then-else clauses which involve the '[' test command alias rather than keep using 'test' explicitly. Signed-off-by: Erik Skultety --- ci/integration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/integration.sh b/ci/integration.sh index cbf2b0f1b4..7bf3623809 100644 --- a/ci/integration.sh +++ b/ci/integration.sh @@ -12,7 +12,7 @@ sudo systemctl daemon-reexec # Source the os-release file to query the vendor-provided variables source /etc/os-release =20 -if test "$ID" =3D "centos" && test "$VERSION_ID" -eq 8 +if [ "$ID" =3D "centos" -a "$VERSION_ID" -eq 8 ] then DAEMONS=3D"libvirtd virtlockd virtlogd" else --=20 2.39.1 From nobody Sun May 19 04:35:07 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=1674811644; cv=none; d=zohomail.com; s=zohoarc; b=WzEugl9lzgqPEuBV0n0lKa7jyS9PkLzbDriKZxd3wKZn5EldcnamN5HNZp3+L8s/4x7sZAuslojaH4phz64WfwskRtkj8JfkMinA9hhSAcpUuObSLTQMcA5ST1jpEewybBPofFLwb6ooLypE84Gw/jbnlcNZ966HofUqEOWQGf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674811644; 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=zngLdocQ7iy9ybU8oyHlyyrLD0sZMHPu8gB7Csr2R+U=; b=R3hl+4skQP/ywxgwn/w6LShq897/W5zzBB1+3lm9dHF59iyKenl6K8Z+H/6FfJWgOb1X1De9BPihJLmtLN3km5yIXhBgk4mJnD97yJ89qcgLEkLL4jJU+Kn/JxyzF6BJjjFtkdF2/ZfxEE9mwq7d+fboS03ksrBrs7uid+MxNIA= 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 1674811644459610.4008639653728; Fri, 27 Jan 2023 01:27:24 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-13-hW3MrHYSMxSCoz1VtAFTXA-1; Fri, 27 Jan 2023 04:27:20 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 58D7D38041DE; Fri, 27 Jan 2023 09:27:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 454792026D4B; Fri, 27 Jan 2023 09:27:16 +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 063EE194973B; Fri, 27 Jan 2023 09:27:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8992C19465BC for ; Fri, 27 Jan 2023 09:27:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6E62414171C0; Fri, 27 Jan 2023 09:27:04 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-168.brq.redhat.com [10.40.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id E188A14171BE; Fri, 27 Jan 2023 09:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674811643; 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=zngLdocQ7iy9ybU8oyHlyyrLD0sZMHPu8gB7Csr2R+U=; b=KO9gPKSmvaf6Gcc8/3SmGKPdl+89vYGkovmD/VU3eSsgs+ZqfM2XH8vIiYnnWUFSQNtI56 Bt3xikzB9JKvXhkh1rdWn3FovQiNjRvqqUqEWASrkblBJNaeIS7OTQr7xPevyuSuBMqP6t ecWbda5v7jHp/izQwfiy0M1DpjKgVZQ= X-MC-Unique: hW3MrHYSMxSCoz1VtAFTXA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 8/8] ci: integration.sh: Define the SCRATCH_DIR variable for local execution Date: Fri, 27 Jan 2023 10:26:56 +0100 Message-Id: <59f2ef2cdb50fb5ec273cc2ba2270b3658bc0116.1674811615.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674811645825100002 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. Signed-off-by: Erik Skultety --- ci/integration.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/integration.sh b/ci/integration.sh index 7bf3623809..e1f461a441 100644 --- a/ci/integration.sh +++ b/ci/integration.sh @@ -31,6 +31,15 @@ done # Make sure the default network is started on all platforms sudo virsh net-start default &>/dev/null || true =20 +# If we're running outside of GitLab, this variable will likely not exist,= so +# we need to define it and create the scratch directory +if [ -z "$SCRATCH_DIR" ] +then + SCRATCH_DIR=3D"/var/tmp/scratch" + mkdir "$SCRATCH_DIR" 2>/dev/null +fi + +rm -rf "$SCRATCH_DIR/*" cd "$SCRATCH_DIR" git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git cd libvirt-tck --=20 2.39.1