From f855222a93c74afc8257c03d1dab29c320619036 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 29 Dec 2017 13:52:48 -0800 Subject: [PATCH] CI: move tacker / congress from scenario001 to 007 scenario001 is timeouting a lot while scenario 007 is fine and far from timeout limit, so moving out services. Change-Id: Id34321f95a0584cbc9f6e40f3cd47ed0386cfc9d --- ci/environments/scenario001-multinode-containers.yaml | 6 ------ ci/environments/scenario007-multinode-containers.yaml | 6 ++++++ zuul.d/layout.yaml | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index ba7f46f435..9d6f729a4b 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -7,10 +7,6 @@ resource_registry: OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml - # TODO(mandre) fix the tacker service - https://bugs.launchpad.net/tripleo/+bug/1714270 - # OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml - OS::TripleO::Services::Tacker: ../../puppet/services/tacker.yaml - OS::TripleO::Services::Congress: ../../docker/services/congress.yaml OS::TripleO::Services::RabbitMQ: ../../docker/services/pacemaker/rabbitmq.yaml OS::TripleO::Services::HAproxy: ../../docker/services/pacemaker/haproxy.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml @@ -89,8 +85,6 @@ parameter_defaults: - OS::TripleO::Services::CinderScheduler - OS::TripleO::Services::CinderVolume - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Tacker - - OS::TripleO::Services::Congress - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::Fluentd diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index 6c811d0708..8acf5ee9dd 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/ci/environments/scenario007-multinode-containers.yaml @@ -10,6 +10,10 @@ resource_registry: OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None + # TODO(mandre) fix the tacker service - https://bugs.launchpad.net/tripleo/+bug/1714270 + # OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml + OS::TripleO::Services::Tacker: ../../puppet/services/tacker.yaml + OS::TripleO::Services::Congress: ../../docker/services/congress.yaml parameter_defaults: ControllerServices: - OS::TripleO::Services::Clustercheck @@ -46,6 +50,8 @@ parameter_defaults: - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::Sshd - OS::TripleO::Services::Iscsid + - OS::TripleO::Services::Tacker + - OS::TripleO::Services::Congress ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 4affc6ba93..804fd8a6e6 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -39,14 +39,12 @@ - ^(docker|puppet)/services/ceilometer.*$ - ^(docker|puppet)/services/ceph.*$ - ^(docker|puppet)/services/cinder.*$ - - ^(docker|puppet)/services/congress.*$ - ^(docker|puppet)/services/glance.*$ - ^(docker|puppet)/services/gnocchi.*$ - ^(docker|puppet)/services/logging.*$ - ^(docker|puppet)/services/metrics.*$ - ^(docker|puppet)/services/monitoring.*$ - ^(docker|puppet)/services/panko.*$ - - ^(docker|puppet)/services/tacker.*$ - ci/environments/scenario001-multinode-containers.yaml - ci/pingtests/scenario001.*$ - ^environments\/.*.yaml @@ -132,6 +130,8 @@ - ci/environments/scenario007-multinode-containers.yaml - ci/pingtests/scenario007-multinode.yaml - ^(docker|puppet)/services/.*ovn.*$ + - ^(docker|puppet)/services/congress.*$ + - ^(docker|puppet)/services/tacker.*$ - ^environments\/.*.yaml gate: queue: tripleo @@ -203,6 +203,8 @@ - ci/environments/scenario007-multinode-containers.yaml - ci/pingtests/scenario007-multinode.yaml - ^(docker|puppet)/services/.*ovn.*$ + - ^(docker|puppet)/services/congress.*$ + - ^(docker|puppet)/services/tacker.*$ - ^environments\/.*.yaml experimental: jobs: