From patchwork Fri Mar 3 14:47:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 2715 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 03 Mar 2023 15:47:44 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-io1-f62.google.com (mail-io1-f62.google.com [209.85.166.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 323ElgFD029230 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 3 Mar 2023 15:47:43 +0100 Received: by mail-io1-f62.google.com with SMTP id i2-20020a5d9e42000000b0074cfcc4ed07sf1421410ioi.22; Fri, 03 Mar 2023 06:47:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1677854857; cv=pass; d=google.com; s=arc-20160816; b=EaiR+D1PcGA+1MQBO8c477w191sGyYrkOh1hoP8b0BTy4L8nDwIqbLEt5GjWM1oWfL ic8e7GMek0xK5hyfuUnvTbVicplYnZm27wNQqELYBDfdu1A8W5voM8pSciWL4BeHsjiU gUmZ0+S63LctZ3O4sDPQpFpxs3HizMdQYQcwXQsF2p/I2QmAkfA0UZnnKYTUu17pSpTE +EV59fFa/wqbqL/5hgTUAtZTmFkWBppX7OU7uTkuGDemCEW5g1nqL9KBb6TuhEKjb4Ov BYawJAXuiWSmgVChbqpfDYxhsW7Efj64zhAC/3QhKi0Hqju6rNnFZQBzkZDvIYR0M+AO +qeg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=xE0rprTeJtQIEoJCv7ckghcEeLjXFOHag0xJbYU8Afw=; b=v3exT91v14ENMFcBrGyftX5sdBMvm/KFmdnnsRFJLoOKYc8RdGuV2KEdEF1wFSeOgr ESW6vUfaxPloMlSA3jNu3bnWWWtrU71t0XXIukpWYiHWgdaMtn+mhY5Vq/WWRY02oK25 hnCuXzQpR+b26kcI+CT09tJeTSLLPDn1J5g9gQgUG1Xt+NR6YBcN1D6Wr4vpOAKfdecH FQOM0wa/nHLaquLfsxY9rG/vOJnEt7/FJw3cIixYZ0zLbaEiH0skoDRKiXXzyyIvIFUi eYUhKZDbCQxLo9F0ZU8vbhpi+nug5+1Bk8VFnEE2AiyPeeiDGWqjjhAjvnuQQqvgX4KL IRhg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; t=1677854857; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=xE0rprTeJtQIEoJCv7ckghcEeLjXFOHag0xJbYU8Afw=; b=Xf10QLLYpmDf7gftE1U6E6zk9k3d6cbLOyRTgsCUxtvo4YqdgbwnS1JCfure96/mYs eEU42hZJkv6R6WULRncRjjr4HjtHokQzHd6Zi1BIw5wQOMZU7r9465p3NJz8/y+sIDLU yWH4FyejlfnUmeoQyd4OF92Grx3n9fJ6GELwnDQgwAnTLC7HhLzxqLqC21ccO96aXr6Q GJzI42wEvB/jEI+TEdjn5I94hfYMbuZvRR779oKLhqFwzdp4eeZAuFqcziEy58FP4YKY qr59I17qN9LMEeT/1eCJF0/FiflNUQqGYDDsA3UNlT0EbE2LY9QCnBNT7HIpVL4oYNO2 bsiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677854857; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=xE0rprTeJtQIEoJCv7ckghcEeLjXFOHag0xJbYU8Afw=; b=4kuDszHVhENah8jVADlB54dLmlhpXjkEGx8dghAO80uSH7JdfcSeiSAZV0JTiubw+w KXe1EkGfh5E6a2dLX+L5Qb3KPc4ERgGg0pZOs3WrTsi4MMyOe60PRs2iMwC0YsM/kZi9 bHrXwkJfmOahz/Ol4X/4S0e4MtrM1fb2PncQ9m5Vwd4DQ7sTI2aHFH4OxigDBAvSwCHe 1XuuTchPVGLDGmEpy8CsN7Lrt8qCPIuditFbE7b4DKhbf5SpdvHNdQLYEiOU3h4dQZuk uYfN33kRC9zMALuBeaFrdVH7uBvAzVgT/V+jbZdW4bk4kn4tmX678GkCDoFRgVejcGtD pWWg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKWlRLYk0goZYF52gChBbVYsSMd9uIFhSwXBVkORfMlnetCCYFnq 77Hwg/CtC7uiXIKBLz9idvE= X-Google-Smtp-Source: AK7set90zCACd+ur2wPEZCXnULG4K/AyxDqE/BObTXMcUmQTBhlkvHr2JJx++PS/rA8G1fukLC4k9A== X-Received: by 2002:a02:852e:0:b0:3eb:fd40:78be with SMTP id g43-20020a02852e000000b003ebfd4078bemr675329jai.3.1677854857403; Fri, 03 Mar 2023 06:47:37 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a92:c703:0:b0:317:3bb1:afbc with SMTP id a3-20020a92c703000000b003173bb1afbcls1029789ilp.0.-pod-prod-gmail; Fri, 03 Mar 2023 06:47:36 -0800 (PST) X-Received: by 2002:a05:6e02:1d07:b0:318:1cff:5dfa with SMTP id i7-20020a056e021d0700b003181cff5dfamr1637926ila.18.1677854856832; Fri, 03 Mar 2023 06:47:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677854856; cv=none; d=google.com; s=arc-20160816; b=yu6MyIiUTu/gIb6K1hRWsELlSKabgwM+PSxXTW+JK8mzFy6MFQxg3MNzFv4P5sAM18 Puf6847kc9H0dhZquwQCc2LDLimof+iZ77zFpsAUMN8fpy/vYhpWpAMkvHq693D9b1bP VNbH9/TXZ2n0il/jlp5IIvO9XKOpDVFPBIh19NPunS15Kk8v0LBD+6RkmRHljw8gbB/1 IDojFY9UJ3zFnUIAJvZ7oxDxAhIdoNXOwxLYaUAaz9a4CcHb9UVz8dsvpQSiJes2fJYQ J4FlGX9/++PB/g8ZTJO23+86ZSvlTh2M1gBQkO5qenl/IYGJ0h+gZf5EZ9/0YwqgK385 +Tdg== ARC-Message-Signature: i=1; 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; bh=W1/v44qMM8zTzwevhuBAUqjf9NimvDOlR6z3TgdBcYA=; b=o156U7EUUVYH7LfQFvO92gw9zu6oxz155QKt2YzaRqQv6rEdHaC6wPiukMtoQJ0vF1 EKHexOhhkio+U8DRfi2Uxbm3GAWNQmj50bIl6n+sdxgOL7vlXD7WKRa/H3FcVP/qQu8j iTco3RSieb3te+GVtHbM5hGyIqdeif1GR+0dNjl9uKG82I9UYyntb8YtwuNclc9cipVv P6fwqJ72sI1Onkl7C68MU5ZQmU1apGdwE2Oq0V1BRbhGXvDXduLxMOjkNNH5PFpyp4KA 9MkST+HfYsXmcIvzM9g2nbwQ1Lall3reYUHVY5tpgSR0XchNc5XsER3BP5S9iLxzhmsH NpGQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id dl8-20020a056638278800b003e7ef26f13dsi223943jab.2.2023.03.03.06.47.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Mar 2023 06:47:36 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.. (IN-213-226-141-166.bitemobile.lv [213.226.141.166] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 323ElSpp029181 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 3 Mar 2023 15:47:31 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 02/12] CI: Add avocado version checking Date: Fri, 3 Mar 2023 16:47:17 +0200 Message-Id: <20230303144727.481716-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303144727.481716-1-amikan@ilbers.de> References: <20230303144727.481716-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= We need to keep backward compatibility with older Avocado versions until everyone will move to 100+. Then this can be reverted. Signed-off-by: Anton Mikanovich --- scripts/ci_build.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 37d51f7..e37114b 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -129,9 +129,17 @@ logs_dir = $(realpath "${BASE_DIR}")/job-results EOF export VIRTUAL_ENV="./" +# use correct variable +case "$(avocado --version)" in + *100*) PARALLEL="--max-parallel-tasks=1" + ;; + *) PARALLEL="--nrunner-max-parallel-tasks=1" + ;; +esac + # the real stuff starts here, trace commands from now on set -x avocado ${VERBOSE} run "${TESTSUITE_DIR}/citest.py" \ - -t "${TAGS}" --max-parallel-tasks=1 --disable-sysinfo \ + -t "${TAGS}" ${PARALLEL} --disable-sysinfo \ -p quiet="${QUIET}" -p time_to_wait="${TIMEOUT}"