From nobody Fri Oct 18 04:31:58 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