From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7067458073866010624 X-Received: by 2002:a9d:7441:0:b0:5af:223d:fe0e with SMTP id p1-20020a9d7441000000b005af223dfe0emr3205099otk.299.1645520812109; Tue, 22 Feb 2022 01:06:52 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6830:2456:b0:5af:5a9b:4f3 with SMTP id x22-20020a056830245600b005af5a9b04f3ls437847otr.2.gmail; Tue, 22 Feb 2022 01:06:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzM4QV6kOT++bL/26F0y0x7WKZUYAJodydaN4gH83T/Ehfg7RQ1i5+4t/NPuGsyhKcBzHB8 X-Received: by 2002:a9d:da6:0:b0:59f:a2fa:a158 with SMTP id 35-20020a9d0da6000000b0059fa2faa158mr7627842ots.20.1645520811561; Tue, 22 Feb 2022 01:06:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1645520811; cv=pass; d=google.com; s=arc-20160816; b=IyYLeto1hhEuqCN7aL+Bq6x/ZBgU0HCGx0tanlyPUuSAaLDCi3wSjPt67cRRCf/Eo2 yhohJH2Ooh18tGuiNaq+nABjQQgSUfBk+pgLZNuDGLt2xzMrPFRJKYe6UbPH7Clhbn97 aeg5DC7pkj7NQrWKTkiJN+IO9/V6uJLKJi1Kb//UFCXqlv3HDAFAC20ontkd4U1nR3p+ CcLJu20qNsxkiVzAm8i9Kg42BsK5NOh1oEW3uRIGGu7lz/3wCD8IeV4n7qFmKvRSlKD8 NxR3388IPJcAraPrDRB2wrhg3W0sYsCO6n9W+CIzna/GoWNd0baB+he9NljV2t/s1Z9l ASnw== ARC-Message-Signature: i=2; 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:dkim-signature; bh=0AyeQFJI06rBIj9mKfsIcBZpqidVI5nxnWtBaVci9N4=; b=d4hU3Uie5gLFHtxyqO3WjhhWkBI/8TIyGUaIHCs5YY++q4Q3oAE+yQlWCbJR19C3Uj JLPa87fpAqz8NBjMrECfexHq0roTa+gRyAAaxq1rNCnoHgwcOP57IxnWezv39on/CE0T tjM7vdjtKhJY/IBfyZB8Q9nWHp2D2XNiHfzgdxNnYeukR7bq+TUtIGzdy5WG3NODXg5r gCvXg7Gkns+bVC31/IbYBgvOtP88FtR8ZhQBWP+mp7EI+vSBWi5E3j9QlVdBsR2hiiei 1j69qJhMaU3XdyF1iHycEM/rB5D26qX5izPbV/eNROruObWo35I8gX+poAh9Lgn8aMzF KB2Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="NW4d/ZNg"; 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 2a01:111:f400:fe0e::624 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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0624.outbound.protection.outlook.com. [2a01:111:f400:fe0e::624]) by gmr-mx.google.com with ESMTPS id h16si1143908otg.5.2022.02.22.01.06.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Feb 2022 01:06:51 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0e::624 as permitted sender) client-ip=2a01:111:f400:fe0e::624; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="NW4d/ZNg"; 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 2a01:111:f400:fe0e::624 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=D54XnUwwa5XrCKIKLWpHZfq0nvpYZ4Xjx+k+ZlQwf8dXKc9Vqh8PZ3WTBfhzCUplLInDVRQb1MdFUUzVQJ1s2vaQk8E5q0d7QlwGxbg6QkMbyzkD+HYnXyjIkV4ZPQYvLFhrxvQB43JssqHBQVHRCVmLJsfhnZM2r6l3qbuU+Zbf+U2HyxekgZrypvWAsDr3Y5SA6jKaX8lEdjVJbkVgghxhHMuTJElEg5eVF4B7SnQf01oftCka9u+T232p6esG9Gbv2w8FHk8y3+AVV6UeiteB+Rr8/gs2i4ZL7aFPdhxfiKWsVC3zB/xjzMF0Kj2/FltrZUNIOfkGKuSc/BzHKQ== 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=0AyeQFJI06rBIj9mKfsIcBZpqidVI5nxnWtBaVci9N4=; b=aDS7nR/PUDHpLXBh6TbxC6r0GCWGNardbn2CHMdeOQ5AbYdbIubHSFrePrFwlDh/h3NkcwqevBoJrCWsh3Dlr4DzQmcmCmfpT4t/7F0MTUg3nCAMp4klaXHyIUQUEQ6TERcB6v0qQiF4nbVQEr3TaqbILHX2WkB/NpYXYjeWrwfe17bu1EgNNd4ABS84RXmKDVDDN88RxCUA2sA/LaSfkiYEd4tIHn2m7pLBw7C9Vw4sHsh19TwENQ4g9SYF1fBCWoW4cVWjc/dcUAdSH3tZ0GrNmPcZCV6uiawCyiIKRAoLRvbfhWvOZ8kanRDuj6fXqyP8uczriY1qZIp+B2grww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) 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=0AyeQFJI06rBIj9mKfsIcBZpqidVI5nxnWtBaVci9N4=; b=NW4d/ZNgEETJ3h0YART/nM6g5QfXJ6AkDi3Ece6QeakK9gTXDmwGRmmvqehIW68RBNuAaLe2GRIjArAl5+yKagGEbiqE0YvSMwlQP949+z7GbVvPYHIVma1tV1QJesZgfrb5SGBUHBHUmJmeQV+dAbD4vuxzRs6ts7IiI5k6LJrffWlCt6YjJVgC0r589pU+FbTslytCriJ79FNwyFuKXx2sMUEJIz2mdnG4lcYxl7Q60mdWzkASoxLp7jzSc9nZSA5x8OjQSeRoSN5e0UIRTXBuhLz6TaGMasnst48Yh6TdGFy9+4Jvk1X8ZJOQNDuoVznuktBj4IiGN+W0PakdVQ== Received: from AS8PR05CA0013.eurprd05.prod.outlook.com (2603:10a6:20b:311::18) by AM7PR10MB3494.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:132::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.21; Tue, 22 Feb 2022 09:06:48 +0000 Received: from VE1EUR01FT025.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:311:cafe::1f) by AS8PR05CA0013.outlook.office365.com (2603:10a6:20b:311::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.27 via Frontend Transport; Tue, 22 Feb 2022 09:06:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) 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.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by VE1EUR01FT025.mail.protection.outlook.com (10.152.2.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4995.20 via Frontend Transport; Tue, 22 Feb 2022 09:06:48 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 10:06:48 +0100 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Feb 2022 10:06:47 +0100 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v2 1/3] testsuite: refactor Date: Tue, 22 Feb 2022 10:06:26 +0100 Message-ID: <20220222090628.2174022-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222090628.2174022-1-adriaan.schmidt@siemens.com> References: <20220222090628.2174022-1-adriaan.schmidt@siemens.com> 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 DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ebfce0f6-0a0c-4ca6-5015-08d9f5e2a862 X-MS-TrafficTypeDiagnostic: AM7PR10MB3494:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N7m4NgzxlDGoEjJoSyn0cJLc77/j+wdQlZY8VWzPx2MygChQQcgIrn6xzzU8DcRaHntAPUgesqGJbvDCX1T4zeN994+PRxjddblcVW2YM6HOF/xVU3JqP16zjkWfjetDp8S1/Clgo8aAcBeAA7imakoz0ZQZS1DOBnI0sp2rfXlFFO5udA70PvqGZIARf4OFzWnZB5UVVgZvzgce4iffsEdwyL9nMuT48fUJisx7SmSVmufcXPKaoX8BBhdPKhdKxiZrQ4SXAKIJBulxOSGsS8BDAyr4CO31Mo2HHnrDZ2TJ1pd7N9q9sj/X4xEM1NjvTrkJO1/M6lQLAGBBoJA0ihlSxpRk/r/fdxQDDhfXEJOPuJqacCJqZYhzkMIdln0dQypT+WVIKSw53gXC6IVqgRWxLAavwU/MlbiwK9tTa4ZOXELCdU37Q+ohJE3MWbNpmOgFYr8PCoK5jkh/Q5Hy9ICMA2kUH1R37pFxnyJYjEyKSwQntf0eEqVWyUfGC+0OgOcYGr5w6qMyAWCH6q1z+OL/aBz79JqF9d88vIh0UvRYQ7aGcPWs1h8eqJe0RdhGheKcIVvK0Hp0wL7Hz7KK7APLhLCKHpLx0JHewnZ3w7ucSXW2Bs9PVThloY6v4V/8khNJNeqiLLxgTkxXd0w8ABk5CBx4CFUvRMMmBIe9MrgJeGIxPKpNYliTRDdtZwFsNanrR+RLPyY9I1H4S9PI2Q== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(4326008)(70206006)(8936002)(8676002)(36756003)(70586007)(47076005)(6666004)(316002)(30864003)(40460700003)(5660300002)(44832011)(6916009)(86362001)(508600001)(26005)(107886003)(83380400001)(2616005)(82960400001)(356005)(81166007)(2906002)(82310400004)(16526019)(956004)(186003)(1076003)(336012)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2022 09:06:48.5541 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ebfce0f6-0a0c-4ca6-5015-08d9f5e2a862 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.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT025.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3494 X-TUID: yWfjjTLOfujV - 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 | 41 ++++++----- testsuite/build_test/cibase.py | 81 ++++++--------------- testsuite/build_test/cibuilder.py | 109 +++++++++++++++++++++-------- 4 files changed, 134 insertions(+), 119 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index e9ba0349..339ebcac 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 16f6d0a3..ec1bb311 100644 --- a/testsuite/build_test/build_test.py +++ b/testsuite/build_test/build_test.py @@ -30,7 +30,8 @@ class ReproTest(CIBaseTest): 'mc:qemuarm64-bullseye: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-bullseye: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-bullseye:isar-image-base'] + self.init() self.perform_ccache_test(targets) class CrossTest(CIBaseTest): @@ -68,15 +71,17 @@ class CrossTest(CIBaseTest): 'mc:rpi-arm-v7-bullseye: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') @@ -85,8 +90,9 @@ class CrossTest(CIBaseTest): 'mc:qemuarm-bookworm:isar-image-base' ] + self.init() try: - self.perform_build_test(targets, 1, None) + self.perform_build_test(targets, cross=True) except: self.cancel('KFAIL') @@ -100,7 +106,8 @@ class SdkTest(CIBaseTest): def test_sdk(self): targets = ['mc:qemuarm-bullseye: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): @@ -138,11 +145,10 @@ class NoCrossTest(CIBaseTest): 'mc:qemuamd64-focal: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_bookworm(self): targets = [ @@ -153,8 +159,9 @@ class NoCrossTest(CIBaseTest): 'mc:hikey-bookworm:isar-image-base' ] + self.init() try: - self.perform_build_test(targets, 0, None) + self.perform_build_test(targets, cross=False) except: self.cancel('KFAIL') @@ -177,8 +184,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' @@ -188,8 +194,7 @@ class RebuildTest(CIBaseTest): file.write('do_fetch_append() {\n\n}') try: - self.perform_build_test('mc:qemuamd64-bullseye:isar-image-base', - is_cross_build, None) + self.perform_build_test('mc:qemuamd64-bullseye:isar-image-base') finally: self.restorefile(dpkgbase_file) @@ -209,7 +214,8 @@ class ContainerImageTest(CIBaseTest): 'mc:container-amd64-bookworm:isar-image-base' ] - self.perform_container_test(targets, None) + self.init() + self.perform_build_test(targets, container=True) class ContainerSdkTest(CIBaseTest): @@ -222,4 +228,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 33bddfda..49d34de1 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,22 @@ 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) - - 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) - + self.delete_from_build_dir('tmp') def perform_ccache_test(self, targets): build_dir, bb_args = self.prep('Isar ccache build', targets, 0, 0) @@ -93,21 +53,20 @@ class CIBaseTest(CIBuilder): self.deletetmp(build_dir) process.run('rm -rf ' + build_dir + '/ccache', sudo=True) - 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') @@ -116,5 +75,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 94786c78..2cfb6ece 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