Merge "Use job-template for gate-trove-buildimage jobs"

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -1156,6 +1156,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
 

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