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