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 [thread overview]
Message-ID: <20230303144727.481716-3-amikan@ilbers.de> (raw)
In-Reply-To: <20230303144727.481716-1-amikan@ilbers.de>
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}"
--
2.34.1
next prev parent reply other threads:[~2023-03-03 14:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 14:47 [PATCH v2 00/12] Next avocado improvements Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 01/12] CI: Update Avocado version Anton Mikanovich
2023-03-03 14:47 ` Anton Mikanovich [this message]
2023-03-03 14:47 ` [PATCH v2 03/12] scripts: Add option to directly specify avocado tags Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 04/12] gitlab-ci.yml: Run dev tests set on push Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 05/12] CI: Set default QEMU timeout to 10 minutes Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 06/12] CI: Make quiet option to be set by default Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 07/12] CI: Remove norun option Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 08/12] CI: Enable sstate dir sharing Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 09/12] CI: Enable ccache " Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 10/12] CI: Add Jenkins pipeline configuration Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 11/12] CI: Update avocado install documentation Anton Mikanovich
2023-03-03 14:47 ` [PATCH v2 12/12] CI: Add documentation for test case creation Anton Mikanovich
2023-03-07 4:10 ` [PATCH v2 00/12] Next avocado improvements Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230303144727.481716-3-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox