opendev/system-config
Code Issues Proposed changes

Merge "Update Marconi to Zaqar"

Browse Source
This commit is contained in:
Jenkins 2014-08-19 20:21:15 +00:00 committed by Gerrit Code Review
commit 5cdfe966bf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
View File

@ -658,7 +658,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_MARCONI=1
export DEVSTACK_GATE_ZAQAR=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

4
modules/openstack_project/files/jenkins_job_builder/config/solum.yaml
View File

@ -16,7 +16,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_NEUTRON=1
export ENABLED_SERVICES=solum,solum-api,solum-build-api,solum-conductor,solum-deployer,solum-worker,tempest,marconi,barbican,mistral
export ENABLED_SERVICES=solum,solum-api,solum-build-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral
export PROJECTS="stackforge/solum $PROJECTS"
# TODO(ravips): Workaround until barbican, mistral gets into devstack
export PROJECTS="openstack/barbican stackforge/mistral $PROJECTS"
@ -64,7 +64,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_NEUTRON=1
export ENABLED_SERVICES=solum,solum-api,solum-build-api,solum-conductor,solum-deployer,solum-worker,tempest,marconi,barbican,mistral
export ENABLED_SERVICES=solum,solum-api,solum-build-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral
export PROJECTS="stackforge/solum $PROJECTS"
# TODO(ravips): Workaround until barbican, mistral gets into devstack
export PROJECTS="openstack/barbican stackforge/mistral $PROJECTS"