From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v7 16/20] CI: adapt tests to syntax change
Date: Tue, 27 Dec 2022 10:00:35 +0300 [thread overview]
Message-ID: <20221227070039.23496-17-amikan@ilbers.de> (raw)
In-Reply-To: <20221227070039.23496-1-amikan@ilbers.de>
Change override syntax inside test cases.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
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 39cbd2e9..bc800787 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -90,8 +90,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')
@@ -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 wic_deploy_parts:
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 7aa1e6b5..2b6c0b29 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.17.1
next prev parent reply other threads:[~2022-12-27 7:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-27 7:00 [PATCH v7 00/20] Migrate to Bitbake 2.0 Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 01/20] meta: change deprecated parse calls Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 02/20] scripts/contrib: add override conversion script Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 03/20] scripts/contrib: configure " Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 04/20] meta-isar: set default branch names Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 05/20] meta: remove non recommended syntax Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 06/20] bitbake: update to Bitbake 2.0.5 Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 07/20] meta: update bitbake variables Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 08/20] bitbake.conf: align hash vars with openembedded Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 09/20] meta: mark network and sudo tasks Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 10/20] meta: update overrides syntax Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 11/20] sstate: update bbclass Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 12/20] bitbake.conf: declare default XZ and ZSTD options Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 13/20] Revert "devshell: Use different termination test to avoid warnings" Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 14/20] meta: align with OE-core libraries update Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 15/20] Revert "Revert "devshell: Use different termination test to avoid warnings"" Anton Mikanovich
2022-12-27 7:00 ` Anton Mikanovich [this message]
2022-12-27 7:00 ` [PATCH v7 17/20] isar-sstate: adapt sstate maintenance script Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 18/20] doc: require zstd tool Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 19/20] RECIPE-API-CHANGELOG: add tips after bitbake version update Anton Mikanovich
2022-12-27 7:00 ` [PATCH v7 20/20] docs: update override syntax Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221227070039.23496-17-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox