From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7128378901610364928 X-Received: by 2002:a05:620a:4586:b0:6b6:490:2541 with SMTP id bp6-20020a05620a458600b006b604902541mr4758973qkb.766.1659705071513; Fri, 05 Aug 2022 06:11:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:622a:410e:b0:31e:99e6:66a6 with SMTP id cc14-20020a05622a410e00b0031e99e666a6ls3203708qtb.0.-pod-prod-gmail; Fri, 05 Aug 2022 06:11:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR4jQPh7kMgi4GO8KxG3sRSIUPoVK25hyDm3NGcKNvVWeRCqAvOiILi6d+o8BWdTnTYpbpg8 X-Received: by 2002:ac8:5d49:0:b0:31f:273a:a959 with SMTP id g9-20020ac85d49000000b0031f273aa959mr5849563qtx.409.1659705071066; Fri, 05 Aug 2022 06:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659705071; cv=none; d=google.com; s=arc-20160816; b=ccFU5r4XTrZxA9/LVDH33AvO7EqjDlOWsy0bh1TJbnkkvfNqHap1EGBJIDl0xQOXuh HIBJonuXgrKWoCkG600WsIwdLahRFyEriGrWN5BW/hK98egh5+4tQlqOTK0JPBeSJEM+ aH2UwBzMZeM5ZBo0JyVC0kV8GVOiOqVeERaRTiBgJSFeOvJ7D9ANHLU/gthYfhmbIbiA yhwlhlboigKpNWuTyFz+MrvZM4+C2c+yTUgtR2QP/nJgGiuYaGvzpTbm6a+maA/9OUVM 22wNSLcG3RKGbBZyu2stU4bQOlHiPeZgFAsA95Fsi+P5FIC5A27QI5Vy2zhUfzhlBeVh ivLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=+P2gcNigFSrpz4J8l8V6jMcZqZZDOS6iMdnj7oLL8TY=; b=Xez9cwMMZ7iKUDhsT/LUPXNAGqXBZj9wUB4+NnDCq9mOcmzzJjhrUwKhI+fTvpA+3j C1bzKbeo/GA0wWs01poT58jvrnd1W/bgw6a7ZmUNwcUtGCFzpzi01QTReqfxuSmqnUd/ BpGds9FIbRyL0a2r5IQdjKH53b4mmuUzV5/L1w3KAY3Cgjm8eKaCOfwVhNyrqDv0npnf 5gn5NFboTt1XBlcjJ13zDFUklMab1v8T21yTafx8bN23FKPPMYepApAdI4xtf+BHB5GN r0cscWkLtER3Clr26RTyWD9jEPuywYAG3Fy34oGhQxwOOt850Gx+3Atjepedlbt6Ut5E MXIw== 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 n10-20020ae9c30a000000b006b5fa3b62dbsi125217qkg.6.2022.08.05.06.11.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Aug 2022 06:11:11 -0700 (PDT) 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 alena-nb.promwad.com (mm-183-76-214-37.mgts.dynamic.pppoe.byfly.by [37.214.76.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 275DAhI3009685 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 5 Aug 2022 15:11:08 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 17/21] CI: Adopt tests to syntax change Date: Fri, 5 Aug 2022 16:10:31 +0300 Message-Id: <20220805131035.22844-18-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220805131035.22844-1-amikan@ilbers.de> References: <20220805131035.22844-1-amikan@ilbers.de> 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: /OzI/4zDtDiR Change override syntax inside test cases. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 8 ++++---- testsuite/citest.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index dfb0a37..3a2e7e3 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -89,9 +89,9 @@ class CIBuilder(Test): # 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') - f.write('ISAR_ENABLE_COMPAT_ARCH_debian-stretch_amd64 = "0"\n') + f.write('ISAR_ENABLE_COMPAT_ARCH:amd64 = "1"\n') + f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\n') + f.write('ISAR_ENABLE_COMPAT_ARCH:debian-stretch:amd64 = "0"\n') f.write('IMAGE_INSTALL += "kselftest"\n') if cross: f.write('ISAR_CROSS_COMPILE = "1"\n') @@ -102,7 +102,7 @@ class CIBuilder(Test): 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') + 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: diff --git a/testsuite/citest.py b/testsuite/citest.py index 6c8eb26..7881330 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -216,7 +216,7 @@ class RebuildTest(CIBaseTest): self.backupfile(dpkgbase_file) with open(dpkgbase_file, 'a') as file: - file.write('do_fetch_append() {\n\n}') + file.write('do_fetch:append() {\n\n}') try: self.perform_build_test('mc:qemuamd64-bullseye:isar-image-base', debsrc_cache=True) -- 2.17.1