From 922f74097a95d8f443cddadd5f722a516e959fcd Mon Sep 17 00:00:00 2001 From: Nikhil Manchanda Date: Wed, 9 Jul 2014 03:22:39 -0700 Subject: [PATCH] Fixed gate-trove-functional-dsvm jobs Fixed the post_test_hook for the gate-trove-functional-dsvm job template to set up the environment correctly to run and run Trove functional tests using the test scripts from the trove-integration project. Change-Id: Ic470268858e03970c2628ef06e1ed21940ed27f9 Depends-On: I78471d7f11d0f1a23e2efc28da2e62c5707e575a --- .../files/jenkins_job_builder/config/trove.yaml | 11 ++++++----- modules/openstack_project/files/zuul/layout.yaml | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) 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 073b4392e4..9b6f029057 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml @@ -33,7 +33,7 @@ wrappers: - build-timeout: - timeout: 85 + timeout: 95 - timestamps builders: @@ -43,15 +43,16 @@ - 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 DEVSTACK_GATE_TIMEOUT=90 + export ENABLED_SERVICES=tempest,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 + export DEST=$BASE/new + export PATH_DEVSTACK_SRC=$DEST/devstack cd /opt/stack/new/trove-integration/scripts - ./redstack kick-start {datastore} - ./redstack int-tests --group={datastore} + ./redstack dsvm-gate-tests {datastore} }} export -f post_test_hook diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index f488cf2b16..1a915f8ac5 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -2525,6 +2525,7 @@ projects: - noop experimental: - gate-trove-buildimage-mysql + - gate-trove-functional-dsvm-mysql # TODO: add docs - name: openstack/tuskar-ui