summaryrefslogtreecommitdiff
path: root/playbooks
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2020-06-16 08:14:53 -0500
committerMonty Taylor <mordred@inaugust.com>2020-06-16 09:12:48 -0500
commitdc445242bc8ad55b872a034225a8edbd74fe6605 (patch)
tree8d709558dbdb2ca9d6287c839d1f1ba5eff4ec8f /playbooks
parentca63ba72a857ec434342a8cd6846db73a711ea13 (diff)
downloadzuul-dc445242bc8ad55b872a034225a8edbd74fe6605.tar.gz
Shift docker and pip setup to pre-playbook for quick-start
Installing docker and pip are pre-reqs and we're using zuul roles to do them, so they're not really testing explicit quick-start steps. Move them to pre-run. Change-Id: I374dac18b9b7e376d924b11f4661355ea7c4d149
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/quick-start/pre.yaml7
-rw-r--r--playbooks/quick-start/run.yaml6
2 files changed, 7 insertions, 6 deletions
diff --git a/playbooks/quick-start/pre.yaml b/playbooks/quick-start/pre.yaml
new file mode 100644
index 000000000..b4e3c024f
--- /dev/null
+++ b/playbooks/quick-start/pre.yaml
@@ -0,0 +1,7 @@
+- hosts: all
+ roles:
+ - ensure-pip
+ - name: ensure-docker
+ use_upstream_docker: false
+ docker_compose_install: true
+ - use-buildset-registry
diff --git a/playbooks/quick-start/run.yaml b/playbooks/quick-start/run.yaml
index 4b6bfb6a6..29dc9a8b8 100644
--- a/playbooks/quick-start/run.yaml
+++ b/playbooks/quick-start/run.yaml
@@ -2,12 +2,6 @@
vars:
workspace: /tmp/quickstart-test
local: false
- roles:
- - name: ensure-docker
- use_upstream_docker: false
- docker_compose_install: true
- - ensure-pip
- - use-buildset-registry
tasks:
- name: Install git-review
command: python3 -m pip install git-review