From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:a17:90b:4382:b0:20b:c375:575 with SMTP id in2-20020a17090b438200b0020bc3750575mr74312445pjb.174.1669991854325; Fri, 02 Dec 2022 06:37:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a63:2a42:0:b0:478:1185:6c0c with SMTP id q63-20020a632a42000000b0047811856c0cls2586239pgq.11.-pod-prod-gmail; Fri, 02 Dec 2022 06:37:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf5F6Z+M6BFMUVWSDTZtjcUSDdFpQ/mJXqmABSPomZenqt9iyWsc1uJsYvZXenjtT4sthbOm X-Received: by 2002:aa7:85c8:0:b0:574:5789:b8a4 with SMTP id z8-20020aa785c8000000b005745789b8a4mr45582039pfn.47.1669991853561; Fri, 02 Dec 2022 06:37:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669991853; cv=none; d=google.com; s=arc-20160816; b=tzA+G304+8I2pE6471HDbK2cfCH7n/7JGtmF79CJ8tx4+cTXC8szHr+BKWUZt9vNec 6qS1BSGnZg4IkXgCJwJzCkpwJ55AQDf597fKLzhklwNQDaz+V3hAPpZ311+CLJAqseCw +y2tCRFXWe44SIq6UAqUrQGJG9cBYsqnPRw38EsDMFAgGjLdnco7UG1zGvrUD7BmsW0Y 5vy0nIK5RGzmGLgGe6zwRLQ+FTP3x+unXQ/AbvCPi9rzFUhyxMCS+2pVmqdAS0pVtq8K vZ8caqsopgfPKqsLERpcmXi3xCN7yL29VLJbK5z2vpoIug/Em3lFfJ8Kn709shLu7w8S aHYQ== 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=2dXiq4x4MtiTSXcVEfj932vMDFWFwZd5zaCdrkZK5QI=; b=oDM0vJb0M7Y1CGJ5kFinBWGb1xutWOi2wVPwEDZ23oGc96liZvpquFRmosCLVPmfzH L5bC2qsILCjSJCfADOXYguWLJV2u2ReG8l5KrwkWTXNrEz66GYvb+zlx1FbbxHcDjbht +XE4utqvdjwICmqSlqIAHSEdg4o7Czf3sPFnQi2t1Ehn9EnsXFJaAl4M/cRGoug2volI etk0g5cLCEUj1EQSOkANPtCuWgPPwvSJ6+5yBq5V36hW6mDgApO+VQ8ge+L5alFifo0h MAhPrsVFqHUB5kdkDj9tHhFIilEizEScdXGXhW4cKg0VQP+afBjcc+/8oKmP1QJ51n4L VqIg== 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 k14-20020a170902c40e00b00189348ab16fsi457551plk.13.2022.12.02.06.37.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Dec 2022 06:37:33 -0800 (PST) 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-69-83-214-37.mgts.dynamic.pppoe.byfly.by [37.214.83.69] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2B2Eb8Ee015256 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 15:37:31 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5 17/21] CI: Adopt tests to syntax change Date: Fri, 2 Dec 2022 17:36:57 +0300 Message-Id: <20221202143701.6665-18-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221202143701.6665-1-amikan@ilbers.de> References: <20221202143701.6665-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: csDWCUbDuR4F 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 d5c83b22..bd7938f0 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -90,9 +90,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') @@ -103,7 +103,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 wic_deploy_parts: diff --git a/testsuite/citest.py b/testsuite/citest.py index 2dc78015..42bea610 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -240,7 +240,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