[gnome-continuous] Add a "hwtest" tree

[Owen Taylor <otaylor src gnome org>]

commit 5f3b4e62dab2cc29280bd9e4c9fef417c78a61fb
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Thu Jun 5 09:54:16 2014 -0400

    Add a "hwtest" tree
    
    Add two additional component types - "minimal" and "hwtest".
    "minimal" components are needed to boot a basic text-only command line environment.
    The "hwtest" tree will include the "minimal" components plus some extra components
    (like DHCP and iSCSI servers) that are needed for the controller and update images
    for the GNOME Hardware Testing Project.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=732394

 src/js/tasks/task-build.js      |   29 ++++++++++++++++++++++-------
 src/js/tasks/task-builddisks.js |    2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/src/js/tasks/task-build.js b/src/js/tasks/task-build.js
index 7e90eca..32e3fac 100644
--- a/src/js/tasks/task-build.js
+++ b/src/js/tasks/task-build.js
@@ -1294,6 +1294,7 @@ const TaskBuild = new Lang.Class({
         let componentToArches = {};
 
         let runtimeComponents = [];
+        let hwtestComponents = [];
         let develComponents = [];
         let testingComponents = [];
 
@@ -1301,15 +1302,25 @@ const TaskBuild = new Lang.Class({
            let component = components[i];
             let name = component['name']
 
-            let isRuntime = (component['component'] || 'runtime') == 'runtime';
-            let isTesting = (component['component'] || 'runtime') == 'testing';
+            let resolved = component['component'] || 'runtime';
+            let isMinimal = resolved == 'minimal';
+            let isHWTest = resolved == 'minimal' || resolved == 'hwtest';
+            let isHWTestOnly = resolved == 'hwtest';
+            let isRuntime = resolved == 'minimal' || resolved == 'runtime';
+            let isTesting = resolved == 'testing';
 
             if (isRuntime) {
                 runtimeComponents.push(component);
            } else if (isTesting) {
                testingComponents.push(component);
            }
-           develComponents.push(component);
+            if (isHWTest) {
+                hwtestComponents.push(component);
+            }
+
+            if (!isHWTestOnly) {
+               develComponents.push(component);
+            }
 
            let isNoarch = component['noarch'] || false;
            let componentArches;
@@ -1370,7 +1381,7 @@ const TaskBuild = new Lang.Class({
        }
 
         let targetsList = [];
-       let componentTypes = ['runtime', 'devel-debug'];
+       let componentTypes = ['runtime', 'hwtest', 'devel-debug'];
         for (let i = 0; i < componentTypes.length; i++) {
            let targetComponentType = componentTypes[i];
             for (let i = 0; i < architectures.length; i++) {
@@ -1382,7 +1393,7 @@ const TaskBuild = new Lang.Class({
                 let baseRuntimeRef = baseName + '/' + architecture + '-runtime';
                 let buildrootRef = baseName + '/' + architecture + '-devel';
                let baseRef;
-                if (targetComponentType == 'runtime') {
+                if (targetComponentType == 'runtime' || targetComponentType == 'hwtest') {
                     baseRef = baseRuntimeRef;
                 } else {
                     baseRef = buildrootRef;
@@ -1394,10 +1405,13 @@ const TaskBuild = new Lang.Class({
                let targetComponents;
                 if (targetComponentType == 'runtime') {
                     targetComponents = runtimeComponents;
+                } else if (targetComponentType == 'hwtest') {
+                    targetComponents = hwtestComponents;
                 } else {
+                    targetComponents = runtimeComponents;
                     targetComponents = develComponents;
                }
-                    
+
                 let contents = [];
                 for (let i = 0; i < targetComponents.length; i++) {
                    let component = targetComponents[i];
@@ -1410,7 +1424,7 @@ const TaskBuild = new Lang.Class({
                    }
                     let binaryName = component['name'] + '/' + architecture;
                     let componentRef = {'name': binaryName};
-                    if (targetComponentType == 'runtime') {
+                    if (targetComponentType == 'runtime' || targetComponentType == 'hwtest') {
                         componentRef['trees'] = ['/runtime'];
                    } else if (targetComponentType == 'devel-debug') {
                         componentRef['trees'] = ['/runtime', '/devel', '/tests', '/doc', '/debug'];
@@ -1482,6 +1496,7 @@ const TaskBuild = new Lang.Class({
                }));
                let kernelInitramfsData = archInitramfsImages[architecture];
                this._installKernelAndInitramfs(kernelInitramfsData, composeRootdir, cancellable);
+
                this._cleanupGarbage(composeRootdir, cancellable);
                let [treename, ostreeRev] = this._commitComposedTree(runtimeTargetName, composeRootdir, 
cancellable);
                BuildUtil.timeSubtask("cleanup " + runtimeTargetName, Lang.bind(this, function() {
diff --git a/src/js/tasks/task-builddisks.js b/src/js/tasks/task-builddisks.js
index 7c8f3c0..ec4cabc 100644
--- a/src/js/tasks/task-builddisks.js
+++ b/src/js/tasks/task-builddisks.js
@@ -46,7 +46,7 @@ const TaskBuildDisks = new Lang.Class({
 
     _imageSubdir: 'images',
     _inheritPreviousDisk: true,
-    _onlyTreeSuffixes: ['-runtime', '-devel-debug'],
+    _onlyTreeSuffixes: ['-runtime', '-hwtest', '-devel-debug'],
 
     DefaultParameters: {targets: null},