From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v2 06/12] CI: Make quiet option to be set by default
Date: Fri, 3 Mar 2023 16:47:21 +0200 [thread overview]
Message-ID: <20230303144727.481716-7-amikan@ilbers.de> (raw)
In-Reply-To: <20230303144727.481716-1-amikan@ilbers.de>
It looks like nobody runs bitbake with additional verbose during
normal testsuite operation, so set non verbose output ("quite") to
be default one. Verbose output still can be enabled by adding
"-p quiet=0" directly to avocado command.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
.gitlab-ci.yml | 6 +++---
scripts/ci_build.sh | 7 ++-----
testsuite/README.md | 4 ++--
testsuite/cibuilder.py | 2 +-
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9235fc..eb38be5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,14 +27,14 @@ dev-ci:
except:
- schedules
script:
- - scripts/ci_build.sh -q -T dev
+ - scripts/ci_build.sh -T dev
fast-ci:
<<: *common-build
only:
- schedules
script:
- - scripts/ci_build.sh -q -T fast
+ - scripts/ci_build.sh -T fast
full-ci:
<<: *common-build
@@ -44,7 +44,7 @@ full-ci:
- PREVIOUS_SHA="$(cat .CI_COMMIT_SHA || true)"
- if [ "$CI_COMMIT_SHA" != "$PREVIOUS_SHA" ]; then
echo "$CI_COMMIT_SHA" > .CI_COMMIT_SHA;
- scripts/ci_build.sh -q -T full;
+ scripts/ci_build.sh -T full;
fi
cache:
key: "$CI_COMMIT_REF_SLUG"
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index 9f62db5..fcac180 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -50,7 +50,6 @@ show_help() {
echo " the tests will be started in current path."
echo " -d, --debug enable debug bitbake output."
echo " -T, --tags specify basic avocado tags."
- echo " -q, --quiet suppress verbose bitbake output."
echo " -n, --norun do not execute QEMU run tests."
echo " --help display this message and exit."
echo
@@ -59,8 +58,6 @@ show_help() {
echo " 3 if invalid parameters are passed."
}
-QUIET="0"
-
# Parse command line to get user configuration
while [ $# -gt 0 ]
do
@@ -88,7 +85,7 @@ do
echo "warning: deprecated parameter '$key', consider using '-T fast' instead"
;;
-q|--quiet)
- QUIET="1"
+ echo "warning: deprecated parameter '$key', it is applied by default"
;;
-n|--norun)
NORUN="1"
@@ -151,4 +148,4 @@ set -x
avocado ${VERBOSE} run "${TESTSUITE_DIR}/citest.py" \
-t "${TAGS}" ${PARALLEL} --disable-sysinfo \
- -p quiet="${QUIET}" ${TIMEOUT}
+ ${TIMEOUT}
diff --git a/testsuite/README.md b/testsuite/README.md
index 10fbd79..c9d5862 100644
--- a/testsuite/README.md
+++ b/testsuite/README.md
@@ -27,13 +27,13 @@ $ avocado run ../testsuite/citest.py -t single --max-parallel-tasks=1 -p machine
## Fast build test
```
-$ avocado run ../testsuite/citest.py -t fast --max-parallel-tasks=1 -p quiet=1
+$ avocado run ../testsuite/citest.py -t fast --max-parallel-tasks=1
```
## Full build test
```
-$ avocado run ../testsuite/citest.py -t full --max-parallel-tasks=1 -p quiet=1
+$ avocado run ../testsuite/citest.py -t full --max-parallel-tasks=1
```
## Fast boot test
diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index 65eeb4b..0a07bf0 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -64,7 +64,7 @@ class CIBuilder(Test):
self.check_init()
# get parameters from avocado cmdline
- quiet = bool(int(self.params.get('quiet', default=0)))
+ quiet = bool(int(self.params.get('quiet', default=1)))
if dl_dir is None:
dl_dir = os.path.join(isar_root, 'downloads')
--
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 ` [PATCH v2 02/12] CI: Add avocado version checking Anton Mikanovich
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 ` Anton Mikanovich [this message]
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-7-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