diff mbox series

[v2,06/12] CI: Make quiet option to be set by default

Message ID 20230303144727.481716-7-amikan@ilbers.de
State Accepted, archived
Headers show
Series Next avocado improvements​ | expand

Commit Message

Anton Mikanovich March 3, 2023, 2:47 p.m. UTC 
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 mbox series

Patch

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')