From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7067428780549079040 X-Received: by 2002:a2e:908f:0:b0:246:4cf7:69c9 with SMTP id l15-20020a2e908f000000b002464cf769c9mr1000934ljg.149.1645513993209; Mon, 21 Feb 2022 23:13:13 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:15a3:b0:443:7b15:f451 with SMTP id bp35-20020a05651215a300b004437b15f451ls1874898lfb.0.gmail; Mon, 21 Feb 2022 23:13:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDTsnYVr082mJx9wj1LKqWBaoTBQWEnZ0f9ZHERGtq8811D7O+iGVeOlTO4i2wy1AuohfG X-Received: by 2002:a05:6512:1105:b0:443:8b92:29ff with SMTP id l5-20020a056512110500b004438b9229ffmr16318059lfg.413.1645513992360; Mon, 21 Feb 2022 23:13:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645513992; cv=none; d=google.com; s=arc-20160816; b=wxFRYynrmwJo41QyKKz2rYUFT1g4JcCfzQseZb0Q9NUZASZhKmAQ9Q/Qf7Ue8GIDl/ /ctK4AoZ4o02m3aEXIzI9lnfMug24U5FPnwf2JGZmOtms5+GtJ3X1tKf4IQkZBTNg6Cy QUmaqU4kJdhNyZJJFAN2vo0D6gxujLrnmu1nPTMVrkJh2Dp5lOajV2PcGUWbtF7dAnQg ahuCMfXYDrKQ/YqctEShUvRRCX3ti8Vtmdx0FsIHybCz8Wm6Wgw8MXZmo12zOd0oYIlE pimTXt/k+O5bjUWuAv+lpJc43YJgqPg+4nAeddWgEpanme1D/8YtX8d5nq9OyGXF1f7G v2Ng== 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=ObtvQAIfEdLg2LVr07y82RF9gDhw42/z98TUhIznnAc=; b=nhGs6WO5E9501/EgT78ugJyxj5CCohrTJ9AQCYqleDih/3z/rrTUzFW59VZ6jF4in3 POfERMYSu9R+EhqCjucea8kmqDruhX5p3TE/6c0dUIDYmM22UU/Z/mF7mxGDCWsbndS4 mOEQmJ1R/vTyboRk0bn22+AWAqxxJ3MK0JJqwNsw873ze5XrjIkPnGklH9Byz/YQvQFp CGcm8NivDb8sbGPgEM85+A07VnxLDqcvtFzqJeYNZKAm1N2wJcOrBWzHh/aGFS7u2o8w fzYwdcFKk5hPzGBoLhx0FGRfshd7qeVz+Oqb/pEfoDqw7TlhV0KQ311PPD8/cKBx1CcU YFdA== 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 n25si108704lji.8.2022.02.21.23.13.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Feb 2022 23:13:12 -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 localhost.localdomain (mm-5-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.5] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21M7D8Wr019575 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Feb 2022 08:13:11 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/6] CI: Reorganize testsuite folders Date: Tue, 22 Feb 2022 10:12:54 +0300 Message-Id: <20220222071259.157349-2-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220222071259.157349-1-amikan@ilbers.de> References: <20220222071259.157349-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: Alin2hDAzsLi Move all tests into one directory to be able to unify them. Signed-off-by: Anton Mikanovich --- scripts/ci_build.sh | 4 +-- scripts/vm_smoke_test | 4 +-- testsuite/README.md | 26 +++++++++++++++++--- testsuite/{build_test => }/build_test.py | 0 testsuite/build_test/run_fast.sh | 3 --- testsuite/build_test/run_full.sh | 3 --- testsuite/{build_test => }/cibase.py | 4 +-- testsuite/{build_test => }/cibuilder.py | 2 +- testsuite/{ => keys}/base-apt/test_priv.key | 0 testsuite/{ => keys}/base-apt/test_pub.key | 0 testsuite/{vm_boot_test => }/vm_boot_test.py | 1 - testsuite/vm_boot_test/run_fast.sh | 3 --- testsuite/vm_boot_test/run_full.sh | 3 --- 13 files changed, 30 insertions(+), 23 deletions(-) rename testsuite/{build_test => }/build_test.py (100%) mode change 100644 => 100755 delete mode 100755 testsuite/build_test/run_fast.sh delete mode 100755 testsuite/build_test/run_full.sh rename testsuite/{build_test => }/cibase.py (97%) mode change 100644 => 100755 rename testsuite/{build_test => }/cibuilder.py (99%) mode change 100644 => 100755 rename testsuite/{ => keys}/base-apt/test_priv.key (100%) rename testsuite/{ => keys}/base-apt/test_pub.key (100%) rename testsuite/{vm_boot_test => }/vm_boot_test.py (98%) mode change 100644 => 100755 delete mode 100755 testsuite/vm_boot_test/run_fast.sh delete mode 100755 testsuite/vm_boot_test/run_full.sh diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 339ebca..fe139d1 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -25,7 +25,7 @@ if ! command -v avocado > /dev/null; then fi # Get Avocado build tests path -BUILD_TEST_DIR="$(pwd)/testsuite/build_test" +TESTSUITE_DIR="$(pwd)/testsuite" # Start tests in current path by default BASE_DIR=./build @@ -127,6 +127,6 @@ export VIRTUAL_ENV="./" # the real stuff starts here, trace commands from now on set -x -avocado $VERBOSE run "$BUILD_TEST_DIR/build_test.py" \ +avocado $VERBOSE run "$TESTSUITE_DIR/build_test.py" \ -t $TAGS --test-runner=runner --disable-sysinfo \ -p quiet=$QUIET -p cross=$CROSS_BUILD diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test index 6416250..50051a7 100755 --- a/scripts/vm_smoke_test +++ b/scripts/vm_smoke_test @@ -14,7 +14,7 @@ ES_BUG=3 RET=$ES_FAIL # Get Avocado QEMU tests path -VM_TEST_DIR="$(dirname "$0")/../testsuite/vm_boot_test" +TESTSUITE_DIR="$(dirname "$0")/../testsuite" # Go to Isar root cd "$(dirname "$0")/.." @@ -95,7 +95,7 @@ logs_dir = $BUILD_DIR/job-results EOF export VIRTUAL_ENV="./" -if avocado $VERBOSE run "$VM_TEST_DIR/vm_boot_test.py" -t $TAGS \ +if avocado $VERBOSE run "$TESTSUITE_DIR/vm_boot_test.py" -t $TAGS \ --test-runner=runner --disable-sysinfo \ -p build_dir="$BUILD_DIR" -p time_to_wait=$TIMEOUT; then RET=$ES_OK diff --git a/testsuite/README.md b/testsuite/README.md index fcbea1e..b83a8f9 100644 --- a/testsuite/README.md +++ b/testsuite/README.md @@ -10,9 +10,29 @@ The framework could be installed by using standard HOWTO: # Run test -Each testsuite directory contains: - - run_*.sh - script to start tests - - *.py - test case +## Fast build test + +``` +$ avocado run build_test.py -t fast -p quiet=1 -p cross=1 +``` + +## Full build test + +``` +$ avocado run build_test.py -t full -p quiet=1 +``` + +## Fast boot test + +``` +$ avocado run vm_boot_test.py -t fast -p build_dir="$BUILDDIR" -p time_to_wait=300 +``` + +## Full boot test + +``` +$ avocado run vm_boot_test.py -t full -p build_dir="$BUILDDIR" -p time_to_wait=300 +``` # Other diff --git a/testsuite/build_test/build_test.py b/testsuite/build_test.py old mode 100644 new mode 100755 similarity index 100% rename from testsuite/build_test/build_test.py rename to testsuite/build_test.py diff --git a/testsuite/build_test/run_fast.sh b/testsuite/build_test/run_fast.sh deleted file mode 100755 index 4d1bf44..0000000 --- a/testsuite/build_test/run_fast.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -avocado run build_test.py -t fast -p quiet=1 -p cross=1 diff --git a/testsuite/build_test/run_full.sh b/testsuite/build_test/run_full.sh deleted file mode 100755 index af5ec59..0000000 --- a/testsuite/build_test/run_full.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -avocado run build_test.py -t full -p quiet=1 diff --git a/testsuite/build_test/cibase.py b/testsuite/cibase.py old mode 100644 new mode 100755 similarity index 97% rename from testsuite/build_test/cibase.py rename to testsuite/cibase.py index ae03aa7..35d3c65 --- a/testsuite/build_test/cibase.py +++ b/testsuite/cibase.py @@ -18,8 +18,8 @@ class CIBaseTest(CIBuilder): self.bitbake(targets, **kwargs) def perform_repro_test(self, targets, signed=False, **kwargs): - gpg_pub_key = os.path.dirname(__file__) + '/../base-apt/test_pub.key' - gpg_priv_key = os.path.dirname(__file__) + '/../base-apt/test_priv.key' + gpg_pub_key = os.path.dirname(__file__) + '/../keys/base-apt/test_pub.key' + gpg_priv_key = os.path.dirname(__file__) + '/../keys/base-apt/test_priv.key' self.configure(gpg_pub_key=gpg_pub_key if signed else None, **kwargs) diff --git a/testsuite/build_test/cibuilder.py b/testsuite/cibuilder.py old mode 100644 new mode 100755 similarity index 99% rename from testsuite/build_test/cibuilder.py rename to testsuite/cibuilder.py index 2cfb6ec..f0c4bc3 --- a/testsuite/build_test/cibuilder.py +++ b/testsuite/cibuilder.py @@ -10,7 +10,7 @@ from avocado import Test from avocado.utils import path from avocado.utils import process -isar_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) +isar_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) backup_prefix = '.ci-backup' app_log = logging.getLogger("avocado.app") diff --git a/testsuite/base-apt/test_priv.key b/testsuite/keys/base-apt/test_priv.key similarity index 100% rename from testsuite/base-apt/test_priv.key rename to testsuite/keys/base-apt/test_priv.key diff --git a/testsuite/base-apt/test_pub.key b/testsuite/keys/base-apt/test_pub.key similarity index 100% rename from testsuite/base-apt/test_pub.key rename to testsuite/keys/base-apt/test_pub.key diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test.py old mode 100644 new mode 100755 similarity index 98% rename from testsuite/vm_boot_test/vm_boot_test.py rename to testsuite/vm_boot_test.py index f8c655c..6c4e979 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test.py @@ -8,7 +8,6 @@ import time import tempfile from os.path import dirname -sys.path.append(dirname(__file__) + '/..') import start_vm diff --git a/testsuite/vm_boot_test/run_fast.sh b/testsuite/vm_boot_test/run_fast.sh deleted file mode 100755 index 0fc77b3..0000000 --- a/testsuite/vm_boot_test/run_fast.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -avocado run vm_boot_test.py -t fast -p build_dir="$BUILDDIR" -p time_to_wait=300 diff --git a/testsuite/vm_boot_test/run_full.sh b/testsuite/vm_boot_test/run_full.sh deleted file mode 100755 index a561a36..0000000 --- a/testsuite/vm_boot_test/run_full.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -avocado run vm_boot_test.py -t full -p build_dir="$BUILDDIR" -p time_to_wait=300 -- 2.25.1