diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/oeqa/selftest/cases/updater_native.py | 2 | ||||
-rw-r--r-- | lib/oeqa/selftest/cases/updater_qemux86_64.py | 36 | ||||
-rw-r--r-- | lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py | 8 | ||||
-rw-r--r-- | lib/oeqa/selftest/cases/updater_raspberrypi.py | 8 |
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): | |||
28 | 28 | ||
29 | class GeneralTests(OESelftestTestCase): | 29 | class GeneralTests(OESelftestTestCase): |
30 | 30 | ||
31 | def test_feature_sota(self): | 31 | def test_feature:sota(self): |
32 | result = get_bb_var('DISTRO_FEATURES').find('sota') | 32 | result = get_bb_var('DISTRO_FEATURES').find('sota') |
33 | self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES') | 33 | self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES') |
34 | 34 | ||
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): | |||
84 | self.meta_qemu = None | 84 | self.meta_qemu = None |
85 | self.append_config('MACHINE = "qemux86-64"') | 85 | self.append_config('MACHINE = "qemux86-64"') |
86 | 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"') | 87 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
88 | self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"') | 88 | self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"') |
89 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 89 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
90 | 90 | ||
@@ -124,16 +124,16 @@ class SharedCredProvTestsNonOSTree(SharedCredProvTests): | |||
124 | self.meta_qemu = None | 124 | self.meta_qemu = None |
125 | self.append_config('MACHINE = "qemux86-64"') | 125 | self.append_config('MACHINE = "qemux86-64"') |
126 | self.append_config('SOTA_CLIENT_PROV = ""') | 126 | self.append_config('SOTA_CLIENT_PROV = ""') |
127 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 127 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
128 | self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"') | 128 | self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"') |
129 | 129 | ||
130 | self.append_config('DISTRO = "poky"') | 130 | self.append_config('DISTRO = "poky"') |
131 | self.append_config('DISTRO_FEATURES_append = " systemd"') | 131 | self.append_config('DISTRO_FEATURES:append = " systemd"') |
132 | self.append_config('VIRTUAL-RUNTIME_init_manager = "systemd"') | 132 | self.append_config('VIRTUAL-RUNTIME_init_manager = "systemd"') |
133 | self.append_config('PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"') | 133 | self.append_config('PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"') |
134 | self.append_config('PACKAGECONFIG_pn-aktualizr = ""') | 134 | self.append_config('PACKAGECONFIG:pn-aktualizr = ""') |
135 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "1"') | 135 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "1"') |
136 | self.append_config('IMAGE_INSTALL_append += "aktualizr aktualizr-info aktualizr-shared-prov"') | 136 | self.append_config('IMAGE_INSTALL:append += "aktualizr aktualizr-info aktualizr-shared-prov"') |
137 | self.qemu, self.s = qemu_launch(machine='qemux86-64', uboot_enable='no') | 137 | self.qemu, self.s = qemu_launch(machine='qemux86-64', uboot_enable='no') |
138 | 138 | ||
139 | 139 | ||
@@ -149,8 +149,8 @@ class ManualControlTests(OESelftestTestCase): | |||
149 | self.meta_qemu = None | 149 | self.meta_qemu = None |
150 | self.append_config('MACHINE = "qemux86-64"') | 150 | self.append_config('MACHINE = "qemux86-64"') |
151 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 151 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
152 | self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"') | 152 | self.append_config('SYSTEMD_AUTO_ENABLE:aktualizr = "disable"') |
153 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 153 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
154 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 154 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
155 | 155 | ||
156 | def tearDownLocal(self): | 156 | def tearDownLocal(self): |
@@ -190,7 +190,7 @@ class DeviceCredProvTests(OESelftestTestCase): | |||
190 | self.append_config('MACHINE = "qemux86-64"') | 190 | self.append_config('MACHINE = "qemux86-64"') |
191 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "') | 191 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "') |
192 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') | 192 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') |
193 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 193 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
194 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 194 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
195 | bitbake('build-sysroots -c build_native_sysroot') | 195 | bitbake('build-sysroots -c build_native_sysroot') |
196 | 196 | ||
@@ -243,8 +243,8 @@ class DeviceCredProvHsmTests(OESelftestTestCase): | |||
243 | self.append_config('SOTA_CLIENT_PROV = "aktualizr-device-prov-hsm"') | 243 | self.append_config('SOTA_CLIENT_PROV = "aktualizr-device-prov-hsm"') |
244 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') | 244 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') |
245 | self.append_config('SOTA_CLIENT_FEATURES = "hsm"') | 245 | self.append_config('SOTA_CLIENT_FEATURES = "hsm"') |
246 | self.append_config('IMAGE_INSTALL_append = " softhsm-testtoken"') | 246 | self.append_config('IMAGE_INSTALL:append = " softhsm-testtoken"') |
247 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 247 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
248 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 248 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
249 | bitbake('build-sysroots -c build_native_sysroot') | 249 | bitbake('build-sysroots -c build_native_sysroot') |
250 | 250 | ||
@@ -407,7 +407,7 @@ class IpSecondaryTests(OESelftestTestCase): | |||
407 | else: | 407 | else: |
408 | self.meta_qemu = None | 408 | self.meta_qemu = None |
409 | 409 | ||
410 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 410 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
411 | self.primary = IpSecondaryTests.Primary(self) | 411 | self.primary = IpSecondaryTests.Primary(self) |
412 | self.secondary = IpSecondaryTests.Secondary(self) | 412 | self.secondary = IpSecondaryTests.Secondary(self) |
413 | 413 | ||
@@ -451,11 +451,11 @@ class ResourceControlTests(OESelftestTestCase): | |||
451 | self.meta_qemu = None | 451 | self.meta_qemu = None |
452 | self.append_config('MACHINE = "qemux86-64"') | 452 | self.append_config('MACHINE = "qemux86-64"') |
453 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 453 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
454 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 454 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
455 | self.append_config('IMAGE_INSTALL_append += " aktualizr-resource-control "') | 455 | self.append_config('IMAGE_INSTALL:append += " aktualizr-resource-control "') |
456 | self.append_config('RESOURCE_CPU_WEIGHT_pn-aktualizr = "1000"') | 456 | self.append_config('RESOURCE_CPU_WEIGHT:pn-aktualizr = "1000"') |
457 | self.append_config('RESOURCE_MEMORY_HIGH_pn-aktualizr = "50M"') | 457 | self.append_config('RESOURCE_MEMORY_HIGH:pn-aktualizr = "50M"') |
458 | self.append_config('RESOURCE_MEMORY_MAX_pn-aktualizr = "1M"') | 458 | self.append_config('RESOURCE_MEMORY_MAX:pn-aktualizr = "1M"') |
459 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 459 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
460 | 460 | ||
461 | def tearDownLocal(self): | 461 | def tearDownLocal(self): |
@@ -502,9 +502,9 @@ class NonSystemdTests(OESelftestTestCase): | |||
502 | self.meta_qemu = None | 502 | self.meta_qemu = None |
503 | self.append_config('MACHINE = "qemux86-64"') | 503 | self.append_config('MACHINE = "qemux86-64"') |
504 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 504 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
505 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 505 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
506 | self.append_config('DISTRO = "poky-sota"') | 506 | self.append_config('DISTRO = "poky-sota"') |
507 | self.append_config('IMAGE_INSTALL_remove += " aktualizr-resource-control"') | 507 | self.append_config('IMAGE_INSTALL:remove += " aktualizr-resource-control"') |
508 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 508 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
509 | 509 | ||
510 | def tearDownLocal(self): | 510 | 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): | |||
17 | else: | 17 | else: |
18 | self.meta_qemu = None | 18 | self.meta_qemu = None |
19 | self.append_config('MACHINE = "qemux86-64"') | 19 | self.append_config('MACHINE = "qemux86-64"') |
20 | self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"') | 20 | self.append_config('SYSTEMD_AUTO_ENABLE:aktualizr = "disable"') |
21 | self.append_config('PTEST_ENABLED_pn-aktualizr = "1"') | 21 | self.append_config('PTEST_ENABLED:pn-aktualizr = "1"') |
22 | self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "') | 22 | self.append_config('IMAGE_INSTALL:append += "aktualizr-ptest ptest-runner "') |
23 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 23 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
24 | self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="768M") | 24 | self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="768M") |
25 | 25 | ||
26 | def tearDownLocal(self): | 26 | 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): | |||
15 | def setUpLocal(self): | 15 | def setUpLocal(self): |
16 | # Add layers before changing the machine type, otherwise the sanity | 16 | # Add layers before changing the machine type, otherwise the sanity |
17 | # checker complains loudly. | 17 | # checker complains loudly. |
18 | layer_rpi = "meta-raspberrypi" | 18 | layer:rpi = "meta-raspberrypi" |
19 | layer_upd_rpi = "meta-updater-raspberrypi" | 19 | layer_upd:rpi = "meta-updater-raspberrypi" |
20 | result = runCmd('bitbake-layers show-layers') | 20 | result = runCmd('bitbake-layers show-layers') |
21 | if re.search(layer_rpi, result.output) is None: | 21 | if re.search(layer_rpi, result.output) is None: |
22 | self.meta_rpi = metadir() + layer_rpi | 22 | self.meta_rpi = metadir() + layer:rpi |
23 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) | 23 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) |
24 | else: | 24 | else: |
25 | self.meta_rpi = None | 25 | self.meta_rpi = None |
26 | if re.search(layer_upd_rpi, result.output) is None: | 26 | if re.search(layer_upd_rpi, result.output) is None: |
27 | self.meta_upd_rpi = metadir() + layer_upd_rpi | 27 | self.meta_upd_rpi = metadir() + layer_upd:rpi |
28 | runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi) | 28 | runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi) |
29 | else: | 29 | else: |
30 | self.meta_upd_rpi = None | 30 | self.meta_upd_rpi = None |