From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7120476383164235776 X-Received: by 2002:a63:125e:0:b0:411:a1bf:2e3b with SMTP id 30-20020a63125e000000b00411a1bf2e3bmr28383046pgs.388.1658235637114; Tue, 19 Jul 2022 06:00:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:886:b0:1f2:108:2d3d with SMTP id v6-20020a17090a088600b001f201082d3dls935533pjc.3.-pod-canary-gmail; Tue, 19 Jul 2022 06:00:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vzy6VBBQmUgU3xLnu7wchUdFjYj+cwWOpmT0zxmZlOH7/prbVj8YA++Iqcq702bktOwSZd X-Received: by 2002:a17:902:d588:b0:16b:fbd1:9f53 with SMTP id k8-20020a170902d58800b0016bfbd19f53mr33389185plh.156.1658235635481; Tue, 19 Jul 2022 06:00:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658235635; cv=none; d=google.com; s=arc-20160816; b=x53eWhdXcOC7MFi2rJbWx2n7O4GJHi/anS1Sm6nu0UQkm6UKXnukfthnkvgLNZ2+mF sRTScbq2XBWGBf0JToQBMKVxOhxS50mCF+E0L117IU8pLuuMBOV9ImhIOmbzBQygsOEo LoKh6Zknpt4XSK7pW8SG/n11nMC8Jp54hO313XDOxE+DhS2PnmOTZB2DldcvrcWRSLUn KmeRmQMW0FE6REK0K7MT0iinDdhDTITCgneWO3EWIDEoq0YM7pi6ghMZABIQs/tEdOT1 6MS8roxzjgpmLPrk6susFFitt8WfrrhFomQFAxfXFess+UItRgixt9YC7vA1JDwIhTBa 1lBQ== 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=DpGY3O12xlg6isxmHFMn/n/YKkjkXCnKb92XA0KMVwBZfWoiLjd13acn0w77yWr6A1 qaszE3jVmXulled0EXGaqMPZpBaTO0q+Wtl1+B0BnufPQiOMNBNlxHYzeDcgw8USLrgp 7T/Q5XFQImtwh2enDnXMcK2wMe7Uwn1sAHr6g6wh/+yFVDmNW8FHDC//NVr4AuMEAkG4 VtKN3/faKsspXKxPs04I+1LHAqyzM+m+gp0fSz7/CC5nQkamTkjL/owXSUrjm5gdNyVY uIpNximzUN+AcfQNk0b6RwRpv7T6/astO7AEk+V5k3SbkJaxvyu647xS9QUGcCnOwCpb 8fWA== 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 c11-20020a170902d48b00b0016c509aac57si591778plg.8.2022.07.19.06.00.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jul 2022 06:00:35 -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 localhost.localdomain (mm-181-76-214-37.mgts.dynamic.pppoe.byfly.by [37.214.76.181] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 26JD07Mc015247 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Jul 2022 15:00:33 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 17/20] CI: Adopt tests to syntax change Date: Tue, 19 Jul 2022 15:59:57 +0300 Message-Id: <20220719130000.15943-18-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719130000.15943-1-amikan@ilbers.de> References: <20220719130000.15943-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: gvGNScie30bw 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