diff options
Diffstat (limited to 'external/meta-updater/lib/oeqa/selftest/cases')
| -rw-r--r-- | external/meta-updater/lib/oeqa/selftest/cases/updater_qemux86_64.py | 5 | ||||
| -rw-r--r-- | external/meta-updater/lib/oeqa/selftest/cases/updater_raspberrypi.py | 8 |
2 files changed, 2 insertions, 11 deletions
diff --git a/external/meta-updater/lib/oeqa/selftest/cases/updater_qemux86_64.py b/external/meta-updater/lib/oeqa/selftest/cases/updater_qemux86_64.py index 08220f4e..c7d04481 100644 --- a/external/meta-updater/lib/oeqa/selftest/cases/updater_qemux86_64.py +++ b/external/meta-updater/lib/oeqa/selftest/cases/updater_qemux86_64.py @@ -130,11 +130,10 @@ class SharedCredProvTestsNonOSTree(SharedCredProvTests): self.append_config('DISTRO = "poky"') self.append_config('DISTRO_FEATURES_append = " systemd"') self.append_config('VIRTUAL-RUNTIME_init_manager = "systemd"') - self.append_config('PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf"') + self.append_config('PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"') self.append_config('PACKAGECONFIG_pn-aktualizr = ""') self.append_config('SOTA_DEPLOY_CREDENTIALS = "1"') - self.append_config('IMAGE_INSTALL_append += "aktualizr"') - self.append_config('IMAGE_INSTALL_append += " 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') diff --git a/external/meta-updater/lib/oeqa/selftest/cases/updater_raspberrypi.py b/external/meta-updater/lib/oeqa/selftest/cases/updater_raspberrypi.py index 25c5f12e..fae631eb 100644 --- a/external/meta-updater/lib/oeqa/selftest/cases/updater_raspberrypi.py +++ b/external/meta-updater/lib/oeqa/selftest/cases/updater_raspberrypi.py @@ -15,15 +15,9 @@ class RpiTests(OESelftestTestCase): def setUpLocal(self): # Add layers before changing the machine type, otherwise the sanity # checker complains loudly. - layer_python = "meta-openembedded/meta-python" layer_rpi = "meta-raspberrypi" layer_upd_rpi = "meta-updater-raspberrypi" result = runCmd('bitbake-layers show-layers') - if re.search(layer_python, result.output) is None: - self.meta_python = metadir() + layer_python - runCmd('bitbake-layers add-layer "%s"' % self.meta_python) - else: - self.meta_python = None if re.search(layer_rpi, result.output) is None: self.meta_rpi = metadir() + layer_rpi runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) @@ -43,8 +37,6 @@ class RpiTests(OESelftestTestCase): runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) if self.meta_rpi: runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True) - if self.meta_python: - runCmd('bitbake-layers remove-layer "%s"' % self.meta_python, ignore_status=True) def test_build(self): logger = logging.getLogger("selftest") |