From dc445242bc8ad55b872a034225a8edbd74fe6605 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 16 Jun 2020 08:14:53 -0500
Subject: [PATCH] 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
---
 .zuul.yaml                     | 1 +
 playbooks/quick-start/pre.yaml | 7 +++++++
 playbooks/quick-start/run.yaml | 6 ------
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 playbooks/quick-start/pre.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index b63aa06b78..935b04f56d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -120,6 +120,7 @@
     name: zuul-quick-start
     parent: opendev-buildset-registry-consumer
     description: Run the commands in the Zuul quick-start documentation.
+    pre-run: playbooks/quick-start/pre.yaml
     run: playbooks/quick-start/run.yaml
     post-run: playbooks/quick-start/post.yaml
     required-projects:
diff --git a/playbooks/quick-start/pre.yaml b/playbooks/quick-start/pre.yaml
new file mode 100644
index 0000000000..b4e3c024f0
--- /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 4b6bfb6a6d..29dc9a8b83 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