From nobody Tue Oct 22 23:20:36 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=1695032589; cv=none; d=zohomail.com; s=zohoarc; b=BhZUaq8kRMUNyn1DxmEzdKzRBDD5wjdDkS3dBxw9/lOEvd3cyFZS98GIK1ClGgShmMEdWLHonw99vQNBDgXiwq0B9k2p6WvzPW+qbHSWDOxIo5mXlYEQSscuuI351b5+XANWEc+UUWIF/smfRLzEA8OpdyJT2laTFs3Y6O3wSyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695032589; 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=IUSLUvKlBmFS7fFcl0OzTaOMt4w7/pMfeCo79XhTcBg=; b=iq6NGUntSWFMYNoNoVk599/5CmbOFTmw+6WdM+Ah+DuhJdrKccJUQyumEb6K025j9As1MNw8LpingluyHIFKSKTyyIyPdMZkeMQ1D3MjlKW1WuQa25m0lNY7FsYFXdCLWiOeu67sl/NFTCxk8ou/DyJa4TMIoVMOuwLc1C4YWCw= 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 1695032589767908.9122799364304; Mon, 18 Sep 2023 03:23:09 -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-362-J-sGW59_Mj2qe27N2hSBOA-1; Mon, 18 Sep 2023 06:23:06 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 7ABD93810D2F; Mon, 18 Sep 2023 10:23:03 +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 530B740C6E78; Mon, 18 Sep 2023 10:23:03 +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 2ECB319465A4; Mon, 18 Sep 2023 10:23:02 +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 9D0EE19465A4 for ; Mon, 18 Sep 2023 10:23:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 79A6B40C200C; Mon, 18 Sep 2023 10:22:55 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8C3A40C2064; Mon, 18 Sep 2023 10:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695032588; 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=IUSLUvKlBmFS7fFcl0OzTaOMt4w7/pMfeCo79XhTcBg=; b=ivg31Sp73r79wYnm+7F8mLMZF7mOeAIWv8tD+KKBmgLw/bU6TffemngzlMz31kttj2Q21Q dC4zXJ132ROdAnrWgX6bwJYEshn/MjA3z+5hk/cH/wvQ8kv6f5KZIOZkHkL/KeyLVqWrrO ft68jCoDdF9AT5WvjoJdK1/FOIgrA24= X-MC-Unique: J-sGW59_Mj2qe27N2hSBOA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 08/12] ci: jobs: run_integration: Make POSIX-compliant Date: Mon, 18 Sep 2023 12:22:44 +0200 Message-ID: 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.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: 1695032590281100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Neither '&>' nor 'source' are defined in POSIX. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/jobs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/jobs.sh b/ci/jobs.sh index 37bca452fa..f4e83dda2e 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -91,7 +91,7 @@ run_integration() { sudo systemctl daemon-reexec =20 # Source the os-release file to query the vendor-provided variables - source /etc/os-release + . /etc/os-release if test "$ID" =3D "centos" && test "$VERSION_ID" -eq 8 then DAEMONS=3D"libvirtd virtlockd virtlogd" @@ -102,8 +102,8 @@ run_integration() { do LOG_OUTPUTS=3D"1:file:/var/log/libvirt/${daemon}.log" LOG_FILTERS=3D"3:remote 4:event 3:util.json 3:util.object 3:util.d= bus 3:util.netlink 3:node_device 3:rpc 3:access 1:*" - sudo augtool set /files/etc/libvirt/${daemon}.conf/log_filters "'$= LOG_FILTERS'" &>/dev/null - sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$= LOG_OUTPUTS'" &>/dev/null + sudo augtool set /files/etc/libvirt/${daemon}.conf/log_filters "'$= LOG_FILTERS'" 2>/dev/null 1>&2 + sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "'$= LOG_OUTPUTS'" 2>/dev/null 1>&2 sudo systemctl --quiet stop ${daemon}.service sudo systemctl restart ${daemon}.socket done @@ -113,7 +113,7 @@ run_integration() { # Shell scripts with -e by default and virsh returns an error if one t= ries # to start a machine/network that is already active which is both fine= and # should also be a non-fatal error - sudo virsh --quiet net-start default &>/dev/null || true + sudo virsh --quiet net-start default 2>/dev/null 1>&2 || true =20 cd "$SCRATCH_DIR" git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git --=20 2.41.0