From fb5714eaad260638b4382b973813d8977548e869 Mon Sep 17 00:00:00 2001 From: Malini Kamalambal Date: Tue, 19 Aug 2014 09:55:05 -0400 Subject: [PATCH] Update Marconi to Zaqar This patch updates the remaining Marconi references to Zaqar. Change-Id: I2e9ecf0a8cf56c9abcba2af98d000bfd2796ee78 --- .../files/jenkins_job_builder/config/devstack-gate.yaml | 2 +- .../files/jenkins_job_builder/config/solum.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 3eca618c15..ae7035833d 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -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 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml index a63b89631b..5a109f5ebf 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml @@ -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"