summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/oeqa/selftest/cases/updater_qemux86_64.py9
-rw-r--r--lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py1
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py
index d3a5523..c16b669 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py
@@ -19,6 +19,9 @@ class GeneralTests(OESelftestTestCase):
19 logger = logging.getLogger("selftest") 19 logger = logging.getLogger("selftest")
20 logger.info('Running bitbake to build core-image-minimal') 20 logger.info('Running bitbake to build core-image-minimal')
21 self.append_config('SOTA_CLIENT_PROV = "aktualizr-shared-prov"') 21 self.append_config('SOTA_CLIENT_PROV = "aktualizr-shared-prov"')
22
23 # note: this also tests ostreepush/garagesign/garagecheck which are
24 # omitted from other test cases
22 bitbake('core-image-minimal') 25 bitbake('core-image-minimal')
23 credentials = get_bb_var('SOTA_PACKED_CREDENTIALS') 26 credentials = get_bb_var('SOTA_PACKED_CREDENTIALS')
24 # skip the test if the variable SOTA_PACKED_CREDENTIALS is not set 27 # skip the test if the variable SOTA_PACKED_CREDENTIALS is not set
@@ -81,6 +84,7 @@ class SharedCredProvTests(OESelftestTestCase):
81 self.meta_qemu = None 84 self.meta_qemu = None
82 self.append_config('MACHINE = "qemux86-64"') 85 self.append_config('MACHINE = "qemux86-64"')
83 self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') 86 self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
87 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
84 self.qemu, self.s = qemu_launch(machine='qemux86-64') 88 self.qemu, self.s = qemu_launch(machine='qemux86-64')
85 89
86 def tearDownLocal(self): 90 def tearDownLocal(self):
@@ -119,6 +123,7 @@ class ManualControlTests(OESelftestTestCase):
119 self.append_config('MACHINE = "qemux86-64"') 123 self.append_config('MACHINE = "qemux86-64"')
120 self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') 124 self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
121 self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"') 125 self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"')
126 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
122 self.qemu, self.s = qemu_launch(machine='qemux86-64') 127 self.qemu, self.s = qemu_launch(machine='qemux86-64')
123 128
124 def tearDownLocal(self): 129 def tearDownLocal(self):
@@ -158,6 +163,7 @@ class DeviceCredProvTests(OESelftestTestCase):
158 self.append_config('MACHINE = "qemux86-64"') 163 self.append_config('MACHINE = "qemux86-64"')
159 self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "') 164 self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "')
160 self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') 165 self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"')
166 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
161 self.qemu, self.s = qemu_launch(machine='qemux86-64') 167 self.qemu, self.s = qemu_launch(machine='qemux86-64')
162 bitbake('build-sysroots -c build_native_sysroot') 168 bitbake('build-sysroots -c build_native_sysroot')
163 169
@@ -211,6 +217,7 @@ class DeviceCredProvHsmTests(OESelftestTestCase):
211 self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') 217 self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"')
212 self.append_config('SOTA_CLIENT_FEATURES = "hsm"') 218 self.append_config('SOTA_CLIENT_FEATURES = "hsm"')
213 self.append_config('IMAGE_INSTALL_append = " softhsm-testtoken"') 219 self.append_config('IMAGE_INSTALL_append = " softhsm-testtoken"')
220 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
214 self.qemu, self.s = qemu_launch(machine='qemux86-64') 221 self.qemu, self.s = qemu_launch(machine='qemux86-64')
215 bitbake('build-sysroots -c build_native_sysroot') 222 bitbake('build-sysroots -c build_native_sysroot')
216 223
@@ -384,6 +391,7 @@ class IpSecondaryTests(OESelftestTestCase):
384 else: 391 else:
385 self.meta_qemu = None 392 self.meta_qemu = None
386 393
394 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
387 self.primary = IpSecondaryTests.Primary(self) 395 self.primary = IpSecondaryTests.Primary(self)
388 self.secondary = IpSecondaryTests.Secondary(self) 396 self.secondary = IpSecondaryTests.Secondary(self)
389 397
@@ -427,6 +435,7 @@ class ResourceControlTests(OESelftestTestCase):
427 self.meta_qemu = None 435 self.meta_qemu = None
428 self.append_config('MACHINE = "qemux86-64"') 436 self.append_config('MACHINE = "qemux86-64"')
429 self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') 437 self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "')
438 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
430 self.append_config('IMAGE_INSTALL_append += " aktualizr-resource-control "') 439 self.append_config('IMAGE_INSTALL_append += " aktualizr-resource-control "')
431 self.append_config('RESOURCE_CPU_WEIGHT_pn-aktualizr = "1000"') 440 self.append_config('RESOURCE_CPU_WEIGHT_pn-aktualizr = "1000"')
432 self.append_config('RESOURCE_MEMORY_HIGH_pn-aktualizr = "50M"') 441 self.append_config('RESOURCE_MEMORY_HIGH_pn-aktualizr = "50M"')
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
index 88e773b..83f5841 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py
@@ -21,6 +21,7 @@ class PtestTests(OESelftestTestCase):
21 self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"') 21 self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"')
22 self.append_config('PTEST_ENABLED_pn-aktualizr = "1"') 22 self.append_config('PTEST_ENABLED_pn-aktualizr = "1"')
23 self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "') 23 self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "')
24 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
24 self.qemu, self.s = qemu_launch(machine='qemux86-64') 25 self.qemu, self.s = qemu_launch(machine='qemux86-64')
25 26
26 def tearDownLocal(self): 27 def tearDownLocal(self):