simplifying dib jobs

api + engine launch is a common practice of launching sahara.
let's simplify jobs a little by removing differentiation of jobs
by this case.

Change-Id: I12df6f2ca0d9ec61781a20af263e77a791a89b51

config/zuul/layout.yaml

@@ -123,12 +123,12 @@ projects:
       - dib-vanilla_2.7.1-c7
       - dib-mapr_5.1.0.mrv2-u14
       - dib-mapr_5.2.0.mrv2-u14
-      - dib-spark_1.6.0-u14-aio
-      - dib-cdh_5.5.0-u14-aio
-      - dib-cdh_5.5.0-c7-aio
-      - dib-cdh_5.7.0-c7-aio
-      - dib-cdh_5.7.0-u14-aio
-      - dib-storm_1.0.1-u14-aio
+      - dib-spark_1.6.0-u14
+      - dib-cdh_5.5.0-u14
+      - dib-cdh_5.5.0-c7
+      - dib-cdh_5.7.0-c7
+      - dib-cdh_5.7.0-u14
+      - dib-storm_1.0.1-u14
       - dib-ambari_2.2-c7
       - dib-ambari_2.2-u14
     post:
@@ -136,11 +136,11 @@ projects:
       - dib-vanilla_2.7.1-c7
       - dib-mapr_5.1.0.mrv2-u14
       - dib-mapr_5.2.0.mrv2-u14
-      - dib-spark_1.6.0-u14-aio
-      - dib-cdh_5.5.0-u14-aio
-      - dib-cdh_5.5.0-c7-aio
-      - dib-cdh_5.7.0-c7-aio
-      - dib-storm_1.0.1-u14-aio
+      - dib-spark_1.6.0-u14
+      - dib-cdh_5.5.0-u14
+      - dib-cdh_5.5.0-c7
+      - dib-cdh_5.7.0-c7
+      - dib-storm_1.0.1-u14
       - dib-ambari_2.2-c7
       - dib-ambari_2.2-u14
 

jenkins_job_builder/diskimage.yaml

@@ -1,18 +1,3 @@
-- job-template:
-    name: 'dib-{plugin}-{os}-aio'
-    defaults: global
-    builders:
-      - gerrit-git-prep
-      - ci-config-prep
-      - shell: "FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/sahara-ci-config/slave-scripts/dib.sh {plugin} {os}"
-    properties:
-      - zeromq-event
-    publishers:
-      - sahara-logs
-      - console-log
-      - trigger-cleanup
-    node: stack-42 || stack-43
-
 - job-template:
     name: 'dib-{plugin}-{os}'
     defaults: global
@@ -31,27 +16,20 @@
 - project:
     name: sahara-image-elements
     github-org: openstack
-    plugin: vanilla_2.7.1
+    plugin: 
+      - vanilla_2.7.1
+      - cdh_5.5.0
+      - cdh_5.7.0
+      - ambari_2.2
     os:
-     - u14
-     - c7
-
+      - u14
+      - c7
     jobs:
-     - 'dib-{plugin}-{os}'
-     - 'dib-{plugin}-{os}-aio':
-          plugin:
-            - cdh_5.5.0
-            - cdh_5.7.0
-     - 'dib-{plugin}-{os}-aio':
+      - 'dib-{plugin}-{os}'
+      - 'dib-{plugin}-{os}':
           plugin:
             - spark_1.6.0
             - storm_1.0.1
-          os: u14
-     - 'dib-{plugin}-{os}':
-          plugin:
             - mapr_5.1.0.mrv2
             - mapr_5.2.0.mrv2
           os: u14
-     - 'dib-{plugin}-{os}':
-          plugin:
-            - ambari_2.2