From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7039647964761948160 X-Received: by 2002:a7b:c7cd:: with SMTP id z13mr17915073wmk.59.1639152785777; Fri, 10 Dec 2021 08:13:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f1c2:: with SMTP id z2ls2208968wro.2.gmail; Fri, 10 Dec 2021 08:13:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJCtuu5fg9z4aRrQgkdPMvTnqP4BKJaKFFlYiohrvX+vzhaAeD7VFee9otd0figgHrWaI4 X-Received: by 2002:a05:6000:250:: with SMTP id m16mr14678262wrz.459.1639152783596; Fri, 10 Dec 2021 08:13:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639152783; cv=pass; d=google.com; s=arc-20160816; b=zfTmA3gDKcZVsmZ8qD8uZXQ2LzxQtAdUeQ8rAPx5CTrRdG5B6oc3aVwtRg0O1JRaWT MJLrLI+ojMvfzov6Bs/WVRWKBZXViLYhV2aFIm7EatVlQq8gxmTXbETgRO/BFZ+GFsRw lRJJtmIZzkcRY7OO6ZO3Hc/1mRE9xP2nWpeYPrIAS//oFQQipI/KRg/Aa+2gOcbGPhe1 TKZhQuSiYOZVbIP5v6UDpiPbzKZSm5HKJ+dZoFXp+S+gxyQLBv/HdMT5K44vfGtOITeH /0FkDntaIkarTXKU74tHigbR93VC1vFa0ntnAuIh3UdbcX4+VeKeoxtBzNfG0F5XmH3h laIQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=UwfXFrMJCjznJy8nhk0RLQO6SBfChYJTV8vcpaCp6oc=; b=PF4OdG2z6IOs7h6lkM2PORAIW7/g33WbjaQzBQ2RKrO2MZJfl+mARHL064o03W+JYU 5VREbVG8dfBwzr9J/bWeCVET/TRi5RWz1ZYw4iIFeJAlIexwNX3+qGU86Ld6Mh4eP0eQ zGKWMC9QNqo8TLUWi/oCN7ACOQZQOZGOT4+ZGHRzkoGUtLWRstLfJMNln4W++/SvCCJq wbIKEVWPWzr0H/VpGvPSyMYvm+XBNX5g1fm8244ibZhGIh7X+Ao+41dNolC/LzlYRoR8 M00hXa3x5Av9XblOcgb+wY5dCilXyWvsRCAca/27ic+b45gppVj0vQNI7W8OMnUOO4UF I5ZQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=T25wgL8P; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.22.52 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2052.outbound.protection.outlook.com. [40.107.22.52]) by gmr-mx.google.com with ESMTPS id p5si194710wru.1.2021.12.10.08.13.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Dec 2021 08:13:03 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.22.52 as permitted sender) client-ip=40.107.22.52; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=T25wgL8P; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 40.107.22.52 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NN4O0rSdmiJhbl5EH7Q7xcD3FTukMOhno3lLo3Z76ZmSocWhX0+iRcB3cAJAjOOvAl+54k7Uh8I193MOlWQ15ut5bw0HbUBSFjOdZcoHyVbMrHeY6a0z9KquHO7DxyAMy2Ee1c82B6fYRWSQJ/rdvgyih1zghhksEKFW1lhEc7zg7qtDQ21YRKq4Q4rU436TlezjWFe4NKFYqwUq1iIqAGm4T6k2HD+6qradJBrB186wApEZ0ppM4XyZ8sQEbLiTVltqAl2PbZH4uyFJy7tQ9fWVsPsZJ45tmR4vX20wND6ON2joSM2pHISPrpwOAp+0wv/zmLQAJaNtLlnrCB+d4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UwfXFrMJCjznJy8nhk0RLQO6SBfChYJTV8vcpaCp6oc=; b=gFQCI2xo5jzDXKNRsgQjqbr7YERh8rnI0sSOcy2yikDjKsaEKofTnFBx4yd37MfZU4PRf8qgJOpe+RJYF8Gc2T6P+PVyZpgV8H/PvTq8OPT3HOn8XVJAdpyrOfBk3NtWwWtyO76f0XoTFuTO/GcYUnNhridncllp2E5PIeaNf3uyWlRDZ/zpPlhIPN+Lil60uoO5m7H18T+fX6XfukGhr2qRvyBXWn+7vWGppR+rF004mDLoVIV1GAHxFn/RrGyy0WjKgwic1gCY3rZP5H6CMfNxCWbSabJM3vBj8F6nOV/vCdE1PVDR/BMk2x99d3hINCcDaRL9XpAfXk5ie1niDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UwfXFrMJCjznJy8nhk0RLQO6SBfChYJTV8vcpaCp6oc=; b=T25wgL8PZBBPpr9vZt9YV2Ptx6tWpBMRVc5SAwMvM9K5QP7uZDL+3qhCnejyeFRdcdTqBAq1AQMagZvf4uin2mNa7BGBKipA2JFAjnWMn74l062tG0YEDKEAyo8F89QzaN4lnY1OOcmc5jqsSLAGs7PVNAe1Ecjls8jBi/c6yHBBX4P2lnuam+Xc5xs6F/4TUFV+RRkcdAzJJjQAW0s1V94Dfu803KEWs+ftzjVrH8dKFYKbxctRc2vubGT2h+gVe0T9g99HMIOks2d0SrBqnLkxM21vOeL5tcj0hmLr/RQkjhmWgeZDLgFP7PcLv3a177Gcj49j37xheJ6M0Iw/SQ== Received: from DB9PR01CA0011.eurprd01.prod.exchangelabs.com (2603:10a6:10:1d8::16) by AM5PR1001MB1203.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:203:12::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Fri, 10 Dec 2021 16:13:02 +0000 Received: from DB5EUR01FT057.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:1d8:cafe::4) by DB9PR01CA0011.outlook.office365.com (2603:10a6:10:1d8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Fri, 10 Dec 2021 16:13:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by DB5EUR01FT057.mail.protection.outlook.com (10.152.5.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Fri, 10 Dec 2021 16:13:01 +0000 Received: from DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Fri, 10 Dec 2021 17:13:01 +0100 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Fri, 10 Dec 2021 17:13:01 +0100 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3] testsuite: refactor Date: Fri, 10 Dec 2021 17:12:45 +0100 Message-ID: <20211210161245.3605431-1-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: adriaan.schmidt@siemens.com X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d79e2454-29d6-43c7-a54d-08d9bbf7f0ba X-MS-TrafficTypeDiagnostic: AM5PR1001MB1203:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZPxhhafoKSQkbt/v7ZRkvPA4QZ3zksbd9zF14cig06p2lCa+k39hE444Gf6nCzRi0Cm0q2klIEMZkfs8pQqi1Bq8oEpnfPUSZ5HpM27KhGgSvJbM7AxxSllGPyzWZmuhkMBsW8aaj5fUxZmvTZTWinoIm9BQ3pu5Qxo4O16IODuBZyFba25wmwlVENVzareTppihMkgCwpStjW9sBU69zF8k40snhP/YPv5YRJLzybnkIUgKUv2FO8VRPAB0/zBBeja0p7dWmWJ84OfAXLzp6bbyLZQTrVE5e6CdNcLTgX2qJbDrADLv1sqg8DPgEZSDsXT+3V41xqiMbQyYDtMbKl2/GU0Kgbdrj8BHoOMpwqNgPILXUVIN1EjB+Gbb5wzTJOzvDBhRIWrKLCU+wqPRlfTB8W8iIpBCSL8QUg9MhoeHa5XRpiEqUfvf5Fb6vcNhatUfPr/3D+YeVSsIrb6vhfCnhWl+AwKMA9hFFLKnT2kBLAZhR8LAf06YwYThN8S7L9GKp2DNsD3XcgbUkl8fFIMePA7wWdQ0wB9jf5MRlB2tLB6+YcICUCh/CQgNF6gweOW607+Bqm+/Wj9t4T+JrF0RD0hbW64CriS1Wfgv0DpclHtTnQagW7a6CW4gbMfwMeAaFvBC0VFRlTLjB+X+LBpz9gEEsCEvCfjLKLZMujxnd+AYJjEY7D6W5Nhnx2FiT6weaiQOr36SBt5+spMpYA== X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(316002)(956004)(70206006)(2906002)(70586007)(44832011)(2616005)(7596003)(36756003)(7636003)(356005)(83380400001)(186003)(107886003)(1076003)(16526019)(26005)(5660300002)(336012)(6666004)(30864003)(82310400004)(6916009)(8676002)(82960400001)(47076005)(36860700001)(86362001)(8936002)(508600001)(4326008);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2021 16:13:01.8934 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d79e2454-29d6-43c7-a54d-08d9bbf7f0ba X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT057.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR1001MB1203 X-TUID: F26g79YO+yeG - make test initialization more explicit. tests now call init() to initialize build_dir and environment, and configure() to generate the config file and bitbake_args - only configure() touches the config file. if config needs to change during one test case, it is created from scratch (no appending by the test case itself). - build_dir is not passed via avocado parameter. each test can set it in the call to init(). this makes dependencies between tests explicit and permits parallelization. - in the main invocation script, rename --build to --base. what we're setting here is not the bitbake build_dir but the base dir for avocado test output. Signed-off-by: Adriaan Schmidt --- scripts/ci_build.sh | 22 +++--- testsuite/build_test/build_test.py | 42 ++++++----- testsuite/build_test/cibase.py | 97 +++++++------------------ testsuite/build_test/cibuilder.py | 109 +++++++++++++++++++++-------- 4 files changed, 141 insertions(+), 129 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index e9ba034..339ebca 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -27,8 +27,8 @@ fi # Get Avocado build tests path BUILD_TEST_DIR="$(pwd)/testsuite/build_test" -# Start build in Isar tree by default -BUILD_DIR=./build +# Start tests in current path by default +BASE_DIR=./build # Check dependencies DEPENDENCIES="umoci skopeo" @@ -45,8 +45,8 @@ show_help() { echo " $0 [params]" echo echo "Parameters:" - echo " -b, --build BUILD_DIR set path to build directory. If not set," - echo " the build will be started in current path." + echo " -b, --base BASE_DIR set path to base directory. If not set," + echo " the tests will be started in current path." echo " -c, --cross enable cross-compilation." echo " -d, --debug enable debug bitbake output." echo " -f, --fast cross build reduced set of configurations." @@ -73,8 +73,8 @@ do show_help exit 0 ;; - -b|--build) - BUILD_DIR="$2" + -b|--base) + BASE_DIR="$2" shift ;; -c|--cross) @@ -117,10 +117,10 @@ fi mkdir -p .config/avocado cat < .config/avocado/avocado.conf [datadir.paths] -base_dir = $(realpath $BUILD_DIR)/ -test_dir = $(realpath $BUILD_DIR)/tests -data_dir = $(realpath $BUILD_DIR)/data -logs_dir = $(realpath $BUILD_DIR)/job-results +base_dir = $(realpath $BASE_DIR)/ +test_dir = $(realpath $BASE_DIR)/tests +data_dir = $(realpath $BASE_DIR)/data +logs_dir = $(realpath $BASE_DIR)/job-results EOF export VIRTUAL_ENV="./" @@ -129,4 +129,4 @@ set -x avocado $VERBOSE run "$BUILD_TEST_DIR/build_test.py" \ -t $TAGS --test-runner=runner --disable-sysinfo \ - -p build_dir="$BUILD_DIR" -p quiet=$QUIET -p cross=$CROSS_BUILD + -p quiet=$QUIET -p cross=$CROSS_BUILD diff --git a/testsuite/build_test/build_test.py b/testsuite/build_test/build_test.py index de9e3fc..95a2e01 100644 --- a/testsuite/build_test/build_test.py +++ b/testsuite/build_test/build_test.py @@ -30,7 +30,8 @@ class ReproTest(CIBaseTest): 'mc:qemuarm64-stretch:isar-image-base' ] - self.perform_repro_test(targets, 1) + self.init() + self.perform_repro_test(targets, signed=True) def test_repro_unsigned(self): targets = [ @@ -38,7 +39,8 @@ class ReproTest(CIBaseTest): 'mc:qemuarm-stretch:isar-image-base' ] - self.perform_repro_test(targets, 0) + self.init() + self.perform_repro_test(targets) class CcacheTest(CIBaseTest): @@ -49,6 +51,7 @@ class CcacheTest(CIBaseTest): """ def test_ccache_rebuild(self): targets = ['mc:de0-nano-soc-buster:isar-image-base'] + self.init() self.perform_ccache_test(targets) class CrossTest(CIBaseTest): @@ -69,15 +72,17 @@ class CrossTest(CIBaseTest): 'mc:rpi-stretch:isar-image-base' ] - self.perform_build_test(targets, 1, None) + self.init() + self.perform_build_test(targets, cross=True) def test_cross_ubuntu(self): targets = [ 'mc:qemuarm64-focal:isar-image-base' ] + self.init() try: - self.perform_build_test(targets, 1, None) + self.perform_build_test(targets, cross=True) except: self.cancel('KFAIL') @@ -86,8 +91,9 @@ class CrossTest(CIBaseTest): 'mc:qemuarm-bullseye:isar-image-base' ] + self.init() try: - self.perform_build_test(targets, 1, None) + self.perform_build_test(targets, cross=True) except: self.cancel('KFAIL') @@ -101,7 +107,8 @@ class SdkTest(CIBaseTest): def test_sdk(self): targets = ['mc:qemuarm-stretch:isar-image-base'] - self.perform_build_test(targets, 1, 'do_populate_sdk') + self.init() + self.perform_build_test(targets, bitbake_cmd='do_populate_sdk') class NoCrossTest(CIBaseTest): @@ -130,11 +137,10 @@ class NoCrossTest(CIBaseTest): 'mc:virtualbox-ova-buster:isar-image-base' ] + self.init() # Cleanup after cross build - self.deletetmp(self.params.get('build_dir', - default=os.path.dirname(__file__) + '/../../build')) - - self.perform_build_test(targets, 0, None) + self.delete_from_build_dir('tmp') + self.perform_build_test(targets, cross=False) def test_nocross_bullseye(self): targets = [ @@ -145,8 +151,9 @@ class NoCrossTest(CIBaseTest): 'mc:hikey-bullseye:isar-image-base' ] + self.init() try: - self.perform_build_test(targets, 0, None) + self.perform_build_test(targets, cross=False) except: self.cancel('KFAIL') @@ -158,8 +165,7 @@ class RebuildTest(CIBaseTest): :avocado: tags=rebuild,fast,full """ def test_rebuild(self): - is_cross_build = int(self.params.get('cross', default=0)) - + self.init() layerdir_core = self.getlayerdir('core') dpkgbase_file = layerdir_core + '/classes/dpkg-base.bbclass' @@ -169,8 +175,7 @@ class RebuildTest(CIBaseTest): file.write('do_fetch_append() {\n\n}') try: - self.perform_build_test('mc:qemuamd64-stretch:isar-image-base', - is_cross_build, None) + self.perform_build_test('mc:qemuamd64-stretch:isar-image-base') finally: self.restorefile(dpkgbase_file) @@ -186,6 +191,7 @@ class WicTest(CIBaseTest): wks_path = '/scripts/lib/wic/canned-wks/sdimage-efi.wks' wic_path = '/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img' + self.init() self.perform_wic_test('mc:qemuamd64-stretch:isar-image-base', wks_path, wic_path) @@ -204,7 +210,8 @@ class ContainerImageTest(CIBaseTest): 'mc:container-amd64-bullseye:isar-image-base' ] - self.perform_container_test(targets, None) + self.init() + self.perform_build_test(targets, container=True) class ContainerSdkTest(CIBaseTest): @@ -217,4 +224,5 @@ class ContainerSdkTest(CIBaseTest): def test_container_sdk(self): targets = ['mc:container-amd64-stretch:isar-image-base'] - self.perform_container_test(targets, 'do_populate_sdk') + self.init() + self.perform_build_test(targets, bitbake_cmd='do_populate_sdk', container=True) diff --git a/testsuite/build_test/cibase.py b/testsuite/build_test/cibase.py index 0b053aa..6285b7e 100644 --- a/testsuite/build_test/cibase.py +++ b/testsuite/build_test/cibase.py @@ -8,50 +8,21 @@ import time from cibuilder import CIBuilder from avocado.utils import process -isar_root = os.path.dirname(__file__) + '/../..' - class CIBaseTest(CIBuilder): - - def prep(self, testname, targets, cross, debsrc_cache): - build_dir = self.params.get('build_dir', default=isar_root + '/build') - build_dir = os.path.realpath(build_dir) - quiet = int(self.params.get('quiet', default=0)) - bitbake_args = '-v' - - if quiet: - bitbake_args = '' - - self.log.info('===================================================') - self.log.info('Running ' + testname + ' test for:') - self.log.info(targets) - self.log.info('Isar build folder is: ' + build_dir) - self.log.info('===================================================') - - self.init(build_dir) - self.confprepare(build_dir, 1, cross, debsrc_cache) - - return build_dir, bitbake_args; - - def perform_build_test(self, targets, cross, bitbake_cmd): - build_dir, bb_args = self.prep('Isar build', targets, cross, 1) + def perform_build_test(self, targets, **kwargs): + self.configure(**kwargs) self.log.info('Starting build...') - self.bitbake(build_dir, targets, bitbake_cmd, bb_args) - - def perform_repro_test(self, targets, signed): - cross = int(self.params.get('cross', default=0)) - build_dir, bb_args = self.prep('repro Isar build', targets, cross, 0) + 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' - if signed: - with open(build_dir + '/conf/ci_build.conf', 'a') as file: - # Enable use of signed cached base repository - file.write('BASE_REPO_KEY="file://' + gpg_pub_key + '"\n') + self.configure(gpg_pub_key=gpg_pub_key if signed else None, **kwargs) - os.chdir(build_dir) + os.chdir(self.build_dir) os.environ['GNUPGHOME'] = tempfile.mkdtemp() result = process.run('gpg --import %s %s' % (gpg_pub_key, gpg_priv_key)) @@ -59,33 +30,30 @@ class CIBaseTest(CIBuilder): if result.exit_status: self.fail('GPG import failed') - self.bitbake(build_dir, targets, None, bb_args) + self.bitbake(targets, **kwargs) - self.deletetmp(build_dir) - with open(build_dir + '/conf/ci_build.conf', 'a') as file: - file.write('ISAR_USE_CACHED_BASE_REPO = "1"\n') - file.write('BB_NO_NETWORK = "1"\n') + self.delete_from_build_dir('tmp') + self.configure(gpg_pub_key=gpg_pub_key if signed else None, offline=True, **kwargs) - self.bitbake(build_dir, targets, None, bb_args) + self.bitbake(targets, **kwargs) # Disable use of cached base repository - self.confcleanup(build_dir) + self.unconfigure() if not signed: # Try to build with changed configuration with no cleanup - self.bitbake(build_dir, targets, None, bb_args) + self.bitbake(targets, **kwargs) # Cleanup - self.deletetmp(build_dir) + self.delete_from_build_dir('tmp') - def perform_wic_test(self, targets, wks_path, wic_path): - cross = int(self.params.get('cross', default=0)) - build_dir, bb_args = self.prep('WIC exclude build', targets, cross, 1) + def perform_wic_test(self, targets, wks_path, wic_path, **kwargs): + self.configure(**kwargs) layerdir_isar = self.getlayerdir('isar') wks_file = layerdir_isar + wks_path - wic_img = build_dir + wic_path + wic_img = self.build_dir + wic_path if not os.path.isfile(wic_img): self.fail('No build started before: ' + wic_img + ' not exist') @@ -101,42 +69,29 @@ class CIBaseTest(CIBuilder): line)) try: - self.bitbake(build_dir, targets, None, bb_args) + self.bitbake(targets, **kwargs) finally: self.restorefile(wks_file) self.restorefile(wic_img) - def perform_container_test(self, targets, bitbake_cmd): - cross = int(self.params.get('cross', default=0)) - build_dir, bb_args = self.prep('Isar Container', targets, cross, 1) - - self.containerprep(build_dir) - - self.bitbake(build_dir, targets, bitbake_cmd, bb_args) - - - def perform_ccache_test(self, targets): - build_dir, bb_args = self.prep('Isar ccache build', targets, 0, 0) - - self.deletetmp(build_dir) - process.run('rm -rf ' + build_dir + '/ccache', sudo=True) + def perform_ccache_test(self, targets, **kwargs): + self.configure(ccache=True, **kwargs) - with open(build_dir + '/conf/ci_build.conf', 'a') as file: - file.write('USE_CCACHE = "1"\n') - file.write('CCACHE_TOP_DIR = "${TOPDIR}/ccache"') + self.delete_from_build_dir('tmp') + self.delete_from_build_dir('ccache') self.log.info('Starting build and filling ccache dir...') start = time.time() - self.bitbake(build_dir, targets, None, bb_args) + self.bitbake(targets, **kwargs) first_time = time.time() - start self.log.info('Non-cached build: ' + str(round(first_time)) + 's') - self.deletetmp(build_dir) + self.delete_from_build_dir('tmp') self.log.info('Starting build and using ccache dir...') start = time.time() - self.bitbake(build_dir, targets, None, bb_args) + self.bitbake(targets, **kwargs) second_time = time.time() - start self.log.info('Cached build: ' + str(round(second_time)) + 's') @@ -145,5 +100,5 @@ class CIBaseTest(CIBuilder): self.fail('No speedup after rebuild with ccache') # Cleanup - self.deletetmp(build_dir) - process.run('rm -rf ' + build_dir + '/ccache', sudo=True) + self.delete_from_build_dir('tmp') + self.delete_from_build_dir('ccache') diff --git a/testsuite/build_test/cibuilder.py b/testsuite/build_test/cibuilder.py index 94786c7..2cfb6ec 100644 --- a/testsuite/build_test/cibuilder.py +++ b/testsuite/build_test/cibuilder.py @@ -2,7 +2,6 @@ import logging import os -import re import select import shutil import subprocess @@ -11,7 +10,7 @@ from avocado import Test from avocado.utils import path from avocado.utils import process -isar_root = 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") @@ -28,17 +27,60 @@ class CIBuilder(Test): self._file_handler.setFormatter(formatter) app_log.addHandler(self._file_handler) - def init(self, build_dir): + def init(self, build_dir='build'): + # initialize build_dir and setup environment + # needs to run once (per test case) + if hasattr(self, 'build_dir'): + self.error("Broken test implementation: init() called multiple times.") + self.build_dir = os.path.join(isar_root, build_dir) os.chdir(isar_root) - path.usable_rw_dir(build_dir) + path.usable_rw_dir(self.build_dir) output = process.getoutput('/bin/bash -c "source isar-init-build-env \ - %s 2>&1 >/dev/null; env"' % build_dir) + %s 2>&1 >/dev/null; env"' % self.build_dir) env = dict(((x.split('=', 1) + [''])[:2] \ for x in output.splitlines() if x != '')) os.environ.update(env) - def confprepare(self, build_dir, compat_arch, cross, debsrc_cache): - with open(build_dir + '/conf/ci_build.conf', 'w') as f: + def check_init(self): + if not hasattr(self, 'build_dir'): + self.error("Broken test implementation: need to call init().") + + def configure(self, compat_arch=True, cross=None, debsrc_cache=True, + container=False, ccache=False, sstate=False, offline=False, + gpg_pub_key=None, **kwargs): + # write configuration file and set bitbake_args + # can run multiple times per test case + self.check_init() + + # get parameters from avocado cmdline + quiet = bool(int(self.params.get('quiet', default=0))) + if cross is None: + cross = bool(int(self.params.get('cross', default=0))) + + # get parameters from environment + distro_apt_premir = os.getenv('DISTRO_APT_PREMIRRORS') + + self.log.info(f'===================================================\n' + f'Configuring build_dir {self.build_dir}\n' + f' compat_arch = {compat_arch}\n' + f' cross = {cross}\n' + f' debsrc_cache = {debsrc_cache}\n' + f' offline = {offline}\n' + f' container = {container}\n' + f' ccache = {ccache}\n' + f' sstate = {sstate}\n' + f' gpg_pub_key = {gpg_pub_key}\n' + f'===================================================') + + # determine bitbake_args + self.bitbake_args = [] + if not quiet: + self.bitbake_args.append('-v') + if not sstate: + self.bitbake_args.append('--no-setscene') + + # write ci_build.conf + with open(self.build_dir + '/conf/ci_build.conf', 'w') as f: if compat_arch: f.write('ISAR_ENABLE_COMPAT_ARCH_amd64 = "1"\n') f.write('ISAR_ENABLE_COMPAT_ARCH_arm64 = "1"\n') @@ -48,36 +90,45 @@ class CIBuilder(Test): f.write('ISAR_CROSS_COMPILE = "1"\n') if debsrc_cache: f.write('BASE_REPO_FEATURES = "cache-deb-src"\n') - distro_apt_premir = os.getenv('DISTRO_APT_PREMIRRORS') + if offline: + f.write('ISAR_USE_CACHED_BASE_REPO = "1"\n') + f.write('BB_NO_NETWORK = "1"\n') + if container: + f.write('SDK_FORMATS = "docker-archive"\n') + f.write('IMAGE_INSTALL_remove = "example-module-${KERNEL_NAME} enable-fsck"\n') + if gpg_pub_key: + f.write('BASE_REPO_KEY="file://' + gpg_pub_key + '"\n') if distro_apt_premir: f.write('DISTRO_APT_PREMIRRORS = "%s"\n' % distro_apt_premir) - with open(build_dir + '/conf/local.conf', 'r+') as f: + # include ci_build.conf in local.conf + with open(self.build_dir + '/conf/local.conf', 'r+') as f: for line in f: if 'include ci_build.conf' in line: break else: f.write('\ninclude ci_build.conf') - def containerprep(self, build_dir): - with open(build_dir + '/conf/ci_build.conf', 'a') as f: - f.write('SDK_FORMATS = "docker-archive"\n') - f.write('IMAGE_INSTALL_remove = "example-module-${KERNEL_NAME} enable-fsck"\n') + def unconfigure(self): + self.check_init() + open(self.build_dir + '/conf/ci_build.conf', 'w').close() - def confcleanup(self, build_dir): - open(build_dir + '/conf/ci_build.conf', 'w').close() + def delete_from_build_dir(self, path): + self.check_init() + process.run('rm -rf ' + self.build_dir + '/' + path, sudo=True) - def deletetmp(self, build_dir): - process.run('rm -rf ' + build_dir + '/tmp', sudo=True) - - def bitbake(self, build_dir, target, cmd, args): - os.chdir(build_dir) + def bitbake(self, target, bitbake_cmd=None, **kwargs): + self.check_init() + self.log.info('===================================================') + self.log.info('Building ' + str(target)) + self.log.info('===================================================') + os.chdir(self.build_dir) cmdline = ['bitbake'] - if args: - cmdline.append(args) - if cmd: + if self.bitbake_args: + cmdline.extend(self.bitbake_args) + if bitbake_cmd: cmdline.append('-c') - cmdline.append(cmd) + cmdline.append(bitbake_cmd) if isinstance(target, list): cmdline.extend(target) else: @@ -103,30 +154,28 @@ class CIBuilder(Test): self.fail('Bitbake failed') def backupfile(self, path): + self.check_init() try: shutil.copy2(path, path + backup_prefix) except FileNotFoundError: self.log.warn(path + ' not exist') def backupmove(self, path): + self.check_init() try: shutil.move(path, path + backup_prefix) except FileNotFoundError: self.log.warn(path + ' not exist') def restorefile(self, path): + self.check_init() try: shutil.move(path + backup_prefix, path) except FileNotFoundError: self.log.warn(path + backup_prefix + ' not exist') def getlayerdir(self, layer): - try: - path.find_command('bitbake') - except path.CmdNotFoundError: - build_dir = self.params.get('build_dir', - default=isar_root + '/build') - self.init(build_dir) + self.check_init() output = process.getoutput('bitbake -e | grep "^LAYERDIR_.*="') env = dict(((x.split('=', 1) + [''])[:2] \ for x in output.splitlines() if x != '')) -- 2.30.2