[yocto] [PATCH][yocto-autobuilder] buildset-config.controller: don't specify test suites explicitly

Ross Burton ross.burton at intel.com
Fri Jul 24 08:35:33 PDT 2015


The autobuilder was specifying the test list explicitly in several buildsets
because in the past the SMART and RPM tests didn't skip automatically on non-RPM
images.  However we're removing the dmesg test as it is obsolete (replaced by
parselogs) but the autobuilder still attempts to run it.

Now that the RPM and SMART tests skip correctly, remove all explict test suite
lists and instead either let the image specify what test suites to run, or use
suitesappend.

Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 buildset-config.controller/nightly-deb-non-deb.conf | 4 +---
 buildset-config.controller/nightly-deb.conf         | 4 +---
 buildset-config.controller/nightly-ipk.conf         | 4 +---
 buildset-config.controller/nightly-multilib.conf    | 3 +--
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/buildset-config.controller/nightly-deb-non-deb.conf b/buildset-config.controller/nightly-deb-non-deb.conf
index 716332c..691ff01 100644
--- a/buildset-config.controller/nightly-deb-non-deb.conf
+++ b/buildset-config.controller/nightly-deb-non-deb.conf
@@ -11,7 +11,5 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'i686', 'distro': 'poky', 'buildhistory' : False, 'packages': 'deb'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
         {'BuildImages': {'images': 'core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev'}},
-        {'RunSanityTests': {'images': 'core-image-minimal'}},
-        {'RunSanityTests': {'images' : 'core-image-sato', 'suites' : 'ping ssh auto'}},
-        {'RunSanityTests': {'images' : 'core-image-sato-sdk', 'suites' : 'ping ssh df connman syslog xorg scp vnc date perl ldd gcc kernelmodule dmesg python'}},
+        {'RunSanityTests': {'images': 'core-image-minimal core-image-sato core-image-sato-sdk'}},
         {'SendErrorReport': {}}]
diff --git a/buildset-config.controller/nightly-deb.conf b/buildset-config.controller/nightly-deb.conf
index fa8813c..4d2fd8c 100644
--- a/buildset-config.controller/nightly-deb.conf
+++ b/buildset-config.controller/nightly-deb.conf
@@ -11,7 +11,5 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'i686', 'distro': 'poky', 'buildhistory' : False, 'packages': 'deb'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
         {'BuildImages': {'images': 'core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev'}},
-        {'RunSanityTests': {'images': 'core-image-minimal'}},
-        {'RunSanityTests': {'images' : 'core-image-sato', 'suites' : 'ping ssh auto'}},
-        {'RunSanityTests': {'images' : 'core-image-sato-sdk', 'suites' : 'ping ssh df connman syslog xorg scp vnc date perl ldd gcc kernelmodule dmesg python'}},
+        {'RunSanityTests': {'images': 'core-image-minimal core-image-sato core-image-sato-sdk'}},
         {'SendErrorReport': {}}]
diff --git a/buildset-config.controller/nightly-ipk.conf b/buildset-config.controller/nightly-ipk.conf
index ba78f8c..797a622 100644
--- a/buildset-config.controller/nightly-ipk.conf
+++ b/buildset-config.controller/nightly-ipk.conf
@@ -11,7 +11,5 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'i686', 'distro': 'poky', 'buildhistory' : False, 'packages': 'ipk'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
         {'BuildImages': {'images': 'core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev'}},
-        {'RunSanityTests': {'images' : 'core-image-minimal'}},
-        {'RunSanityTests': {'images' : 'core-image-sato', 'suites' : 'ping ssh auto'}},
-        {'RunSanityTests': {'images' : 'core-image-sato-sdk', 'suites' : 'ping ssh df connman syslog xorg scp vnc date perl ldd gcc kernelmodule dmesg python'}},
+        {'RunSanityTests': {'images' : 'core-image-minimal core-image-sato core-image-sato-sdk'}},
         {'SendErrorReport': {}}]
diff --git a/buildset-config.controller/nightly-multilib.conf b/buildset-config.controller/nightly-multilib.conf
index a836974..6bd68f0 100644
--- a/buildset-config.controller/nightly-multilib.conf
+++ b/buildset-config.controller/nightly-multilib.conf
@@ -32,8 +32,7 @@ steps: [{'SetDest':{}},
                             'distro': 'poky', 'packages' : 'ipk',
                             'atextappend' : '\nIMAGE_INSTALL_append = " lib32-connman-gnome"\n'}},
         {'BuildImages': {'images': 'core-image-sato'}},
-        {'RunSanityTests': {'images': 'core-image-sato',
-                            'suites' : 'ping ssh connman xorg multilib dmesg auto'}},
+        {'RunSanityTests': {'images': 'core-image-sato', 'suitesappend' : 'multilib'}},
         {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'i686',
                             'buildhistory' : False, 'multilib': 'lib64',
                             'distro': 'poky'}},
-- 
2.1.4




More information about the yocto mailing list