Merge pull request #816 from shr-project/jansa/master

Convert to new override syntax

4 files changed, 27 insertions, 27 deletions

diff --git a/lib/oeqa/selftest/cases/updater_native.py b/lib/oeqa/selftest/cases/updater_native.py
index d2bf341..a60d22f 100644
--- a/lib/oeqa/selftest/cases/updater_native.py
+++ b/lib/oeqa/selftest/cases/updater_native.py
@@ -28,7 +28,7 @@ class SotaToolsTests(OESelftestTestCase):
 
 class GeneralTests(OESelftestTestCase):
 
-    def test_feature_sota(self):
+    def test_feature:sota(self):
         result = get_bb_var('DISTRO_FEATURES').find('sota')
         self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES')
 
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py
index c7d0448..b074269 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py
@@ -84,7 +84,7 @@ class SharedCredProvTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
@@ -124,16 +124,16 @@ class SharedCredProvTestsNonOSTree(SharedCredProvTests):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = ""')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"')
 
         self.append_config('DISTRO = "poky"')
-        self.append_config('DISTRO_FEATURES_append = " systemd"')
+        self.append_config('DISTRO_FEATURES:append = " systemd"')
         self.append_config('VIRTUAL-RUNTIME_init_manager = "systemd"')
         self.append_config('PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"')
-        self.append_config('PACKAGECONFIG_pn-aktualizr = ""')
+        self.append_config('PACKAGECONFIG:pn-aktualizr = ""')
         self.append_config('SOTA_DEPLOY_CREDENTIALS = "1"')
-        self.append_config('IMAGE_INSTALL_append += "aktualizr aktualizr-info aktualizr-shared-prov"')
+        self.append_config('IMAGE_INSTALL:append += "aktualizr aktualizr-info aktualizr-shared-prov"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64', uboot_enable='no')
 
 
@@ -149,8 +149,8 @@ class ManualControlTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
-        self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('SYSTEMD_AUTO_ENABLE:aktualizr = "disable"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
@@ -190,7 +190,7 @@ class DeviceCredProvTests(OESelftestTestCase):
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "')
         self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
         bitbake('build-sysroots -c build_native_sysroot')
 
@@ -243,8 +243,8 @@ class DeviceCredProvHsmTests(OESelftestTestCase):
         self.append_config('SOTA_CLIENT_PROV = "aktualizr-device-prov-hsm"')
         self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"')
         self.append_config('SOTA_CLIENT_FEATURES = "hsm"')
-        self.append_config('IMAGE_INSTALL_append = " softhsm-testtoken"')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_INSTALL:append = " softhsm-testtoken"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
         bitbake('build-sysroots -c build_native_sysroot')
 
@@ -407,7 +407,7 @@ class IpSecondaryTests(OESelftestTestCase):
         else:
             self.meta_qemu = None
 
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.primary = IpSecondaryTests.Primary(self)
         self.secondary = IpSecondaryTests.Secondary(self)
 
@@ -451,11 +451,11 @@ class ResourceControlTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
-        self.append_config('IMAGE_INSTALL_append += " aktualizr-resource-control "')
-        self.append_config('RESOURCE_CPU_WEIGHT_pn-aktualizr = "1000"')
-        self.append_config('RESOURCE_MEMORY_HIGH_pn-aktualizr = "50M"')
-        self.append_config('RESOURCE_MEMORY_MAX_pn-aktualizr = "1M"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_INSTALL:append += " aktualizr-resource-control "')
+        self.append_config('RESOURCE_CPU_WEIGHT:pn-aktualizr = "1000"')
+        self.append_config('RESOURCE_MEMORY_HIGH:pn-aktualizr = "50M"')
+        self.append_config('RESOURCE_MEMORY_MAX:pn-aktualizr = "1M"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
@@ -502,9 +502,9 @@ class NonSystemdTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.append_config('DISTRO = "poky-sota"')
-        self.append_config('IMAGE_INSTALL_remove += " aktualizr-resource-control"')
+        self.append_config('IMAGE_INSTALL:remove += " aktualizr-resource-control"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
index d20a9f0..8c7eb53 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
@@ -17,10 +17,10 @@ class PtestTests(OESelftestTestCase):
         else:
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
-        self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"')
-        self.append_config('PTEST_ENABLED_pn-aktualizr = "1"')
-        self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "')
-        self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
+        self.append_config('SYSTEMD_AUTO_ENABLE:aktualizr = "disable"')
+        self.append_config('PTEST_ENABLED:pn-aktualizr = "1"')
+        self.append_config('IMAGE_INSTALL:append += "aktualizr-ptest ptest-runner "')
+        self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"')
         self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="768M")
 
     def tearDownLocal(self):
diff --git a/lib/oeqa/selftest/cases/updater_raspberrypi.py b/lib/oeqa/selftest/cases/updater_raspberrypi.py
index fae631e..5534ee9 100644
--- a/lib/oeqa/selftest/cases/updater_raspberrypi.py
+++ b/lib/oeqa/selftest/cases/updater_raspberrypi.py
@@ -15,16 +15,16 @@ class RpiTests(OESelftestTestCase):
     def setUpLocal(self):
         # Add layers before changing the machine type, otherwise the sanity
         # checker complains loudly.
-        layer_rpi = "meta-raspberrypi"
-        layer_upd_rpi = "meta-updater-raspberrypi"
+        layer:rpi = "meta-raspberrypi"
+        layer_upd:rpi = "meta-updater-raspberrypi"
         result = runCmd('bitbake-layers show-layers')
         if re.search(layer_rpi, result.output) is None:
-            self.meta_rpi = metadir() + layer_rpi
+            self.meta_rpi = metadir() + layer:rpi
             runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi)
         else:
             self.meta_rpi = None
         if re.search(layer_upd_rpi, result.output) is None:
-            self.meta_upd_rpi = metadir() + layer_upd_rpi
+            self.meta_upd_rpi = metadir() + layer_upd:rpi
             runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi)
         else:
             self.meta_upd_rpi = None