From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7203376969598107648 X-Received: by 2002:aed:27d9:0:b0:3b7:fda5:25d6 with SMTP id m25-20020aed27d9000000b003b7fda525d6mr1947273qtg.7.1677166900229; Thu, 23 Feb 2023 07:41:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:51d9:0:b0:3bc:edc5:2588 with SMTP id d25-20020ac851d9000000b003bcedc52588ls71883qtn.6.-pod-prod-gmail; Thu, 23 Feb 2023 07:41:39 -0800 (PST) X-Google-Smtp-Source: AK7set+Sxigyrl1lzQtObasONSosmXAXDw+7weW356O/E1zPlc3BvQBpXoSC89+rLn5KQirihZKT X-Received: by 2002:ac8:5ad5:0:b0:3bb:7649:bd89 with SMTP id d21-20020ac85ad5000000b003bb7649bd89mr23628762qtd.61.1677166899574; Thu, 23 Feb 2023 07:41:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677166899; cv=none; d=google.com; s=arc-20160816; b=1H8tuCmHYw1aiun0KJCnsjKJoF6wsZvLPUvYeoVGYKyDpAj9Qg2n3p8eyA2ua0PEuo U3Zy2GO40YQsN9Axcop0VM2LCXEc+V74W5bIoWjmcQemMHSke81UnrShOOKc7YFbZqE1 Yk6cLUPrOXeyPnMy7I5CJWFjEisCESnQPVSG1qeNw3m05m10KJ86nWF1dr6CQ0xzyyfV KqkkG7EaOFZt2QNphu7JCy62A/FONucAQ7xD5FBGDfWpK6q1kiwaI2LZ7eepwPwYBC/i dA/TPYz3bmynjYrcCnXAGXw9BMj0vgT6QWPKlaBQmuZTsJ8eKw/ntVBSIEpKVtyG57u2 BrEw== 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=qD8z7yaTaASLrUpSWQIoul7rVfY0lvrYhal/VhPpyJW84qjoN3DTGfQUcMUS2AiP/x ZkOedaoCVBz6umrg9ME/c1m9nqMgmOhbuM+3c1IyXZ9Alls5GRhIGIGkxPo7rKwBXLuv tHVq5HeFz1vMJa2Ai5pN1ZK3Q2gpOiK3cKBWGPC6DaR0FhD9HpKxY3AtYsVPb5W0YFZI xCH2kMe8WZcUHpFXnLXOMfbMoPyqtYcPca5TF68XobwPh5CPnJyCK7zVXOstxILS/n8E 3mVWONtBU1l84h/tr5HW5YvUzZqRGf5KuObk/c1gnHiEfNNn1JEXxOJLjmHL1MocZn9b kSJw== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id i10-20020a05622a08ca00b003b83629a0a2si684552qte.5.2023.02.23.07.41.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Feb 2023 07:41:39 -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; 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 Received: from user-B660.. ([85.254.74.12]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 31NFfWLN020691 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Feb 2023 16:41:37 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 02/11] CI: Add avocado version checking Date: Thu, 23 Feb 2023 17:41:22 +0200 Message-Id: <20230223154131.132362-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230223154131.132362-1-amikan@ilbers.de> References: <20230223154131.132362-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: Sre0UElbd/g6 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}" -- 2.34.1