From 50bb6f9aa0c9ec0a5b073bba311cd4ca249a3541 Mon Sep 17 00:00:00 2001
From: Alexander Yip <ayip@vmware.com>
Date: Wed, 6 May 2015 13:14:11 -0700
Subject: [PATCH] Enable congress and tempest in devstack in congress-dsvm-api
 test

A number of fixes:
- Congress was not being installed
- the tempest tests were disabled
- the enabled services were not explicitly defined
- python-congressclient was not being pulled from git
- tempest tests were not being copied into Tempest

Change-Id: If1aecf6f3383350157811cad154a8cb22107f95a
---
 jenkins/jobs/congress.yaml | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/jenkins/jobs/congress.yaml b/jenkins/jobs/congress.yaml
index cc721b50b2..a76d0190ce 100644
--- a/jenkins/jobs/congress.yaml
+++ b/jenkins/jobs/congress.yaml
@@ -13,19 +13,38 @@
       - devstack-checkout
       - shell: |
           #!/bin/bash -xe
+          ENABLED_SERVICES=congress,tempest,
+          ENABLED_SERVICES+=key,g-api,g-reg,
+          ENABLED_SERVICES+=n-api,n-crt,n-obj,n-cpu,n-sch,n-cauth,
+          ENABLED_SERVICES+=horizon,mysql,rabbit,sysstat,
+          ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,n-cond,
+          ENABLED_SERVICES+=quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,
+          ENABLED_SERVICES+=n-novnc,n-xvnc,
+          ENABLED_SERVICES+=ceilometer-acompute,ceilometer-acentral,
+          ENABLED_SERVICES+=ceilometer-anotification,ceilometer-collector,
+          ENABLED_SERVICES+=ceilometer-alarm-evaluator,
+          ENABLED_SERVICES+=ceilometer-alarm-notifier,ceilometer-api,s-proxy,
+          ENABLED_SERVICES+=s-object,s-container,s-account
+          export ENABLED_SERVICES
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export PROJECTS="openstack/congress $PROJECTS"
+          export PROJECTS="openstack/python-congressclient $PROJECTS"
+          export DEVSTACK_PROJECT_FROM_GIT=python-congressclient
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
-          cp -r congress/contrib/tempest $BASE/new
+          function pre_test_hook {{
+              # Install congress-devstack and congress-tempest integration
+              cp -r $BASE/new/congress/contrib/devstack/* $BASE/new/devstack/
+              cp -r $BASE/new/congress/contrib/tempest/* $BASE/new/tempest/
+          }}
+          export -f pre_test_hook
+
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh