summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2020-02-17 13:37:02 +0100
committerGitHub <noreply@github.com>2020-02-17 13:37:02 +0100
commiteecfe7aef3b0ae5b28c86194fc1ee6d2379a92d3 (patch)
treed6a3d3107aba34dc6030fafeeef596b14298fd85
parent3d5d2b924a51ef74b666a40881327c4af8dbbeaf (diff)
parent66fefa15a79a8a0c93c687c059b9cbec45d5f417 (diff)
downloadmeta-updater-eecfe7aef3b0ae5b28c86194fc1ee6d2379a92d3.tar.gz
Merge pull request #675 from advancedtelematic/feat/OTA-4310/non-ostree/oe-tests
Feat/ota 4310/non ostree/oe tests
-rw-r--r--.gitignore1
-rw-r--r--lib/oeqa/selftest/cases/testutils.py1
-rw-r--r--lib/oeqa/selftest/cases/updater_qemux86_64.py26
3 files changed, 28 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8d35cb3..147f162 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
1__pycache__ 1__pycache__
2*.pyc 2*.pyc
3.idea/
diff --git a/lib/oeqa/selftest/cases/testutils.py b/lib/oeqa/selftest/cases/testutils.py
index ea7781b..3455fa8 100644
--- a/lib/oeqa/selftest/cases/testutils.py
+++ b/lib/oeqa/selftest/cases/testutils.py
@@ -49,6 +49,7 @@ def qemu_boot_image(imagename, **kwargs):
49 args.overlay = kwargs.get('overlay', None) 49 args.overlay = kwargs.get('overlay', None)
50 args.dry_run = kwargs.get('dry_run', False) 50 args.dry_run = kwargs.get('dry_run', False)
51 args.secondary_network = kwargs.get('secondary_network', False) 51 args.secondary_network = kwargs.get('secondary_network', False)
52 args.uboot_enable = kwargs.get('uboot_enable', 'yes')
52 53
53 qemu = QemuCommand(args) 54 qemu = QemuCommand(args)
54 cmdline = qemu.command_line() 55 cmdline = qemu.command_line()
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py
index 5f152ad..08220f4 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py
@@ -112,6 +112,32 @@ class SharedCredProvTests(OESelftestTestCase):
112 verifyProvisioned(self, machine, hwid) 112 verifyProvisioned(self, machine, hwid)
113 113
114 114
115class SharedCredProvTestsNonOSTree(SharedCredProvTests):
116
117 def setUpLocal(self):
118 layer = "meta-updater-qemux86-64"
119 result = runCmd('bitbake-layers show-layers')
120 if re.search(layer, result.output) is None:
121 self.meta_qemu = metadir() + layer
122 runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu)
123 else:
124 self.meta_qemu = None
125 self.append_config('MACHINE = "qemux86-64"')
126 self.append_config('SOTA_CLIENT_PROV = ""')
127 self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"')
128 self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"')
129
130 self.append_config('DISTRO = "poky"')
131 self.append_config('DISTRO_FEATURES_append = " systemd"')
132 self.append_config('VIRTUAL-RUNTIME_init_manager = "systemd"')
133 self.append_config('PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf"')
134 self.append_config('PACKAGECONFIG_pn-aktualizr = ""')
135 self.append_config('SOTA_DEPLOY_CREDENTIALS = "1"')
136 self.append_config('IMAGE_INSTALL_append += "aktualizr"')
137 self.append_config('IMAGE_INSTALL_append += " aktualizr-shared-prov"')
138 self.qemu, self.s = qemu_launch(machine='qemux86-64', uboot_enable='no')
139
140
115class ManualControlTests(OESelftestTestCase): 141class ManualControlTests(OESelftestTestCase):
116 142
117 def setUpLocal(self): 143 def setUpLocal(self):