diff options
Diffstat (limited to 'lib/oeqa/selftest/cases/updater_qemux86_64.py')
-rw-r--r-- | lib/oeqa/selftest/cases/updater_qemux86_64.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py index 218d361..c61c9b2 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py | |||
@@ -39,7 +39,8 @@ class AktualizrToolsTests(OESelftestTestCase): | |||
39 | super(AktualizrToolsTests, cls).setUpClass() | 39 | super(AktualizrToolsTests, cls).setUpClass() |
40 | logger = logging.getLogger("selftest") | 40 | logger = logging.getLogger("selftest") |
41 | logger.info('Running bitbake to build aktualizr-native tools') | 41 | logger.info('Running bitbake to build aktualizr-native tools') |
42 | bitbake('aktualizr-native') | 42 | bitbake('aktualizr-native aktualizr-device-prov') |
43 | bitbake('build-sysroots -c build_native_sysroot') | ||
43 | 44 | ||
44 | def test_cert_provider_help(self): | 45 | def test_cert_provider_help(self): |
45 | akt_native_run(self, 'aktualizr-cert-provider --help') | 46 | akt_native_run(self, 'aktualizr-cert-provider --help') |
@@ -47,12 +48,11 @@ class AktualizrToolsTests(OESelftestTestCase): | |||
47 | def test_cert_provider_local_output(self): | 48 | def test_cert_provider_local_output(self): |
48 | logger = logging.getLogger("selftest") | 49 | logger = logging.getLogger("selftest") |
49 | logger.info('Running bitbake to build aktualizr-device-prov') | 50 | logger.info('Running bitbake to build aktualizr-device-prov') |
50 | bitbake('aktualizr-device-prov') | ||
51 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS', 'T'], 'aktualizr-native') | 51 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS', 'T'], 'aktualizr-native') |
52 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] | 52 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] |
53 | temp_dir = bb_vars['T'] | 53 | temp_dir = bb_vars['T'] |
54 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-device-prov') | 54 | bb_vars_prov = get_bb_vars(['WORKDIR', 'libdir'], 'aktualizr-device-prov') |
55 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota-device-cred.toml' | 55 | config = bb_vars_prov['WORKDIR'] + '/sysroot-destdir' + bb_vars_prov['libdir'] + '/sota/conf.d/20-sota-device-cred.toml' |
56 | 56 | ||
57 | akt_native_run(self, 'aktualizr-cert-provider -c {creds} -r -l {temp} -g {config}' | 57 | akt_native_run(self, 'aktualizr-cert-provider -c {creds} -r -l {temp} -g {config}' |
58 | .format(creds=creds, temp=temp_dir, config=config)) | 58 | .format(creds=creds, temp=temp_dir, config=config)) |
@@ -173,8 +173,8 @@ class DeviceCredProvTests(OESelftestTestCase): | |||
173 | self.append_config('MACHINE = "qemux86-64"') | 173 | self.append_config('MACHINE = "qemux86-64"') |
174 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "') | 174 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "') |
175 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') | 175 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') |
176 | runCmd('bitbake -c cleanall aktualizr aktualizr-device-prov') | ||
177 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 176 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
177 | bitbake('build-sysroots -c build_native_sysroot') | ||
178 | 178 | ||
179 | def tearDownLocal(self): | 179 | def tearDownLocal(self): |
180 | qemu_terminate(self.s) | 180 | qemu_terminate(self.s) |
@@ -201,8 +201,8 @@ class DeviceCredProvTests(OESelftestTestCase): | |||
201 | # Run aktualizr-cert-provider. | 201 | # Run aktualizr-cert-provider. |
202 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') | 202 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') |
203 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] | 203 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] |
204 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-device-prov') | 204 | bb_vars_prov = get_bb_vars(['WORKDIR', 'libdir'], 'aktualizr-device-prov') |
205 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota-device-cred.toml' | 205 | config = bb_vars_prov['WORKDIR'] + '/sysroot-destdir' + bb_vars_prov['libdir'] + '/sota/conf.d/20-sota-device-cred.toml' |
206 | 206 | ||
207 | print('Provisining at root@localhost:%d' % self.qemu.ssh_port) | 207 | print('Provisining at root@localhost:%d' % self.qemu.ssh_port) |
208 | akt_native_run(self, 'aktualizr-cert-provider -c {creds} -t root@localhost -p {port} -s -u -r -g {config}' | 208 | akt_native_run(self, 'aktualizr-cert-provider -c {creds} -t root@localhost -p {port} -s -u -r -g {config}' |
@@ -231,8 +231,8 @@ class DeviceCredProvHsmTests(OESelftestTestCase): | |||
231 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') | 231 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') |
232 | self.append_config('SOTA_CLIENT_FEATURES = "hsm"') | 232 | self.append_config('SOTA_CLIENT_FEATURES = "hsm"') |
233 | self.append_config('IMAGE_INSTALL_append = " softhsm-testtoken"') | 233 | self.append_config('IMAGE_INSTALL_append = " softhsm-testtoken"') |
234 | runCmd('bitbake -c cleanall aktualizr aktualizr-device-prov-hsm') | ||
235 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 234 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
235 | bitbake('build-sysroots -c build_native_sysroot') | ||
236 | 236 | ||
237 | def tearDownLocal(self): | 237 | def tearDownLocal(self): |
238 | qemu_terminate(self.s) | 238 | qemu_terminate(self.s) |
@@ -269,8 +269,8 @@ class DeviceCredProvHsmTests(OESelftestTestCase): | |||
269 | # Run aktualizr-cert-provider. | 269 | # Run aktualizr-cert-provider. |
270 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') | 270 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') |
271 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] | 271 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] |
272 | bb_vars_prov = get_bb_vars(['STAGING_DIR_NATIVE', 'libdir'], 'aktualizr-device-prov-hsm') | 272 | bb_vars_prov = get_bb_vars(['WORKDIR', 'libdir'], 'aktualizr-device-prov-hsm') |
273 | config = bb_vars_prov['STAGING_DIR_NATIVE'] + bb_vars_prov['libdir'] + '/sota/sota-device-cred-hsm.toml' | 273 | config = bb_vars_prov['WORKDIR'] + '/sysroot-destdir' + bb_vars_prov['libdir'] + '/sota/conf.d/20-sota-device-cred-hsm.toml' |
274 | 274 | ||
275 | akt_native_run(self, 'aktualizr-cert-provider -c {creds} -t root@localhost -p {port} -r -s -u -g {config}' | 275 | akt_native_run(self, 'aktualizr-cert-provider -c {creds} -t root@localhost -p {port} -r -s -u -g {config}' |
276 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) | 276 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) |