Merge "Added new experimental job for trove functional tests"

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

@@ -1152,6 +1152,10 @@
       - openstack-publish-jobs
       - translation-jobs
       - openstack-doc-jobs
+      - 'gate-trove-functional-dsvm-{datastore}':
+          datastore: 'mysql'
+      - 'gate-trove-functional-dsvm-{datastore}':
+          datastore: 'mongodb'
       - '{name}-tox-doc-{envlist}':
           envlist: publishdocs
 

modules/openstack_project/files/jenkins_job_builder/config/trove-images.yaml

@@ -1,27 +0,0 @@
-- job:
-    name: 'gate-trove-buildimage-mysql'
-    node: 'bare-precise'
-
-    builders:
-      - link-logs
-      - net-info
-      - gerrit-git-prep
-      - shell: |
-          #!/bin/bash -xe
-          sudo mkdir -p /opt/trove-image-build
-          sudo chown $(whoami) /opt/trove-image-build
-          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
-
-    publishers:
-      - scp:
-          site: 'tarballs.openstack.org'
-          files:
-            - source: 'ubuntu_mysql.qcow2'
-              target: 'tarballs/trove/images/ubuntu_mysql.qcow2'
-              keep-hierarchy: false
-              copy-after-failure: false
-      - console-log

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

@@ -0,0 +1,64 @@
+- job:
+    name: 'gate-trove-buildimage-mysql'
+    node: 'bare-precise'
+
+    builders:
+      - link-logs
+      - net-info
+      - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -xe
+          sudo mkdir -p /opt/trove-image-build
+          sudo chown $(whoami) /opt/trove-image-build
+          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
+
+    publishers:
+      - scp:
+          site: 'tarballs.openstack.org'
+          files:
+            - source: 'ubuntu_mysql.qcow2'
+              target: 'tarballs/trove/images/ubuntu_mysql.qcow2'
+              keep-hierarchy: false
+              copy-after-failure: false
+      - console-log
+
+
+- job-template:
+    name: 'gate-trove-functional-dsvm-{datastore}'
+    node: 'devstack-precise'
+
+    wrappers:
+      - timeout:
+          timeout: 85
+          fail: true
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=80
+          export ENABLED_SERVICES=s-proxy,s-object,s-container,s-account,trove,tr-api,tr-tmgr,tr-cond
+          export PROJECTS="openstack/trove-integration openstack/diskimage-builder openstack/tripleo-image-elements $PROJECTS"
+
+          function post_test_hook {{
+              export BRIDGE_IP=10.1.0.1
+              cd /opt/stack/new/trove-integration/scripts
+              ./redstack kick-start {datastore}
+              ./redstack int-tests
+          }}
+          export -f post_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log

modules/openstack_project/files/zuul/layout.yaml

@@ -632,6 +632,10 @@ jobs:
     voting: false
   - name: gate-trove-buildimage-mysql
     voting: false
+  - name: gate-trove-functional-dsvm-mysql
+    voting: false
+  - name: gate-trove-functional-dsvm-mongodb
+    voting: false
 # puppet-openstack targets
   - name: gate-puppet-vswitch-puppet-lint
     voting: false
@@ -1201,6 +1205,9 @@ projects:
       - trove-merge-release-tags
     periodic:
       - trove-propose-translation-update
+    experimental:
+      - gate-trove-functional-dsvm-mysql
+      - gate-trove-functional-dsvm-mongodb
 
   - name: openstack/tuskar
     template: