From be294587fd01eb662b4f614317644c079a4d7ebd Mon Sep 17 00:00:00 2001 From: Anusha Ramineni Date: Tue, 21 Nov 2017 09:35:38 +0530 Subject: [PATCH] Fix postgresql jobs and cleanup zuul job files This commit removes the services/projects not required by tests. Earlier, ceilometer(gnocchi backend) doesnt seem to support postgresql, hence jobs are failing. As ceilometer is currently removed now from the supported drivers, removing the same here. Change-Id: Iafb92de6ca2bf502264c77da73d6ab9871a48bbb --- .zuul.yaml | 6 ------ playbooks/legacy/congress-devstack-api-base/run.yaml | 8 ++------ .../legacy/congress-devstack-py35-api-mysql/run.yaml | 2 -- playbooks/legacy/congress-pe-replicated-base/run.yaml | 7 +------ 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 48cbc606c..dc989ef0c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,8 +6,6 @@ - openstack/aodh - openstack/congress - openstack/congress-dashboard - - openstack/designate - - openstack/designate-tempest-plugin - openstack/murano - openstack/murano-dashboard - openstack/python-aodhclient @@ -27,8 +25,6 @@ - openstack/aodh - openstack/congress - openstack/congress-dashboard - - openstack/designate - - openstack/designate-tempest-plugin - openstack/python-aodhclient - openstack/python-congressclient - openstack/murano @@ -60,8 +56,6 @@ - openstack/aodh - openstack/congress - openstack/congress-dashboard - - openstack/designate - - openstack/designate-tempest-plugin - openstack/murano - openstack/murano-dashboard - openstack/python-aodhclient diff --git a/playbooks/legacy/congress-devstack-api-base/run.yaml b/playbooks/legacy/congress-devstack-api-base/run.yaml index 93b88267a..cc3f3d46b 100644 --- a/playbooks/legacy/congress-devstack-api-base/run.yaml +++ b/playbooks/legacy/congress-devstack-api-base/run.yaml @@ -29,12 +29,10 @@ set -x cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] - enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer enable_plugin heat git://git.openstack.org/openstack/heat enable_plugin congress git://git.openstack.org/openstack/congress enable_plugin murano git://git.openstack.org/openstack/murano enable_plugin aodh git://git.openstack.org/openstack/aodh - enable_plugin designate git://git.openstack.org/openstack/designate enable_plugin neutron https://git.openstack.org/openstack/neutron # To deploy congress as multi-process (api, pe, datasources) CONGRESS_MULTIPROCESS_DEPLOYMENT=True @@ -50,7 +48,6 @@ set -e set -x ENABLED_SERVICES=s-proxy,s-object,s-container,s-account, - ENABLED_SERVICES+=h-eng,h-api,h-api-cfn,h-api-cw, ENABLED_SERVICES+=q-qos export PYTHONUNBUFFERED=true @@ -60,14 +57,13 @@ export DEVSTACK_GATE_NEUTRON=1 export PROJECTS="openstack/congress $PROJECTS" export PROJECTS="openstack/congress-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-congressclient + export PROJECTS="openstack/python-congressclient $PROJECTS" + #export DEVSTACK_PROJECT_FROM_GIT=python-congressclient export PROJECTS="openstack/murano $PROJECTS" export PROJECTS="openstack/aodh $PROJECTS" export PROJECTS="openstack/murano-dashboard $PROJECTS" export PROJECTS="openstack/python-muranoclient $PROJECTS" export PROJECTS="openstack/python-aodhclient $PROJECTS" - export PROJECTS="openstack/designate $PROJECTS" - export PROJECTS="openstack/designate-tempest-plugin $PROJECTS" export ENABLED_SERVICES export BRANCH_OVERRIDE=default diff --git a/playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml b/playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml index cbdb1bbb6..c2c25632c 100644 --- a/playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml +++ b/playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml @@ -74,8 +74,6 @@ export PROJECTS="openstack/murano-dashboard $PROJECTS" export PROJECTS="openstack/python-muranoclient $PROJECTS" export PROJECTS="openstack/python-aodhclient $PROJECTS" - export PROJECTS="openstack/designate $PROJECTS" - export PROJECTS="openstack/designate-tempest-plugin $PROJECTS" export ENABLED_SERVICES export BRANCH_OVERRIDE=default diff --git a/playbooks/legacy/congress-pe-replicated-base/run.yaml b/playbooks/legacy/congress-pe-replicated-base/run.yaml index 863bfb0a3..9e074391f 100644 --- a/playbooks/legacy/congress-pe-replicated-base/run.yaml +++ b/playbooks/legacy/congress-pe-replicated-base/run.yaml @@ -29,12 +29,10 @@ set -x cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] - enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer enable_plugin heat git://git.openstack.org/openstack/heat enable_plugin congress git://git.openstack.org/openstack/congress enable_plugin murano git://git.openstack.org/openstack/murano enable_plugin aodh git://git.openstack.org/openstack/aodh - enable_plugin designate git://git.openstack.org/openstack/designate enable_plugin neutron https://git.openstack.org/openstack/neutron CONGRESS_REPLICATED=True # To deploy congress as multi-process (api, pe, datasources) @@ -51,7 +49,6 @@ set -e set -x ENABLED_SERVICES=s-proxy,s-object,s-container,s-account, - ENABLED_SERVICES+=h-eng,h-api,h-api-cfn,h-api-cw, ENABLED_SERVICES+=q-qos export PYTHONUNBUFFERED=true @@ -61,14 +58,12 @@ export DEVSTACK_GATE_NEUTRON=1 export PROJECTS="openstack/congress $PROJECTS" export PROJECTS="openstack/congress-dashboard $PROJECTS" - export DEVSTACK_PROJECT_FROM_GIT=python-congressclient + export PROJECTS="openstack/python-congressclient $PROJECTS" export PROJECTS="openstack/murano $PROJECTS" export PROJECTS="openstack/aodh $PROJECTS" export PROJECTS="openstack/murano-dashboard $PROJECTS" export PROJECTS="openstack/python-muranoclient $PROJECTS" export PROJECTS="openstack/python-aodhclient $PROJECTS" - export PROJECTS="openstack/designate $PROJECTS" - export PROJECTS="openstack/designate-tempest-plugin $PROJECTS" export ENABLED_SERVICES export BRANCH_OVERRIDE=default