From 89a9d75dba54133325d1b4f1bbb6799e46771a74 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Fri, 25 Mar 2022 13:59:42 +0100 Subject: [PATCH] Remove the zuul pragma to match master and feature/r1 This yoga branch should not provide configs to master and feature/r1. Doing so causes devstack's pre-run playbook to run twice as we run both master's and yoga's pre-run playbooks. This then fails because the configure-swap role is not idempotent. We fix this by detaching yoga from master here and let master run master configs and yoga runs yoga configs. Change-Id: I958763a9329bd274415599a665b1295f59514bee --- .zuul.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 067d3f5b08..4701d9a262 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,11 +1,3 @@ -- pragma: - # NOTE(gtema): this is required for the changes in SDK feature/r1 branch to - # be using devstack - # TODO(gtema): delete this once r1 branch is merged into master - implied-branches: - - master - - feature/r1 - - nodeset: name: openstack-single-node nodes: