From c897a3ac79845b07c4a4e70afb93f277e46623ec Mon Sep 17 00:00:00 2001
From: Nikhil Manchanda <SlickNik@gmail.com>
Date: Thu, 12 Jun 2014 07:54:41 -0700
Subject: [PATCH] Use job-template for gate-trove-buildimage jobs

Use job-template for gate-trove-buildimage jobs to enable building
trove images for multiple datastore types, and not just mysql.

Change-Id: I1bb10abb6d762d030c69559c20349f53d0f666a8
---
 .../files/jenkins_job_builder/config/projects.yaml   |  4 ++++
 .../files/jenkins_job_builder/config/trove.yaml      | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 44e6e9accf..d720f429f0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1146,6 +1146,10 @@
           datastore: 'mysql'
       - 'gate-trove-functional-dsvm-{datastore}':
           datastore: 'mongodb'
+      - 'gate-trove-buildimage-{datastore}':
+          datastore: 'mysql'
+      - 'gate-trove-buildimage-{datastore}':
+          datastore: 'mongodb'
       - '{name}-tox-doc-{envlist}':
           envlist: publishdocs
 
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml b/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml
index e3297ff032..ca257573a4 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml
@@ -1,5 +1,5 @@
-- job:
-    name: 'gate-trove-buildimage-mysql'
+- job-template:
+    name: 'gate-trove-buildimage-{datastore}'
     node: 'bare-precise'
 
     builders:
@@ -13,15 +13,15 @@
           export DEST=/opt/trove-image-build
           export KEY_DIR=`pwd`/scripts/files/keys
           cd scripts
-          ./redstack build-image mysql
-          mv $HOME/images/ubuntu_mysql/ubuntu_mysql.qcow2 $WORKSPACE/ubuntu_mysql.qcow2
+          ./redstack build-image {datastore}
+          mv $HOME/images/ubuntu_{datastore}/ubuntu_{datastore}.qcow2 $WORKSPACE/{datastore}.qcow2
 
     publishers:
       - scp:
           site: 'tarballs.openstack.org'
           files:
-            - source: 'ubuntu_mysql.qcow2'
-              target: 'tarballs/trove/images/ubuntu_mysql.qcow2'
+            - source: '{datastore}.qcow2'
+              target: 'tarballs/trove/images/ubuntu'
               keep-hierarchy: false
               copy-after-failure: false
       - console-log