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