[PATCH v6 17/21] CI: Adopt tests to syntax change

[Anton Mikanovich <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 d4fb177f..caf8fd29 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