From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192672744921628672 X-Received: by 2002:a05:6a00:e83:b0:56b:9ce2:891f with SMTP id bo3-20020a056a000e8300b0056b9ce2891fmr3398174pfb.43.1674674646091; Wed, 25 Jan 2023 11:24:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:2282:b0:219:84d6:9802 with SMTP id kx2-20020a17090b228200b0021984d69802ls3472678pjb.3.-pod-canary-gmail; Wed, 25 Jan 2023 11:24:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXukVkD+b5HfbrD2OA1+SVlU2yRllAn2KjiMQz3ZPEooX2QeXJamb61aMZ3g22uYmYtoss8h X-Received: by 2002:a17:902:d507:b0:194:d7df:cfad with SMTP id b7-20020a170902d50700b00194d7dfcfadmr32573194plg.18.1674674645385; Wed, 25 Jan 2023 11:24:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674674645; cv=none; d=google.com; s=arc-20160816; b=rxgPyB5TzCJXSfcqprVshCBsZLVEH0RzQLr9HuRA8ck8DKWR4duLJV6zI9KCrXsndM fGjsucm0LxJ54Y2JGZxvIrU3cyNEsWZGLV5CfI0ecPOMvpACL4qM+P33Rod4OorZ5b5o ZOH8UPbjtyIcyvj/qNCiWIgo18gjtxZRQdq+XZHqRUPGwvjYT8D9TXo+dkCriRB4Sb1E exhRZ0C17WOh26pito8Obexhl28E6FeMfQDyIwuo32DoRK/hlQg9eVSqMehGS/ZDZTzP 2RYyypvKaDzBNQPmUZgdqEvuisQf/U/JhMk4lFpYeZLDZtRIeumV2/HCEb5TwBFOXR0J 2YQQ== ARC-Message-Signature: i=1; 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; bh=D+TVkYyyB82by/GQp5ArWHInpwvcdO7UeXAJk5u+MYg=; b=D78d5TSu2gxXZNIjRwWtRb+yzgJpyisfiT3/pQKgFZQWsiKELNEypvEphYorGYuXBV WQgL13sETDBk9g+2kT8gY1USLP5aVfmvGQjdkC3taFqL2tTd6qTbZmMgv6ztc9VVrE3S V/dOrDY0+qIUN+g4fUY007Vt8CEhth/NGLcdQcS/nwD737t9oi+XTdfMwtYhAltSEMim eyRAXesIuyoQsIoTgZnluJ3ikzN/g55jRFDDquTCuFv1yRpcH7wIbDe8s8ErbIJEq/nT sLfmTkE0PLPXeTrXufjIDRzXI4bedUj/r5U/E8YEKzp27AeEPOJL5l/NYY/DMST7DqEV jz3w== 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 d5-20020a170902854500b0018734e1a0dcsi295576plo.0.2023.01.25.11.24.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Jan 2023 11:24:05 -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 user-B660.. (IN-213-226-141-182.bitemobile.lv [213.226.141.182] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 30PJNdaV028378 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jan 2023 20:24:02 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v8 16/20] CI: adapt tests to syntax change Date: Wed, 25 Jan 2023 21:23:33 +0200 Message-Id: <20230125192337.86869-17-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230125192337.86869-1-amikan@ilbers.de> References: <20230125192337.86869-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 336QmcOa3OEH Change override syntax inside test cases. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 6 +++--- testsuite/citest.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 2e4702a..9d1b80f 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -91,8 +91,8 @@ 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:amd64 = "1"\n') + f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\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 7aa1e6b..2b6c0b2 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -239,7 +239,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.34.1