From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7039701830157205504 X-Received: by 2002:a05:600c:1e8b:: with SMTP id be11mr7411654wmb.40.1639058308585; Thu, 09 Dec 2021 05:58:28 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fe0b:: with SMTP id n11ls402713wrr.0.gmail; Thu, 09 Dec 2021 05:58:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGfyKNdo8rYrFmEmXbZ6MxY0wMaYhtgg3ZZtlJ0ncfmtSrVdG2G2ZDJkUd6WXniKKLVj/I X-Received: by 2002:adf:e7c2:: with SMTP id e2mr6280286wrn.349.1639058307680; Thu, 09 Dec 2021 05:58:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639058307; cv=pass; d=google.com; s=arc-20160816; b=bVqfXLecoaJ6MIxWS/Szf4m1jDPuXRvxekywA/xOz1sYL8bCegjBL+2gz9ZcqMZleo bCxR7Lp5smkJbpSpe4pFOwzgTTn5LiP/sH2/f37pVQ1wn5Yjyo3eD5re5ylcjSotWW5U hxbtUgASIa5V+jsArDzG0CKvujM+2H3s6sO1aBtm6Ddxz5R85XQ1DNI+2F7vakBi4YUW f4jMNUCAucfi5d9Hl961uXcpLPcGVXXxZ071K6Ew909v3q09n0Y9EQKrRXBSlS0ZX2tr TEQyOpkkf732wDfOoCRrJg9ue3Ju6AkFfh0OnivZCpItzn1diG0NRTXok4nsjNUJBG3j p/Cw== 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=Hjq9JqwC0pzjvObo213dgXGHBHmI7dNxNYMebDoxmpg=; b=ek/iq31E9adDSFlpjLbSbZg8cUWus2Pa8qDhvoo5C1VYMx4T2deaeShTMGF2jssj7I H8ceU6WuTCovKvoS39TjwcH1j7m/k8bkIIO8mkl/Bet1qNvhytHcDUZrXEZM2iKuZ8br lKF9Y7dlKpPKhGmfcK8+bg5iDgVuQ0sfmLFepQqw9z4MJl8RRJQ6PceCf8sZUlq96ECg Oggh3k6dS/Wzvv3e9fyH+euQlIb7ACLpmTX6CX/iJK0Qp9vn1KHfss7Q+DcAxE9kNFc1 QEevyTx5BBruGk9yXC+977C0p3SpIy/Oq1gNP0x5zL+qiD+6Y/dGu2cmnlALAAuD9lor LvwA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=wTJJAbTz; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7d00::60a as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2060a.outbound.protection.outlook.com. [2a01:111:f400:7d00::60a]) by gmr-mx.google.com with ESMTPS id c10si469226wmq.4.2021.12.09.05.58.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Dec 2021 05:58:27 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7d00::60a as permitted sender) client-ip=2a01:111:f400:7d00::60a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=wTJJAbTz; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7d00::60a as permitted sender) smtp.mailfrom=henning.schild@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=iyajeBABZTnsL9ooNpAFM9BG5fup/tclCp2EVW7uOZ1LN17idS62RwjQq/lD7HwGZxAd7o7+Euf9MX5ofatNk54QPHUjkKdE9hMIWcvBTk5IssKCzRCdsbXONHHompp2hdRpC5fcPcS/HJ77pZfIEK72OjnIx0qMK9ZucCx9P7MDgHaKbQWXJ/yUqppQi1IIHO9HFnAcgCsukteIqG6RI5vtT0bqf7iaUlr/SZJGQX+nezwOj5nMv6jg4sLAP8X/8cmTU7xKyjZcIKUlYD4D+TVEd5ZQN/nKx77kF0T8J7E0tqffnrX4OmhX3sCtYaT6uk83n/Bv9vNXANMldSvGDA== 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=Hjq9JqwC0pzjvObo213dgXGHBHmI7dNxNYMebDoxmpg=; b=ZBJtnFGBVuRfrbMLCfubEdWtwNNw6zrXuDXVyk725oVri0uh+1+MOJPHOZWA5XqWh11TxUAMYZox7CjF9li3dgGBZCCkwYFmah/1s253w0RIb1moQ71qVP+HfporoCea+1C9Rzehd97Hdlh7d3C1aX6yt8N3tVCrEFBkqVA8sEHkD2uBKvdSXizVQnSDo0CG72Cf4seU1nJdHVreYuUDlUqn6N2+JdVKag9fWQEO7rT1YmsAqrvtBRQkR4VtWnG0ok9T4hVqspQ0+8jU10v9JA0qig/FHuWS82UMbSbBQns0yz8FtqLFFOp5Fs6d4fUvyGkje8EnN/zA+Zdm5YeOFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) 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=Hjq9JqwC0pzjvObo213dgXGHBHmI7dNxNYMebDoxmpg=; b=wTJJAbTzERSeRCaeeUA0wm3BBxazEY1UdhePE/phpTfeim/8P0BP3qXe9n7lmvahg9AnJVmRdJK+jsNe29PuDaLqJzbW4kXtXuu23yTCaCjhLlekp7m00W3g65XfPm6U6qmbpCkKx0MH/GIf78WAJlbs3m7j4iv+Vi8ocQI8Vfr2bUOFiuiF+LM71fYbq1elADPUaY8TzQbGV10dCgDuhjzPkEajdoQBAvNhI6fV+dDc+2yibRCp7foARw77KGkIMrTrJ9TxQDjdoEowvXXzNTFEK4EeYN9r+8fKm5LmDLBynUgDEZSe4UTMJVuDA/oe0PjocFcgVLWgQr9K46pKXw== Received: from DU2PR04CA0294.eurprd04.prod.outlook.com (2603:10a6:10:28c::29) by PAXPR10MB4688.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:155::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.19; Thu, 9 Dec 2021 13:58:26 +0000 Received: from DB5EUR01FT023.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:28c:cafe::7f) by DU2PR04CA0294.outlook.office365.com (2603:10a6:10:28c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.13 via Frontend Transport; Thu, 9 Dec 2021 13:58:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) 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.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by DB5EUR01FT023.mail.protection.outlook.com (10.152.4.233) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Thu, 9 Dec 2021 13:58:26 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 9 Dec 2021 14:58:25 +0100 Received: from md1za8fc.ad001.siemens.net (139.25.69.80) 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.17; Thu, 9 Dec 2021 14:58:25 +0100 From: Henning Schild To: isar-users CC: Henning Schild Subject: [PATCH] testsuite: drop wix exclude path test Date: Thu, 9 Dec 2021 14:58:19 +0100 Message-ID: <20211209135819.15599-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.69.80] 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: 0c609a6a-a140-444a-fed1-08d9bb1bf8c3 X-MS-TrafficTypeDiagnostic: PAXPR10MB4688:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aOW3FanHFiQf1YxtJIQHmSHb4TgvKoORXhMAxoWSgm954RZUgVGHi+CzgKCuWymMaovFo5qsUzb5lWUD7q/HZI17KBHQN4PxH4PAAooWYwcnrA7WMDpOI7n3rZdB0cEJMsngFRyRI6USX6S1bI3hZZVS8yA8q9Pb/l9uNZwF6g5mHTPskfk7fm6uvcD2LYTTuSl/CwmV+snoi4JDoHe0vCp3ueiX/qHQUPe3NefKFi5TREGiDqBuzcDLbmPL5ysq1gcsVk3g+r8mAw4LOGljNp4CKHkrAIhiQEpsgz9h8YwmywLBd5Iw6fTa8nW+QINk673aIdxuj+q66rFApdi2JQH+f6Y3B8JTRUmTtfe6fz8UXs2CCBf/0mf6wNVYmv0XT6wEGKEX+dgor9Eg1jUzQwIxYyLBUV7BK8tGqxFvqEF0A/sIX4loARJaziR8CA8q7eAXGTZ9F+ZlW+6ImlAORb0sTxdL0lVkd+CVfYa37/5GoUuNmMLixC6q6uZkKYRD3CdJRb5bExGt1a0QhfM9/LzbRyZEls1xbM0N2t79mNiMc4y+z67UgBUzogmVrD/LQiaRwGYjKJhSkXxB3bnrtH5Mzi9PoGneHvkloQ6Gk8S23fINX0OvraLzy2WsFSV7KPlZMyJKf2PTcYQ92b/JboQj51MRJMbLiFUcXltBDFxVKpLj5uTKHKB01urfnydA2Ad2/IDX7vmKDg+WB6YXtPLO/2C8EyzROH2ZM1FFPGk= X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(1076003)(44832011)(70206006)(2616005)(956004)(70586007)(5660300002)(2906002)(498600001)(26005)(336012)(16526019)(186003)(6916009)(6666004)(8676002)(8936002)(4326008)(36756003)(107886003)(47076005)(83380400001)(82310400004)(82960400001)(81166007)(36860700001)(86362001)(356005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2021 13:58:26.0960 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c609a6a-a140-444a-fed1-08d9bb1bf8c3 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.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT023.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB4688 X-TUID: AM0h4p/fap99 With 085d496535e5 we have that exclude feature used by several targets in their default wks files, no need to have a dedicated test for it anymore. Signed-off-by: Henning Schild --- testsuite/build_test/build_test.py | 15 --------------- testsuite/build_test/cibase.py | 29 ----------------------------- 2 files changed, 44 deletions(-) diff --git a/testsuite/build_test/build_test.py b/testsuite/build_test/build_test.py index de9e3fcda4cc..5a771d1036cd 100644 --- a/testsuite/build_test/build_test.py +++ b/testsuite/build_test/build_test.py @@ -174,21 +174,6 @@ class RebuildTest(CIBaseTest): finally: self.restorefile(dpkgbase_file) -class WicTest(CIBaseTest): - - """ - Test wic --exclude-path - - :avocado: tags=wic,fast,full - """ - def test_wic_exclude(self): - # TODO: remove hardcoded filenames - 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.perform_wic_test('mc:qemuamd64-stretch:isar-image-base', - wks_path, wic_path) - class ContainerImageTest(CIBaseTest): """ diff --git a/testsuite/build_test/cibase.py b/testsuite/build_test/cibase.py index 0b053aa5bee5..33bddfdaed5b 100644 --- a/testsuite/build_test/cibase.py +++ b/testsuite/build_test/cibase.py @@ -78,35 +78,6 @@ class CIBaseTest(CIBuilder): # Cleanup self.deletetmp(build_dir) - 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) - - layerdir_isar = self.getlayerdir('isar') - - wks_file = layerdir_isar + wks_path - wic_img = build_dir + wic_path - - if not os.path.isfile(wic_img): - self.fail('No build started before: ' + wic_img + ' not exist') - - self.backupfile(wks_file) - self.backupmove(wic_img) - - with open(wks_file, 'r') as file: - lines = file.readlines() - with open(wks_file, 'w') as file: - for line in lines: - file.write(re.sub(r'part \/ ', 'part \/ --exclude-path usr ', - line)) - - try: - self.bitbake(build_dir, targets, None, bb_args) - 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) -- 2.32.0