diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-06-12 09:57:37 +0200 |
|---|---|---|
| committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-06-19 12:46:16 +0200 |
| commit | 9579f0cb3a481186e8142c68bb226708a41549cd (patch) | |
| tree | b33eeaec8a3a78b9b5f3cc5c71186427b081c0fb /lib | |
| parent | f88aa91531f6e238729f4cb430e08889f1620686 (diff) | |
| download | meta-updater-9579f0cb3a481186e8142c68bb226708a41549cd.tar.gz | |
aktualizr-*-prov: read config files from STAGING_DIR_HOST.
STAGING_DIR_NATIVE does not get populated as I had previously believed.
Native recipes do not get packaged, so although we want to use a native
executable, we need to get the config files from the
aktualizr-host-tools package built by the aktualizr (target) recipe.
Thanks to Andre McCurdy and Khem Raj for insight on how to get this
right.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 1554835..44e0647 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
| @@ -115,8 +115,8 @@ class AktualizrToolsTests(OESelftestTestCase): | |||
| 115 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS', 'T'], 'aktualizr-native') | 115 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS', 'T'], 'aktualizr-native') |
| 116 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] | 116 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] |
| 117 | temp_dir = bb_vars['T'] | 117 | temp_dir = bb_vars['T'] |
| 118 | bb_vars_prov = get_bb_vars(['STAGING_DIR_NATIVE', 'libdir'], 'aktualizr-implicit-prov') | 118 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-implicit-prov') |
| 119 | config = bb_vars_prov['STAGING_DIR_NATIVE'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov.toml' | 119 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov.toml' |
| 120 | 120 | ||
| 121 | akt_native_run(self, 'aktualizr_cert_provider -c {creds} -r -l {temp} -g {config}' | 121 | akt_native_run(self, 'aktualizr_cert_provider -c {creds} -r -l {temp} -g {config}' |
| 122 | .format(creds=creds, temp=temp_dir, config=config)) | 122 | .format(creds=creds, temp=temp_dir, config=config)) |
| @@ -392,8 +392,8 @@ class ImplProvTests(OESelftestTestCase): | |||
| 392 | # Run cert_provider. | 392 | # Run cert_provider. |
| 393 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') | 393 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') |
| 394 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] | 394 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] |
| 395 | bb_vars_prov = get_bb_vars(['STAGING_DIR_NATIVE', 'libdir'], 'aktualizr-implicit-prov') | 395 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-implicit-prov') |
| 396 | config = bb_vars_prov['STAGING_DIR_NATIVE'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov.toml' | 396 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_implicit_prov.toml' |
| 397 | 397 | ||
| 398 | akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -s -g {config}' | 398 | akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -s -g {config}' |
| 399 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) | 399 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) |
| @@ -473,8 +473,8 @@ class HsmTests(OESelftestTestCase): | |||
| 473 | # Run cert_provider. | 473 | # Run cert_provider. |
| 474 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') | 474 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS'], 'aktualizr-native') |
| 475 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] | 475 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] |
| 476 | bb_vars_prov = get_bb_vars(['STAGING_DIR_NATIVE', 'libdir'], 'aktualizr-hsm-prov') | 476 | bb_vars_prov = get_bb_vars(['STAGING_DIR_HOST', 'libdir'], 'aktualizr-hsm-prov') |
| 477 | config = bb_vars_prov['STAGING_DIR_NATIVE'] + bb_vars_prov['libdir'] + '/sota/sota_hsm_prov.toml' | 477 | config = bb_vars_prov['STAGING_DIR_HOST'] + bb_vars_prov['libdir'] + '/sota/sota_hsm_prov.toml' |
| 478 | 478 | ||
| 479 | akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -r -s -g {config}' | 479 | akt_native_run(self, 'aktualizr_cert_provider -c {creds} -t root@localhost -p {port} -r -s -g {config}' |
| 480 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) | 480 | .format(creds=creds, port=self.qemu.ssh_port, config=config)) |