From nobody Tue Oct 22 23:39:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695032711; cv=none; d=zohomail.com; s=zohoarc; b=nhY5IusXdffztJsDpp842KdC5wRYyr9QHBjLs1E6BKkAgelxR5VN2Yrt+VD3KS1CmmQ6scaUR2U1Rpvfup+IfUHCFUxaoepVL4v+5wdUm2ZkOm9AfvZ4sI+tGXLD6dRpga5NtbGB5K4ZOhrgh7IvgVNDUMVRkf/VPeXp7Qa5EZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032711; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VQUASmmy0+0IoE5ZyEwpzL92zpCt+v61MqUCQ0WKquU=; b=GEmN9Rm4Ph0SlkCExZH1Xuxy1QQZCOK2Uq5n4aF7P1+jOG8qrtIotGPKFTdl5ECgjE3FDlzvkPVxVSHyv69YVe9b6DtTwI9U/SoHx6ZYLM7NicgdCShBiFreYubOJwfSOuxSoR3DuJCEQ6dwihcqdUHnBz62d6otWRQ9c3fgTRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1695032711215373.2684360701036; Mon, 18 Sep 2023 03:25:11 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-314-QSVhs4gMM4yzMAw_GZM66w-1; Mon, 18 Sep 2023 06:22:57 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 445D429ABA0D; Mon, 18 Sep 2023 10:22:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30C57492C37; Mon, 18 Sep 2023 10:22:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0E4511946597; Mon, 18 Sep 2023 10:22:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C3B82194658C for ; Mon, 18 Sep 2023 10:22:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A954040C200D; Mon, 18 Sep 2023 10:22:51 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D97E40C2009; Mon, 18 Sep 2023 10:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032710; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VQUASmmy0+0IoE5ZyEwpzL92zpCt+v61MqUCQ0WKquU=; b=E0miek35H3Wpb1HSHY4Jq/WirmzBvgnyUEhrdWRjNPHZfHoMa1RPQLW3HoPdJR6WaykMw1 wWNuKFGgVjOlhPVEtX+HSo/Cx2t34XZxI2aS+8BiyUeFBOPEmK7L7yxvsPZ6WeOpms1geA 9wCt9ViL+OwJqdzMI9DKuiEE8u/GCBg= X-MC-Unique: QSVhs4gMM4yzMAw_GZM66w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 03/12] ci: integration: Adjust the check for CentOS Stream version Date: Mon, 18 Sep 2023 12:22:39 +0200 Message-ID: <3ec2943ee3ef2a5d2288dabf18d8bf21f9b7527a.1695032553.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695032711779100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported versions of Fedora and CentOS Stream 9 default to modular setup, it's probably better if we cosmetically adjust the CentOS Stream version check to make it explicit that monolithic daemon services ought to be started only on Stream 8. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index 2bc6f86e45..adb798d127 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -89,7 +89,7 @@ run_integration() { sudo systemctl daemon-reexec # need to reexec systemd after changing c= onfig =20 source /etc/os-release # in order to query the vendor-provided variab= les - if test "$ID" =3D "centos" && test "$VERSION_ID" -lt 9 + if test "$ID" =3D "centos" && test "$VERSION_ID" -eq 8 then DAEMONS=3D"libvirtd virtlockd virtlogd" else --=20 2.41.0