summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/testimage.bbclass2
-rw-r--r--meta/classes/testsdk.bbclass2
-rw-r--r--meta/lib/oeqa/selftest/context.py3
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index ba2d9c491b..f2ff91da9d 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -151,7 +151,7 @@ def get_testimage_configuration(d, test_type, machine):
151 'IMAGE_BASENAME': d.getVar("IMAGE_BASENAME"), 151 'IMAGE_BASENAME': d.getVar("IMAGE_BASENAME"),
152 'IMAGE_PKGTYPE': d.getVar("IMAGE_PKGTYPE"), 152 'IMAGE_PKGTYPE': d.getVar("IMAGE_PKGTYPE"),
153 'STARTTIME': d.getVar("DATETIME"), 153 'STARTTIME': d.getVar("DATETIME"),
154 'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-'), 154 'HOST_DISTRO': oe.lsb.distro_identifier().replace(' ', '-'),
155 'LAYERS': get_layers(d.getVar("BBLAYERS"))} 155 'LAYERS': get_layers(d.getVar("BBLAYERS"))}
156 return configuration 156 return configuration
157get_testimage_configuration[vardepsexclude] = "DATETIME" 157get_testimage_configuration[vardepsexclude] = "DATETIME"
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 5b9bf7b262..458c3f40b0 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -23,7 +23,7 @@ def get_sdk_configuration(d, test_type):
23 'IMAGE_BASENAME': d.getVar("IMAGE_BASENAME"), 23 'IMAGE_BASENAME': d.getVar("IMAGE_BASENAME"),
24 'IMAGE_PKGTYPE': d.getVar("IMAGE_PKGTYPE"), 24 'IMAGE_PKGTYPE': d.getVar("IMAGE_PKGTYPE"),
25 'STARTTIME': d.getVar("DATETIME"), 25 'STARTTIME': d.getVar("DATETIME"),
26 'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-'), 26 'HOST_DISTRO': oe.lsb.distro_identifier().replace(' ', '-'),
27 'LAYERS': get_layers(d.getVar("BBLAYERS"))} 27 'LAYERS': get_layers(d.getVar("BBLAYERS"))}
28 return configuration 28 return configuration
29get_sdk_configuration[vardepsexclude] = "DATETIME" 29get_sdk_configuration[vardepsexclude] = "DATETIME"
diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py
index 84878ea193..c521290327 100644
--- a/meta/lib/oeqa/selftest/context.py
+++ b/meta/lib/oeqa/selftest/context.py
@@ -11,6 +11,7 @@ from shutil import copyfile
11from random import choice 11from random import choice
12 12
13import oeqa 13import oeqa
14import oe
14 15
15from oeqa.core.context import OETestContext, OETestContextExecutor 16from oeqa.core.context import OETestContext, OETestContextExecutor
16from oeqa.core.exception import OEQAPreRun, OEQATestNotFound 17from oeqa.core.exception import OEQAPreRun, OEQATestNotFound
@@ -223,7 +224,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor):
223 configuration = {'TEST_TYPE': 'oeselftest', 224 configuration = {'TEST_TYPE': 'oeselftest',
224 'STARTTIME': args.test_start_time, 225 'STARTTIME': args.test_start_time,
225 'MACHINE': self.tc.td["MACHINE"], 226 'MACHINE': self.tc.td["MACHINE"],
226 'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-'), 227 'HOST_DISTRO': oe.lsb.distro_identifier().replace(' ', '-'),
227 'HOST_NAME': metadata['hostname'], 228 'HOST_NAME': metadata['hostname'],
228 'LAYERS': metadata['layers']} 229 'LAYERS': metadata['layers']}
229 return configuration 230 return configuration