From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7206331732801355776 X-Received: by 2002:a05:6830:3098:b0:68b:df56:c83b with SMTP id g24-20020a056830309800b0068bdf56c83bmr507900ots.1.1677854859860; Fri, 03 Mar 2023 06:47:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aca:bc05:0:b0:383:b12d:145f with SMTP id m5-20020acabc05000000b00383b12d145fls1102217oif.9.-pod-prod-gmail; Fri, 03 Mar 2023 06:47:39 -0800 (PST) X-Google-Smtp-Source: AK7set/L5wTSqnK5fk51BR+1w7V/nV4Y/3Qtj6Y/h2QnNn/PqsEZsolBIZLQdm57Rx+yO9NW6TM1 X-Received: by 2002:a05:6808:b1b:b0:367:6c7:ba98 with SMTP id s27-20020a0568080b1b00b0036706c7ba98mr756306oij.23.1677854859343; Fri, 03 Mar 2023 06:47:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677854859; cv=none; d=google.com; s=arc-20160816; b=WG+wRY9Z3TBl2loj8knElhZpzCiEGxuhHTAxH5Qjn0Ak6BxqIrRONEgS2/+i4ys9i+ /YM3t+jK9SGXe/bKQdgO9fHifpgF/bDsgJLEj167Le3ciqOqGA99XIHMlp27vgLSlQ8I sK0nu/NHHm2Zs4txTSfVp5T7eW3h62Yiw17PHd+2eIIxjltNf/Nk391QmYjk7HJeIn4p SkVUulanr19kas7v+G8+id3TXWHdwRFYawozVJ6lxg3IbTTGSevkIpokded4iyyz+bvK 58edMADcqdbfNOgsaXOEUNXwUFUkhzh6B1d66pBuZXwYp1YvcU3uCyQZxohRsHuw39Rq 7Grg== 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=lJAYv6uqAAMMo/U+smQU7AvG246+b1s8e1+frrdQSls=; b=kuuGAR0l9URCfto9QEpri1RoMLQgf2+0BJd7uCYQ1GI+9o7q5YVgxkfCoU2CcKkBwN mS/O1YS8c/58pClDI9XaNfKjKqY6RT8gG+TQc2XcmA0I39UObCTNio3rRcSeiUkHnBTV DooSdbUPFYCkYhfX4U8x80cJnQTBHQeuiYfdDRiT0wweaiPGas0Fo8mPqq+nITi8itqK BguodY5gylgHb1Way34U+fTPbNL2pqXYYu88rtLFNY6Sm6GOisCyOrN8fQ/bmnWF0aXL rLmnhtUNGxQ+tpGR8bmx+wluUP1ZEsGkR7nXBJwHrbG6qs93eh+6HVsLXqGxLIgkPO05 ipDw== 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 125-20020aca0783000000b0036bbb25d978si125723oih.3.2023.03.03.06.47.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Mar 2023 06:47: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.. (IN-213-226-141-166.bitemobile.lv [213.226.141.166] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 323ElSps029181 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 3 Mar 2023 15:47:34 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 05/12] CI: Set default QEMU timeout to 10 minutes Date: Fri, 3 Mar 2023 16:47:20 +0200 Message-Id: <20230303144727.481716-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230303144727.481716-1-amikan@ilbers.de> References: <20230303144727.481716-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: 0El4Ee+oCfp+ Also remove default value inside bash script. Signed-off-by: Anton Mikanovich --- scripts/ci_build.sh | 7 ++----- testsuite/README.md | 4 ++-- testsuite/cibuilder.py | 4 +++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 7382862..9f62db5 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -52,8 +52,6 @@ show_help() { echo " -T, --tags specify basic avocado tags." echo " -q, --quiet suppress verbose bitbake output." echo " -n, --norun do not execute QEMU run tests." - echo " -t, --timeout SEC specify time in seconds to wait before stop QEMU." - echo " The default is: 300" echo " --help display this message and exit." echo echo "Exit status:" @@ -62,7 +60,6 @@ show_help() { } QUIET="0" -TIMEOUT=300 # Parse command line to get user configuration while [ $# -gt 0 ] @@ -97,7 +94,7 @@ do NORUN="1" ;; -t|--timeout) - TIMEOUT=$2 + TIMEOUT="-p time_to_wait=$2" shift ;; -c|--cross|-r|--repro|-s|--sign) @@ -154,4 +151,4 @@ set -x avocado ${VERBOSE} run "${TESTSUITE_DIR}/citest.py" \ -t "${TAGS}" ${PARALLEL} --disable-sysinfo \ - -p quiet="${QUIET}" -p time_to_wait="${TIMEOUT}" + -p quiet="${QUIET}" ${TIMEOUT} diff --git a/testsuite/README.md b/testsuite/README.md index d8adc7f..10fbd79 100644 --- a/testsuite/README.md +++ b/testsuite/README.md @@ -39,13 +39,13 @@ $ avocado run ../testsuite/citest.py -t full --max-parallel-tasks=1 -p quiet=1 ## Fast boot test ``` -$ avocado run ../testsuite/citest.py -t startvm,fast -p time_to_wait=300 +$ avocado run ../testsuite/citest.py -t startvm,fast ``` ## Full boot test ``` -$ avocado run ../testsuite/citest.py -t startvm,full -p time_to_wait=300 +$ avocado run ../testsuite/citest.py -t startvm,full ``` # Running qemu images diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 5eebd5a..65eeb4b 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -15,6 +15,8 @@ from avocado import Test from avocado.utils import path from avocado.utils import process +DEF_VM_TO_SEC = 600 + isar_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) backup_prefix = '.ci-backup' @@ -262,7 +264,7 @@ class CIBuilder(Test): def vm_start(self, arch='amd64', distro='buster', enforce_pcbios=False, skip_modulecheck=False, image='isar-image-base', cmd=None, script=None): - time_to_wait = self.params.get('time_to_wait', default=60) + time_to_wait = self.params.get('time_to_wait', default=DEF_VM_TO_SEC) self.log.info('===================================================') self.log.info('Running Isar VM boot test for (' + distro + '-' + arch + ')') -- 2.34.1