From 2d16f0fd071be47ecac73b266b165a925b91d390 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Wed, 17 Jun 2020 20:10:19 +0000
Subject: [PATCH] phoronix-test-suite: extract ensure- role from run playbook

This change adds a new phoronix-test-suite/pre.yaml playbook to
ensure-phoronix-test-suite is installed.

Change-Id: I30d8cca408cca006a452db35cb4f40d4af526dec
---
 playbooks/phoronix-test-suite/combine.yaml | 1 -
 playbooks/phoronix-test-suite/pre.yaml     | 3 +++
 playbooks/phoronix-test-suite/run.yaml     | 1 -
 zuul.d/system-jobs.yaml                    | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 playbooks/phoronix-test-suite/pre.yaml

diff --git a/playbooks/phoronix-test-suite/combine.yaml b/playbooks/phoronix-test-suite/combine.yaml
index e23c3f336..c9b2c1613 100644
--- a/playbooks/phoronix-test-suite/combine.yaml
+++ b/playbooks/phoronix-test-suite/combine.yaml
@@ -1,5 +1,4 @@
 ---
 - hosts: all
   roles:
-    - ensure-phoronix-test-suite
     - phoronix-combine-results
diff --git a/playbooks/phoronix-test-suite/pre.yaml b/playbooks/phoronix-test-suite/pre.yaml
new file mode 100644
index 000000000..444256f5b
--- /dev/null
+++ b/playbooks/phoronix-test-suite/pre.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - ensure-phoronix-test-suite
diff --git a/playbooks/phoronix-test-suite/run.yaml b/playbooks/phoronix-test-suite/run.yaml
index 40961f60e..a56bde662 100644
--- a/playbooks/phoronix-test-suite/run.yaml
+++ b/playbooks/phoronix-test-suite/run.yaml
@@ -1,4 +1,3 @@
 - hosts: all
   roles:
-    - ensure-phoronix-test-suite
     - phoronix-test-suite
diff --git a/zuul.d/system-jobs.yaml b/zuul.d/system-jobs.yaml
index e04450a8a..771d55f22 100644
--- a/zuul.d/system-jobs.yaml
+++ b/zuul.d/system-jobs.yaml
@@ -1,6 +1,7 @@
 - job:
     name: phoronix-test-suite
     description: A system job to validate test resources
+    pre-run: playbooks/phoronix-test-suite/pre.yaml
     run: playbooks/phoronix-test-suite/run.yaml
     post-run: playbooks/phoronix-test-suite/post.yaml
 
@@ -9,5 +10,6 @@
     description: A system job to combine multiple results
     vars:
       phoronix_combined_result_name: "phoronix-combined-result"
+    pre-run: playbooks/phoronix-test-suite/pre.yaml
     run: playbooks/phoronix-test-suite/combine.yaml
     post-run: playbooks/phoronix-test-suite/post-combine.yaml