From 069ae556f484aebbb8afe54503e7abe83b3fcf7b Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jul 31 2020 10:37:48 +0000
Subject: rpm-test: install standard-test-roles before extra-repos


---

diff --git a/playbooks/rpm/rpmtest.yaml b/playbooks/rpm/rpmtest.yaml
index c2a68c5..a571cfc 100644
--- a/playbooks/rpm/rpmtest.yaml
+++ b/playbooks/rpm/rpmtest.yaml
@@ -5,9 +5,9 @@
     - extra-repos-setup
     - run-tests-yml
   pre_tasks:
-    - name: install system deps
+    - name: Install STI system dependencies
       yum:
-        name: ansible
-        state: present
+        name: standard-test-roles
+        state: latest
         use_backend: "dnf"
       become: true
diff --git a/roles/run-tests-yml/defaults/main.yml b/roles/run-tests-yml/defaults/main.yml
index e03e6df..e69de29 100644
--- a/roles/run-tests-yml/defaults/main.yml
+++ b/roles/run-tests-yml/defaults/main.yml
@@ -1 +0,0 @@
-sti_tests: true
diff --git a/roles/run-tests-yml/tasks/main.yaml b/roles/run-tests-yml/tasks/main.yaml
index ba59b19..939cdfc 100644
--- a/roles/run-tests-yml/tasks/main.yaml
+++ b/roles/run-tests-yml/tasks/main.yaml
@@ -14,14 +14,6 @@
     use_backend: "dnf"
   become: yes
 
-- name: Install STI system dependencies
-  yum:
-    name: standard-test-roles
-    state: latest
-    use_backend: "dnf"
-  become: yes
-  when: sti_tests
-
 - name: Get changes generated packages
   shell: repoquery -q --repo zuul-built --all | egrep -v '\.src$'
   register: repoquery