From bda02c43fb022a155157402764cd5a74478b8cf1 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Mon, 22 Apr 2019 15:04:01 -0700 Subject: [PATCH] Direct bridge to be setup The multinode jobs are failing because the br-infra bridge is not being setup. It is not being setup because somewhere in the infra, the multi-node-bridge role is never established as a requirement. Realistically, only ironic does this, but we need to ensure it is present. Change-Id: Ia1dcc68d7e75a931e01829ce23da36c978a70765 --- playbooks/ci-workarounds/{set-stack-key.yaml => pre.yaml} | 4 +++- zuul.d/ironic-jobs.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) rename playbooks/ci-workarounds/{set-stack-key.yaml => pre.yaml} (83%) diff --git a/playbooks/ci-workarounds/set-stack-key.yaml b/playbooks/ci-workarounds/pre.yaml similarity index 83% rename from playbooks/ci-workarounds/set-stack-key.yaml rename to playbooks/ci-workarounds/pre.yaml index d2882a4420..27f9cad1fa 100644 --- a/playbooks/ci-workarounds/set-stack-key.yaml +++ b/playbooks/ci-workarounds/pre.yaml @@ -1,5 +1,5 @@ - hosts: all - name: Copy ssh keys from too ~stack + name: Pre-setup tasks tasks: - shell: cmd: | @@ -11,3 +11,5 @@ sudo chmod 700 ~stack/.ssh sudo chown -R stack ~stack executable: /bin/bash + roles: + - multi-node-bridge diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 92331fbd4d..3bb983ffa2 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -305,7 +305,7 @@ name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode description: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode parent: tempest-multinode-full - pre-run: playbooks/ci-workarounds/set-stack-key.yaml + pre-run: playbooks/ci-workarounds/pre.yaml timeout: 10800 required-projects: - openstack/ironic @@ -326,6 +326,8 @@ - ^setup.cfg$ - ^tools/.*$ - ^tox.ini$ + roles: + - zuul: opendev.org/zuul/zuul-jobs vars: tox_envlist: all tempest_concurrency: 4