diff options
| author | Julia Kreger <juliaashleykreger@gmail.com> | 2019-04-22 15:04:01 -0700 |
|---|---|---|
| committer | Julia Kreger <juliaashleykreger@gmail.com> | 2019-04-23 16:47:24 +0000 |
| commit | bda02c43fb022a155157402764cd5a74478b8cf1 (patch) | |
| tree | 9ef2bd94556db7d9293840b3e801e36d4641a3ad | |
| parent | d0e6c6cb10a9dab54e605975e5d763994ed0e1be (diff) | |
| download | ironic-bda02c43fb022a155157402764cd5a74478b8cf1.tar.gz | |
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
| -rw-r--r-- | playbooks/ci-workarounds/pre.yaml (renamed from playbooks/ci-workarounds/set-stack-key.yaml) | 4 | ||||
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/playbooks/ci-workarounds/set-stack-key.yaml b/playbooks/ci-workarounds/pre.yaml index d2882a442..27f9cad1f 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 92331fbd4..3bb983ffa 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 |