From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v3 17/20] CI: Adopt tests to syntax change
Date: Tue, 19 Jul 2022 15:59:57 +0300 [thread overview]
Message-ID: <20220719130000.15943-18-amikan@ilbers.de> (raw)
In-Reply-To: <20220719130000.15943-1-amikan@ilbers.de>
Change override syntax inside test cases.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
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
next prev parent reply other threads:[~2022-07-19 13:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 12:59 [PATCH v3 00/20] Migrate to Bitbake 2.0 Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 01/20] meta: change deprecated parse calls Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 02/20] scripts/contrib: Add override conversion script Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 03/20] scripts/contrib: configure " Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 04/20] meta-isar: set default branch names Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 05/20] meta: remove non recommended syntax Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 06/20] bitbake: Update to Bitbake 2.0.1 Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 07/20] doc: require zstd tool Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 08/20] meta: update bitbake variables Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 09/20] bitbake.conf: align hash vars with openembedded Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 10/20] meta: mark network and sudo tasks Anton Mikanovich
2022-07-20 5:40 ` Schmidt, Adriaan
2022-07-20 5:47 ` Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 11/20] meta: update overrides syntax Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 12/20] sstate: update bbclass Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 13/20] bitbake.conf: declare default XZ and ZSTD options Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 14/20] Revert "devshell: Use different termination test to avoid warnings" Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 15/20] meta: align with OE-core libraries update Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 16/20] Revert "Revert "devshell: Use different termination test to avoid warnings"" Anton Mikanovich
2022-07-19 12:59 ` Anton Mikanovich [this message]
2022-07-19 12:59 ` [PATCH v3 18/20] isar-sstate: adopt sstate maintenance script Anton Mikanovich
2022-07-19 12:59 ` [PATCH v3 19/20] Revert "bitbake: Make 3.6.0 the minimum python version" Anton Mikanovich
2022-07-19 13:00 ` [PATCH v3 20/20] Revert "utils/ply: Change md5 usages to work on FIPS enabled hosts" 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=20220719130000.15943-18-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