Add jobs for Ambari 2.1

Add DIB jobs for Ambari plugin and set it as non-voting.

Change-Id: Icf499f8f04bc2702e946f9e92eaf8cca9b8ce721

config/zuul/layout.yaml

@@ -59,6 +59,8 @@ projects:
       - dib-neutron-direct-spark_1.0.0-u14-aio
       - dib-neutron-direct-spark_1.3.1-u14-aio
       - dib-nova-heat-hdp_2.0.6-c6.6
+      - dib-nova-heat-ambari_2.1-u12
+      - dib-nova-heat-ambari_2.1-c6.6
       - dib-nova-direct-cdh_5.3.0-u12-aio
       - dib-nova-direct-cdh_5.3.0-c6.6-aio
       - dib-nova-direct-cdh_5.4.0-u12-aio
@@ -73,6 +75,8 @@ projects:
       - dib-neutron-direct-spark_1.0.0-u14-aio
       - dib-neutron-direct-spark_1.3.1-u14-aio
       - dib-nova-heat-hdp_2.0.6-c6.6
+      - dib-nova-heat-ambari_2.1-u12
+      - dib-nova-heat-ambari_2.1-c6.6
       - dib-nova-direct-cdh_5.3.0-u12-aio
       - dib-nova-direct-cdh_5.3.0-c6.6-aio
       - dib-nova-direct-cdh_5.4.0-u12-aio
@@ -117,3 +121,6 @@ jobs:
     voting: false
   - name: ^.*-nova-heat-hdp_2.0.6-c6.6$
     voting: false
+  - name: ^-nova-heat-ambari_2.1-.*$
+    voting: false
+    branch: master

jenkins_job_builder/diskimage.yaml

@@ -61,6 +61,12 @@
      - 'dib-{network}-{engine}-{plugin}-{os}':
           plugin: mapr_4.0.2.mrv2
           os: u14
+     - 'dib-{network}-{engine}-{plugin}-{os}-aio':
+          network: nova
+          plugin: ambari_2.1
+          os:
+            - u12
+            - c6.6
      - 'dib-{network}-{engine}-{plugin}-{os}':
           network: nova
           plugin: hdp_2.0.6

slave-scripts/dib.sh

@@ -106,6 +106,14 @@ case $plugin in
        template_image_prefix="cdh_5_4_0"
     ;;
 
+    ambari_2.1)
+       env ambari_${os_type}_image_name=${ambari_2_1_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p ambari -i $os_type -v 2.1
+       check_error_code $? ${ambari_2_1_image}.qcow2
+       upload_image "${plugin}" "${username}" ${ambari_2_1_image}
+       scenario_conf_file="$sahara_templates_path/ambari-2.1.yaml.mako"
+       template_image_prefix="ambari_2_1"
+    ;;
+
     mapr_4.0.2.mrv2)
        env mapr_ubuntu_image_name=${mapr_4_0_2_mrv2_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p mapr -i ubuntu
        check_error_code $? ${mapr_4_0_2_mrv2_image}.qcow2

slave-scripts/functions-dib.sh

@@ -56,6 +56,9 @@ upload_image() {
            vanilla_2.7.1)
              image_properties="--property _sahara_tag_2.7.1=True --property _sahara_tag_vanilla=True --property _sahara_username=${username}"
            ;;
+           ambari_2.1)
+             image_properties="--property _sahara_tag_2.1=True --property _sahara_tag_ambari=True --property _sahara_username=${username}"
+           ;;
            hdp_2.0.6)
              image_properties="--property _sahara_tag_2.0.6=True --property _sahara_tag_hdp=True --property _sahara_username=${username}"
            ;;