From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7186996775974076416 X-Received: by 2002:a05:600c:444c:b0:3d9:e5a6:e176 with SMTP id v12-20020a05600c444c00b003d9e5a6e176mr1409869wmn.85.1673568039594; Thu, 12 Jan 2023 16:00:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b0c:b0:3cf:72dc:df8 with SMTP id m12-20020a05600c3b0c00b003cf72dc0df8ls3171599wms.0.-pod-canary-gmail; Thu, 12 Jan 2023 16:00:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXt9Hqp91QR7Pzfl8Cs0n/z0AtgVb9c55jahHAADVB0qQvpvNllEyXmQfAPDkVQsryPvBpk1 X-Received: by 2002:a05:600c:1d98:b0:3d3:48f4:7a69 with SMTP id p24-20020a05600c1d9800b003d348f47a69mr67442413wms.17.1673568038477; Thu, 12 Jan 2023 16:00:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673568038; cv=pass; d=google.com; s=arc-20160816; b=HzOPJJICfA9w6fFMaiTa2Adl43pzATKPEsPyaz5LdpOFjvHp4QqFZi9dwYNW/Z+U+k 5vhFrk9ps0gbkMqmw10YBhTBoOlxK4n8X+2A/NumI108dFei8zkgJ634sXd57gXWT4oE GLz+8NTTqAxMrIagiAMfYIWOVC2p1CToq+AncY5eJxL71utkEH0AGYtxM4Dx67iG3B0a TueG7pVhBYsYxRKx58rDDvO5JtS/+LDORth5avAdh/QVFy/MTH6V8bv/wuQoewdD5cSY 5zvtktKs/rpsH32/S+tW8Z90Tl9y4qLUtR44kWuzxZWzT33jqsGCuWCK2a0JeYbXLAhb 9dew== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=wAkzyGBrmr4n0xPVbCR8LeqhrfVsziZ7l3P3g9NtSmI=; b=fHE5i/irtXfdRig63vhCJmCh5B5GyVKQn4zM9kNylUdeG8JSd3L5slUoXwoP1pccLE pXKSGWBhkEwpG5YxdX8OT3zcaOOBLK0Zo2e0H7FQkkA59/0gZIkRhe8U9enHltf2wCtU KQgsN5ew1LUdrTCkTgTBgM50Rrsg2nvR3BHew3e6Kc+dnn/g7UMYuTTkM6LWPDxeoYla hmPaPlzaSr18moNkEVtqQkjTOPlwUfcOaBVbVwQyxZLXOoAyNsqG07EIzPaqSFjQ7BU4 PeFKw3mO9VMFu+Fsw0NabRDoprIU0+QHduVsfr6L+fnObsjAjMDIduRZf7a2KAH0KPNL 5UJw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=x+gHWnXe; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.77 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2077.outbound.protection.outlook.com. [40.107.21.77]) by gmr-mx.google.com with ESMTPS id ay38-20020a05600c1e2600b003c9a5e8adc5si1096086wmb.1.2023.01.12.16.00.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jan 2023 16:00:38 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.77 as permitted sender) client-ip=40.107.21.77; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=x+gHWnXe; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.77 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A1Qqd2UN7fmMyS1lzM4mF630XULCj899Ga8H92eX70eML8+xcWVSb4GIwn3I/ziyx6tL7bEIA8BaabFJ2nWrojzd+1FXf1feE+/HeBztIqT7HpoEbRVhHxH7s95HsRMJ6q+Al+Tnkzjq/w5jcgSG6tRqS1joLDcTBX42sXYVrY8IDSaQWcgbFKpQpJa8wjhZXsIKjfQ8OoC3DGcsRl+tnDkUlym/bQnIuk0aJ4cOlncRfNSwPlMBnnmPVHtk/MfH1fOWSc0wGu2meR/Ou3DwooebuewosoE8RT1LOI8XON2GnysodckvlyueI/vpU/lhXD9RdOQSDUdcGHJ4e1N/0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wAkzyGBrmr4n0xPVbCR8LeqhrfVsziZ7l3P3g9NtSmI=; b=m3YDQavZfYvsXK0KCXYfJcj+EOpnWtlPiilBhvSgrRb23urCFktqmsLHRghU4qgbAIJf33QUM0hzKhB/m//nQDmW3Kr0biw0EQHdk5z+SG9FwqNXl4uUK3eoGAXYifXQBx2V0HhCdvhbAKMzITFRSG9IyXpnRP5H5v1BH/5v4MiYtUyQErVk2yjIujBG3ObIcDRQROZXF4PpYSKeYceonlyq1Jkenx38aw0lretHuNYOKcLFPHn6VdHTKFV6j9E6E+zRzTtFtj+WvBF4g9JHfm4GG43KhIt3CgeFRnN6qpL/DSd3Fa6oRojyKjbRk2M1Ka9DuJrJhZit+vasbuU9MQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.74) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wAkzyGBrmr4n0xPVbCR8LeqhrfVsziZ7l3P3g9NtSmI=; b=x+gHWnXe0X/GpMvH9sUB0GvCQkKs1oFxCQlD3WuptyVL7vTEw2FYjDpt92DkYRe3G3ja/lLccX8MWzB4QWeYAYvBy2gE/KScvKAXmIMx7KbiQNVlNoKjjrtIR8CEXi/w/S5WamXzhA9H7jhatuMfjE3hhq0uzRMD9PNAYdlMvQOUd02vRlt29lqgVyt9k/qlOfLhZI0ztMMAYFIX00mo9Y+QTGulUFq2RxovBk4cwDHxABMQTabkEguOcHDe/JtVqL3utZPWkFus9x+dku30/Jtr9DWBZ3R5wm3v0WERb/LCbTDVEea0Lgm2x1Va2f9jWCYVMCThwTJJAkZYyfJW0A== Received: from GV3P280CA0017.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:b::15) by DU2PR10MB7787.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:491::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Fri, 13 Jan 2023 00:00:36 +0000 Received: from HE1EUR01FT058.eop-EUR01.prod.protection.outlook.com (2603:10a6:150:b:cafe::d7) by GV3P280CA0017.outlook.office365.com (2603:10a6:150:b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.13 via Frontend Transport; Fri, 13 Jan 2023 00:00:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.74) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.74 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.74; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.74) by HE1EUR01FT058.mail.protection.outlook.com (10.152.0.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.13 via Frontend Transport; Fri, 13 Jan 2023 00:00:35 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) by DEMCHDC8VQA.ad011.siemens.net (194.138.21.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Fri, 13 Jan 2023 01:00:34 +0100 Received: from localhost.localdomain (167.87.59.121) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Fri, 13 Jan 2023 01:00:34 +0100 From: Henning Schild To: CC: Jan Kiszka , Baurzhan Ismagulov , Henning Schild Subject: [PATCH v2 2/4] CI: fix shell coding style Date: Fri, 13 Jan 2023 00:59:27 +0100 Message-ID: <20230112235929.1437-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.38.2 In-Reply-To: <20230112235929.1437-1-henning.schild@siemens.com> References: <20230112235929.1437-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [167.87.59.121] X-ClientProxiedBy: DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1EUR01FT058:EE_|DU2PR10MB7787:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d418334-9849-462f-7012-08daf4f9326d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yL8LmHdimQtfQ7WTn5eXUuI2LaEHfdHHWA9PeLLXXfDAIv5rL2IIXsxNfcBfxPymdoxmA6xX0EBcKJ41xAAkuFJ4Ji85HLB0JrsSJYZt/5Oi9w2enwsDH6Wj3B5mdxK5BI7yC5m1wvkM5cKaN/IvvuU4SgTkqIt9mhxPHew/1K0mDqcihmadchi4UMLSKrbIGx6l10uZUeA273j1MkfIGdMfpaPsaOh2Hp0i6TPGqRDuyQobDws7TFQAn3sodOrsb2ZlVZL8kTDu3Jt75p9dwuPoFD+zj/d6SzcoYqVTr74lQe0ArffZ5aRAGh4/w51zFqGGShvA5x/lLSmGuRiNKBEyf5nFad6ofITwMyRM1El6SDgDKBjbp9E8rGQ1xhjNHipKNPTV+TFRs1aHpDtoKwqXCLQUEYrX45TKGmOOJ78XL99Awv7Eu60L1Sx5uJGLtBRBhBNRj5hxlOk5cT9c9VVlnq745lRLmQdUWB3VvpA3jRqYdc39GDOpe3kyc0S83A7j+j/eKYOVTfcLuGsRijDz1NDXgy1RpD18rnHEV4IQ4QQPS/hdwcybKFRNkRQI1KwfhUxrq/U0IEabPg2Ws07wuoTebDP6ii16CrVWe9jrWkKxRJAbk/jCX5cXOtHEglcQUkOLb+PHLE0zghWyF+UVlxAZIanCsd2f1236HoI6yIs8ZuSadMkwO7FQ/YLbb5mz+sCLcAcJlzJJ3qXegQ== X-Forefront-Antispam-Report: CIP:194.138.21.74;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(346002)(376002)(39860400002)(451199015)(40470700004)(36840700001)(46966006)(54906003)(8676002)(36756003)(2906002)(44832011)(7596003)(7636003)(356005)(82960400001)(8936002)(16526019)(41300700001)(6916009)(70206006)(70586007)(4326008)(5660300002)(316002)(1076003)(86362001)(82740400003)(478600001)(40480700001)(186003)(47076005)(26005)(956004)(2616005)(107886003)(82310400005)(40460700003)(336012)(6666004)(83380400001)(36860700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 00:00:35.5319 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d418334-9849-462f-7012-08daf4f9326d X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.74];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT058.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR10MB7787 X-TUID: PvScDXG1jl9h Apply some suggestions from shellcheck and make sure that runs fine. Signed-off-by: Henning Schild --- scripts/ci_build.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 84a3e472e784..e5f20d4f0a1f 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -20,6 +20,7 @@ if ! command -v avocado > /dev/null; then sudo apt-get install -y virtualenv rm -rf /tmp/avocado_venv virtualenv --python python3 /tmp/avocado_venv + # shellcheck source=/dev/null source /tmp/avocado_venv/bin/activate pip install avocado-framework==99.0 fi @@ -33,8 +34,8 @@ BASE_DIR=./build # Check dependencies DEPENDENCIES="umoci skopeo" for prog in ${DEPENDENCIES} ; do - if [ ! -x "$(which $prog)" ] ; then - echo "missing $prog in PATH" >&2 + if ! command -v "${prog}" > /dev/null; then + echo "missing ${prog} in PATH" >&2 fi done @@ -132,16 +133,16 @@ fi mkdir -p .config/avocado cat < .config/avocado/avocado.conf [datadir.paths] -base_dir = $(realpath $BASE_DIR)/ -test_dir = $(realpath $BASE_DIR)/tests -data_dir = $(realpath $BASE_DIR)/data -logs_dir = $(realpath $BASE_DIR)/job-results +base_dir = $(realpath "${BASE_DIR}")/ +test_dir = $(realpath "${BASE_DIR}")/tests +data_dir = $(realpath "${BASE_DIR}")/data +logs_dir = $(realpath "${BASE_DIR}")/job-results EOF export VIRTUAL_ENV="./" # the real stuff starts here, trace commands from now on set -x -avocado $VERBOSE run "$TESTSUITE_DIR/citest.py" \ - -t $TAGS --nrunner-max-parallel-tasks=1 --disable-sysinfo \ - -p quiet=$QUIET -p cross=$CROSS_BUILD -p time_to_wait=$TIMEOUT +avocado ${VERBOSE} run "${TESTSUITE_DIR}/citest.py" \ + -t "${TAGS}" --nrunner-max-parallel-tasks=1 --disable-sysinfo \ + -p quiet="${QUIET}" -p cross="${CROSS_BUILD}" -p time_to_wait="${TIMEOUT}" -- 2.38.2