summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.yaml4
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