[v2,02/12] CI: Add avocado version checking

Message ID	20230303144727.481716-3-amikan@ilbers.de
State	Deferred
Headers	show Return-Path: <isar-users+bncBCHIPONZWECRBCMRRCQAMGQEXGYV32Y@googlegroups.com> Sender: isar-users@googlegroups.com Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; From: Anton Mikanovich <amikan@ilbers.de> To: isar-users@googlegroups.com Cc: Anton Mikanovich <amikan@ilbers.de> 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> In-Reply-To: <20230303144727.481716-1-amikan@ilbers.de> References: <20230303144727.481716-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com
Series	Next avocado improvements \| expand [v2,00/12] Next avocado improvements [v2,01/12] CI: Update Avocado version [v2,02/12] CI: Add avocado version checking [v2,03/12] scripts: Add option to directly specify avocado tags [v2,04/12] gitlab-ci.yml: Run dev tests set on push [v2,05/12] CI: Set default QEMU timeout to 10 minutes [v2,06/12] CI: Make quiet option to be set by default [v2,07/12] CI: Remove norun option [v2,08/12] CI: Enable sstate dir sharing [v2,09/12] CI: Enable ccache dir sharing [v2,10/12] CI: Add Jenkins pipeline configuration [v2,11/12] CI: Update avocado install documentation [v2,12/12] CI: Add documentation for test case creation

Message ID

20230303144727.481716-3-amikan@ilbers.de

State

Deferred

Headers

Sender: isar-users@googlegroups.com
Received-SPF: pass (google.com: domain of amikan@ilbers.de designates
 85.214.156.166 as permitted sender) client-ip=85.214.156.166;
From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
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>
In-Reply-To: <20230303144727.481716-1-amikan@ilbers.de>
References: <20230303144727.481716-1-amikan@ilbers.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list isar-users@googlegroups.com;
 contact isar-users+owners@googlegroups.com

Series

Next avocado improvements | expand

Commit Message

Anton Mikanovich March 3, 2023, 2:47 p.m. UTC

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 <amikan@ilbers.de>
---
 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}"

[v2,02/12] CI: Add avocado version checking

Commit Message

Patch