From nobody Sun May 19 00:17:24 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=1674227182; cv=none; d=zohomail.com; s=zohoarc; b=bvKA0B1jPijMCAj9qvGpZXlWCjJrrdqGrdv31nSFzEW1E9WPwf7n2xRDtKFlg7O9xpzE+v8okYK3X5XuYffM/48HdL8eDU1iV9X85Hsy+qRtkZyrdtsUvO+UqBV54tIC0sYuhdaRQYKI5gwd1+SU5GAqtJfpv0g96i482QXX6yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674227182; 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=Q70cV/6Fqfox0UimhCnmC8aZt2ZwCm/Xhxa298KRJhk=; b=iyRg4M/FdkatjPRsqgFx1myd6GWVcAQHzBboBpiW9Xw7Th8Yt7K7o4DDrHmA+goXT2W9BKdhGVaFTpujcGcimVvS6BFVkHCJ3vS7NvWFw6y9zKF5yMPaDb3o9ubbZQGGrM3VapVvr4f/xwZnHK6nh++94RDc7X352fkRJ+3k1T4= 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 1674227182599805.6173707225668; Fri, 20 Jan 2023 07:06:22 -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-148-wr64UdXPMO-k9OgzPZSF7Q-1; Fri, 20 Jan 2023 10:06:19 -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 21DEE3815F0C; Fri, 20 Jan 2023 15:06: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 014321121315; Fri, 20 Jan 2023 15:06: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 26B8D1946A7E; Fri, 20 Jan 2023 15:06:07 +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 8BCFC1946588 for ; Fri, 20 Jan 2023 15:06:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6DFD92166B2B; Fri, 20 Jan 2023 15:06:05 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-170.brq.redhat.com [10.40.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id D82B02166B2A; Fri, 20 Jan 2023 15:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674227180; 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=Q70cV/6Fqfox0UimhCnmC8aZt2ZwCm/Xhxa298KRJhk=; b=az/qIU0UQNTIUwvBboZpzvQjqo2Lo3FZnu9ail4eHBVN6NPl+XzuwFMh6lnsMecDLWU83G cytZYNyuM8yS4iQ8DNVAT7s9OfoEo+p0mXPll4/n4TGA6J0cO3lLE3vS2yJlJl1NXSK2Op bFaILzTbVKZ0tLbe4lCRq2u6mD09oBE= X-MC-Unique: wr64UdXPMO-k9OgzPZSF7Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 1/7] ci: integration: Extract several hidden job definitions to a script Date: Fri, 20 Jan 2023 16:05:57 +0100 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.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: 1674227184531100004 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 9141d5cedf..f9903cdbb4 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.0 From nobody Sun May 19 00:17:24 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=1674227178; cv=none; d=zohomail.com; s=zohoarc; b=ZnuOw8iMGmJ1vD/mUSPYkdNkqTxFmjDx/3AYMuqV9pY3iOae1qdHw7ZzeUk2W1z0RYE5TfUl7qtqEzYDfPcSrULMUhYOcU685hP6Z3w4W7bDX8Ba0qn0mA5BUg3bh9J/embYNDNhlpW6Qwy3BxcarADRZ26Im6QR+hIfeWZP5qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674227178; 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=dHjZFovxv7dM8YQsUh7w9xwC7X3gO7hfW+T+DSwsxVo=; b=Khrkg/mW7Rau1ACYI8jP/lfMNHB4awitT+yAp8JvR5yWwnBKREeBcYLvzRp60CKuPix9znDgqyluWs5E9g4s5ZNEm1EUqUo8pGwl/uc8EdR1WpgT6y2E6Y/pJnS6YZGkS1yN5BXc9eP+4MG2A0QjR0yQfR6m8urTcWzNdkMf5RQ= 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 1674227178035108.98887854899692; Fri, 20 Jan 2023 07:06:18 -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-647-vazauHahPCyT-0DUAoyeiA-1; Fri, 20 Jan 2023 10:06:13 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 61EB41C270AC; Fri, 20 Jan 2023 15:06:09 +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 4D6C24014EBE; Fri, 20 Jan 2023 15:06:09 +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 688641946A7A; Fri, 20 Jan 2023 15:06:08 +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 45D161946A7E for ; Fri, 20 Jan 2023 15:06:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 393D62166B2B; Fri, 20 Jan 2023 15:06:06 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-170.brq.redhat.com [10.40.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC23D2166B2A; Fri, 20 Jan 2023 15:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674227176; 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=dHjZFovxv7dM8YQsUh7w9xwC7X3gO7hfW+T+DSwsxVo=; b=c3YfpWvJn+PQ9gjCv6jHbiIGcRvcUoMkWEAZ2t9tSBgRSdyUJUSFuvK7Xl8oYhiY8j3aZ6 IQbmuES6dwXpkdBLlvUjSfGn4o7gt2n+onjRcqg5DggPpQnlBMtZmrgscFADEIySTo7Dtx C5H6znbC+oAMZsCT2GjJV7+cSbTyyHM= X-MC-Unique: vazauHahPCyT-0DUAoyeiA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 2/7] ci: integration: Drop the 'install-deps' hidden job and reference Date: Fri, 20 Jan 2023 16:05:58 +0100 Message-Id: <6c47fcc9055e4547dc1293a53d0ed8c06facf85e.1674223377.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.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674227178494100002 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 f9903cdbb4..a5d0fee3d9 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.0 From nobody Sun May 19 00:17:24 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=1674227177; cv=none; d=zohomail.com; s=zohoarc; b=QTnHdijlovIFhx+Fr7oZOQE6eqff0/Z2F1KVYnrILLLpVM2LQAsQ+Y/QAcUxMEKpI+SOwIQ0xvdXpDOu4juw9fbB29M2scjZ3+1Db5sIswvVgnYFdAA81Mc1upKGB36Fb9D0pVmz28XBv+oCef2qN6t0p2oRRdbRDapQnDlH7V0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674227177; 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=oZpIL7YaXdapWG8624XjbIlwM2GE11QccEd2XuT/tr0=; b=cn8UQP9PhezQhqzn+6vVlT5Gq6GQNQwGSXAHEWBPbRhAni+oEVf4Li01dW4l9fEnwDC221H/5S5vQA/xlkJv3iFIYciXLZpbGP42D8oRhBtMKHVMQNY2xv4YnPa6jGzqaaRHXWyBU/VjTGhOLaN1KShZ32s5D2x93coVYQE64wE= 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 1674227177814156.1843429644366; Fri, 20 Jan 2023 07:06:17 -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-358-jLNEYGjfN9eFtG7P5iNYsA-1; Fri, 20 Jan 2023 10:06:11 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B82480A0C3; Fri, 20 Jan 2023 15:06:09 +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 27F66C15BAD; Fri, 20 Jan 2023 15:06:09 +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 613F91946A76; Fri, 20 Jan 2023 15:06:08 +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 207D21946588 for ; Fri, 20 Jan 2023 15:06:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 05A0A2166B2B; Fri, 20 Jan 2023 15:06:07 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-170.brq.redhat.com [10.40.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77FBB2166B2A; Fri, 20 Jan 2023 15:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674227176; 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=oZpIL7YaXdapWG8624XjbIlwM2GE11QccEd2XuT/tr0=; b=JY0yzCptcGcCV07/rdpUf0gT6lpN7aNxiqLnIqnWiAF9IcisE20c7g5q6tJ0YeOa5iD5XW u3FkU7sDqhvTz3t9iNnDmD9eeEKT1LbhJ91kKK0QbYXwkO2BUO+zT6U6TRT9o5KikvKcjm FOTZC5dltWd8mPF1luUQFB2nfAlfkOE= X-MC-Unique: jLNEYGjfN9eFtG7P5iNYsA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 3/7] ci: integration-template: Drop Fedora 35 check Date: Fri, 20 Jan 2023 16:05:59 +0100 Message-Id: <17681468b37cd01c1b580b9b07018aea0e213448.1674223377.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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674227178479100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We no longer support Fedora 35. While at it, we can also tailor the rest of the check to CentOS Stream 8 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.0 From nobody Sun May 19 00:17:24 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=1674227236; cv=none; d=zohomail.com; s=zohoarc; b=J2hTPFpuaZu3qOEgHXi+Va8I28wrpJNsYTICIiOz+n3mVQ9u0V3UQ0S+Ln52gbYPGPVMvs0p7NCp02PNxzNVzr/OUpntv/YxUFLA+xPFA+ESDECCVVaaN1xV8MAREZ3ZIVlo6FK6061AlxkT7cx9UGT4krzKx5cwTO9zRpwAFwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674227236; 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=GoBRxXUBP6uxS3nGn0Vj2J2Npy17xEjNg2ybj4y+XsY=; b=Ku1jYm8c1QB5cqj6erNjlxRK9ECbfV5zqkUJBIw2fYnaxk4OUNDkdRVRSXod0taAXbj8uKJeb+aF403y/e9/8kJFTxfaIA+TtlK01uf3pKDgoFF77/4asegDCOyshET8Uyyp6FiY3lUJVZIvcPblvEFDgIvCJyxU833A33yAliE= 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 1674227236037329.56397736446024; Fri, 20 Jan 2023 07:07:16 -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-297-M6L0yPMGNHafSSJE5KOFZg-1; Fri, 20 Jan 2023 10:06:22 -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 908B588B7A0; Fri, 20 Jan 2023 15:06:18 +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 7D1A72026D2A; Fri, 20 Jan 2023 15:06: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 E1FC21946A6D; Fri, 20 Jan 2023 15:06:11 +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 D49111946A76 for ; Fri, 20 Jan 2023 15:06:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C7FA12166B2C; Fri, 20 Jan 2023 15:06:07 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-170.brq.redhat.com [10.40.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44E982166B2A; Fri, 20 Jan 2023 15:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674227235; 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=GoBRxXUBP6uxS3nGn0Vj2J2Npy17xEjNg2ybj4y+XsY=; b=Ivos1Hc0MCJ33rbyrryUdDDly7zHWZ2pji21bRZdK2fzcGNfm/J8+tWgqrHd0Wp6UjYEMs 4Ade0KMOVGqo5HzDZ/6elc1wEBscbWrIZggcwiabQJv1QAh4+R5ZSchLEV45p0OJ8ZPgXn dDoucxgSDEHlGHddA4rHEyN7MAAbxA4= X-MC-Unique: M6L0yPMGNHafSSJE5KOFZg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 4/7] ci: integration.sh: Replace most 'sudo' usage with running as root Date: Fri, 20 Jan 2023 16:06:00 +0100 Message-Id: <81e1b44904a3a9c4af060b161a9919bce2e7709f.1674223377.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.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: 1674227236797100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This is a purely cosmetic change dropping the majority of 'sudo' invocations which we need to do to make final preparations on the test environment. This patch visually divides the part where we need to run as root from the rest of the operations. Signed-off-by: Erik Skultety --- ci/integration.sh | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/ci/integration.sh b/ci/integration.sh index 160aecf00d..5cee536442 100644 --- a/ci/integration.sh +++ b/ci/integration.sh @@ -1,10 +1,13 @@ #!/bin/sh =20 +# BEGIN AS ROOT +sudo su - + # 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 +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 +echo "DefaultLimitCORE=3Dinfinity" >> /etc/systemd/system.conf # Explicitl= y allow storing cores globally +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" -eq 8 @@ -17,13 +20,16 @@ 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 + augtool set /files/etc/libvirt/${daemon}.conf/log_filters "'$LOG_FILTE= RS'" &>/dev/null + augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$LOG_OUTPU= TS'" &>/dev/null + systemctl --quiet stop ${daemon}.service + systemctl restart ${daemon}.socket done =20 -sudo virsh net-start default &>/dev/null || true +virsh net-start default &>/dev/null || true + +# END AS ROOT +exit =20 cd "$SCRATCH_DIR" git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git --=20 2.39.0 From nobody Sun May 19 00:17:24 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=1674227183; cv=none; d=zohomail.com; s=zohoarc; b=QqJSFvmBBbN8Nqhhe1u88G561E8UiJpFpfsTGAaByHSxG4+vEwzHI14ANuEhn8XtD7ixz9vpKNfIOMZpO0OGwMUpBkx/WLTRIwruSzFI3GohdLfy1LDzjBjONhaAQyyFhiiGxAFsjiOP6kmL0QMJ/0PuPjxCytXKUyHZXT2yTt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674227183; 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=NJYnH73MzdeQaF8LcTOTbo3D0z5w7oX0bL1a0HLm97A=; b=XwH+Cr3OoCYUCEZuRYCkx7SmQFXRf9kVyCTErWqSUvpXlSLPiDva/cARADiekxQvll6BfjWhXwa9fs+ZDcClyG0/mSV0f80cHH5QWiVFmSg9DZ82UBf/Q7RB/qU73YFenj4lAOwgAy+IXuY1UMQWnXtva2k8Wj6wcQRWZ+0ZbM8= 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 1674227183473956.4416681668268; Fri, 20 Jan 2023 07:06:23 -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-608-VFYnMQBEMdKN-uejslMV6A-1; Fri, 20 Jan 2023 10:06:17 -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 E456F3815F06; Fri, 20 Jan 2023 15:06: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 CE52F1121318; Fri, 20 Jan 2023 15:06: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 9E7F219465B6; Fri, 20 Jan 2023 15:06:09 +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 AEB1119465B6 for ; Fri, 20 Jan 2023 15:06:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 939132166B2C; Fri, 20 Jan 2023 15:06:08 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-170.brq.redhat.com [10.40.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id 119CC2166B2A; Fri, 20 Jan 2023 15:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674227182; 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=NJYnH73MzdeQaF8LcTOTbo3D0z5w7oX0bL1a0HLm97A=; b=JdZV8y27Rna+sFxw5NPtMD5XGotlwBrEEIQ0B6UbZEIouH2COEcVwPq4mXKpQHSk1iaf4m aGmJ9CiFq2X8pOWj/OAk6poDtHloGg42Fl3hvvPJmSd6GNjSLPauXTsu5N8zvJ0YwP9izi y2+2678v4/dwS8ss/VX8zfmeLv3ssDI= X-MC-Unique: VFYnMQBEMdKN-uejslMV6A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 5/7] ci: integration.sh: Add/Rewrite/Reformat commentaries Date: Fri, 20 Jan 2023 16:06:01 +0100 Message-Id: <15b396ff14dfe966ace98e1ca3c2fb96b1439484.1674223377.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.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: 1674227184526100003 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 5cee536442..cbd55d4253 100644 --- a/ci/integration.sh +++ b/ci/integration.sh @@ -6,10 +6,15 @@ sudo su - # Avocado >98.0 fails with the nwfilter TCK tests, so stick with 98.0 for = now pip3 install --prefix=3D/usr avocado-framework=3D=3D98.0 =20 -echo "DefaultLimitCORE=3Dinfinity" >> /etc/systemd/system.conf # Explicitl= y allow storing cores globally -systemctl daemon-reexec # need to reexec systemd after changing config +# Explicitly allow storing cores globally +echo "DefaultLimitCORE=3Dinfinity" >> /etc/systemd/system.conf + +# Need to reexec systemd after changing config +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" @@ -26,6 +31,7 @@ do systemctl restart ${daemon}.socket done =20 +# Make sure the default network is started on all platforms virsh net-start default &>/dev/null || true =20 # END AS ROOT --=20 2.39.0 From nobody Sun May 19 00:17:24 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=1674227181; cv=none; d=zohomail.com; s=zohoarc; b=RhnzU6pO0a2Hi+3B1tvIRrROrg0phKzOFoQk4pE1I4csftITtXS8aAxC93+Oujy1XkG1Or53N2hWNijwWBRlJZYL48nBjcwqiczw5qFmLCC3fNh0Mae9sn3tW5uQWg6mkj38R/AlTF0MmdM7WwM3DYRpGV9DdmNhjsSCltMPLzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674227181; 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=cW+im6QFzI7jxFXEIAc9wjSOeRBohMLPrtTS1bjF1rM=; b=GgpVLRxckW132ymK325Fux0BiUr3PWZUDgmYOjI6lAJEojt9OJBEIoWyc7+Da50k9xCxarLXDT5flFhHEgpWCsaJ0Ts6hHAEAvqe6rgNeqDj9T8VXHR+GKIn4yuxRmrPXQn2Zg/r+WKe8o711JZX8U5ItXdz1rHRi7M5kz1FzWQ= 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 1674227181559124.83511595758523; Fri, 20 Jan 2023 07:06: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-269-BhQhoVwoOLOuLSd1JfWacQ-1; Fri, 20 Jan 2023 10:06:18 -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 0B5FF857AA1; Fri, 20 Jan 2023 15:06:12 +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 ED1751121319; Fri, 20 Jan 2023 15:06: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 A541F1946A7A; Fri, 20 Jan 2023 15:06:09 +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 6E49B1946588 for ; Fri, 20 Jan 2023 15:06:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5EE312166B2C; Fri, 20 Jan 2023 15:06:09 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-170.brq.redhat.com [10.40.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id D19C62166B2A; Fri, 20 Jan 2023 15:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674227180; 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=cW+im6QFzI7jxFXEIAc9wjSOeRBohMLPrtTS1bjF1rM=; b=bCysnZcIpBgFBrCfTzqe1vGdkKVZbGHV7Q7/UR+ELDT7qZPxeW3Rvb9dGLSXNnWHceJ3DV g7sQvvcxejI4AG+yKLmhX8oo9+9enV5U3A3XRzG1OvZthdtd/z6m0s9SlE+kCrD9ul0hu1 CPWtUpsw1FDV/hhWA/xm0oPamKDQrcM= X-MC-Unique: BhQhoVwoOLOuLSd1JfWacQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 6/7] ci: integration.sh: Replace 'test' with '[' operator Date: Fri, 20 Jan 2023 16:06:02 +0100 Message-Id: <0ce57f71d0a28fa313603ef1d55f781a17af85cb.1674223377.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.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: 1674227182502100001 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 cbd55d4253..41326d6e40 100644 --- a/ci/integration.sh +++ b/ci/integration.sh @@ -15,7 +15,7 @@ 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" ] && [ "$VERSION_ID" -eq 8 ] then DAEMONS=3D"libvirtd virtlockd virtlogd" else --=20 2.39.0 From nobody Sun May 19 00:17:24 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=1674227225; cv=none; d=zohomail.com; s=zohoarc; b=Fo5Fn3ZJ+RSxLQJUzERkl6816Xwuca0ttw2VUWlDOSR8E52jNzMX+rIvZWxvYsVIafhzmprjk4twmV0YUAIj2ePp44vI0XcYRWgB/OH+EsWLlM0MD/xKBiFtLdRtbExlm/OftG6uwdDqOX6peBj5jsKn55AKUcDTfYcfPt3Qai0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674227225; 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=FWOYY4FqkLzjvOsWttHsnoCSE58sHCS5ZYAZW1vthMc=; b=CN209OcGvJYTILvvyt7TxXCHHWYH6kVEw4Mi4qkc6HdYrlJw973Nh6Wunzu5oK3EsVIoBcFRyF8tHpA5BwsFCh3LPiGSE2H3fBmJfTCPP0IY1LPMVW3fEBqkwkvAAISWPl6StyswAt+l4rADyVeOXDbRVJw6e3LrR9xIA1nQ6tQ= 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 1674227225877746.4898669276898; Fri, 20 Jan 2023 07:07:05 -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-333-gyrABlUpMgSQKbhX7scOWw-1; Fri, 20 Jan 2023 10:06:19 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E5653815F90; Fri, 20 Jan 2023 15:06:14 +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 4C409C15BAD; Fri, 20 Jan 2023 15:06:14 +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 2231B194704E; Fri, 20 Jan 2023 15:06:12 +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 6037A1946A7B for ; Fri, 20 Jan 2023 15:06:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 43BB82166B2C; Fri, 20 Jan 2023 15:06:10 +0000 (UTC) Received: from ridgehead.home.lan (ovpn-193-170.brq.redhat.com [10.40.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id A72BC2166B2B; Fri, 20 Jan 2023 15:06:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674227224; 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=FWOYY4FqkLzjvOsWttHsnoCSE58sHCS5ZYAZW1vthMc=; b=Ze1oAjcUSkgUc++XpkOJgdVNu+ARZA8oBZWwimAR7g+DnGlx4Mzkflep5Kc/jhTiqQ+Htu Z3oux3lJWy+vqSyrMse/+4NDvL3+BbPxVN9O3HIqFQzRfXbAO8tSN/goow/uN9SUgmN/Zn 8zdXOKQyikX6mvb1RhSkDUGp54vN5z8= X-MC-Unique: gyrABlUpMgSQKbhX7scOWw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 7/7] ci: integration.sh: Define the SCRATCH_DIR variable for local execution Date: Fri, 20 Jan 2023 16:06:03 +0100 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.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674227226765100001 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/integration.sh b/ci/integration.sh index 41326d6e40..ac04c46d8e 100644 --- a/ci/integration.sh +++ b/ci/integration.sh @@ -37,6 +37,14 @@ virsh net-start default &>/dev/null || true # END AS ROOT exit =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"/tmp/scratch" + mkdir "$SCRATCH_DIR" 2>/dev/null +fi + cd "$SCRATCH_DIR" git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git cd libvirt-tck --=20 2.39.0