From 4a6d33d863cb3d17c59d9bc93db8a52744761f65 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 10 Nov 2017 18:34:10 -0800
Subject: [PATCH] openqa, relvalconsumer: need fedfind/wikitcms from u-t for
 now

---
 roles/openqa/dispatcher/tasks/main.yml | 14 +++++++-------
 roles/openqa/server/tasks/main.yml     |  5 ++---
 roles/relvalconsumer/tasks/main.yml    |  5 +++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index f980387547..e1e8b42203 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -38,17 +38,18 @@
 # scheduler is no longer responsible for downloading assets.
 
 # just keeping this around for convenience as we often need it
-#- name: Install required packages (testing)
-#  dnf: name={{ item }} state=present enablerepo="updates-testing"
-#  with_items:
+- name: Install required packages (testing)
+  dnf: name={{ item }} state=present enablerepo="updates-testing"
+  with_items:
+  - python2-fedfind
+  - python2-wikitcms
 
-#  tags:
-#  - packages
+  tags:
+  - packages
 
 - name: Install required packages
   dnf: name={{ item }} state=present
   with_items:
-  - python2-fedfind
   - python2-fedmsg-consumers
   - python2-openqa_client
   - python2-requests
@@ -56,7 +57,6 @@
   - python2-resultsdb_conventions-fedora
   - python-setuptools
   - python-six
-  - python2-wikitcms
   tags:
   - packages
 
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 01ed125f5c..b557c728e6 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -64,12 +64,13 @@
 # stable and testing
 - name: Install openQA packages
   dnf: name={{ item }} state=present enablerepo="updates-testing"
-#  dnf: name={{ item }} state=present
   with_items:
   - openqa
   - openqa-httpd
   - openqa-plugin-fedmsg
   - openqa-plugin-fedoraupdaterestart
+  - python2-fedfind
+  - python3-fedfind
   tags:
   - packages
 
@@ -89,8 +90,6 @@
   - libguestfs-xfs
   - libvirt-daemon-config-network
   - libvirt-python3
-  - python2-fedfind
-  - python3-fedfind
   - python3-libguestfs
   - virt-install
   - withlock
diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml
index bc068047e3..9a9d95c11b 100644
--- a/roles/relvalconsumer/tasks/main.yml
+++ b/roles/relvalconsumer/tasks/main.yml
@@ -14,11 +14,13 @@
 ##              EVER BE TRUE ON ONE SYSTEM IN THE WORLD**
 ##       default - False
 
-# note: we need updates-testing until fedfind 3.1.3 goes stable
+# note: we need updates-testing until fedfind 3.8.0 / wikitcms 2.2.0
+# goes stable
 - name: Install required packages (testing)
   dnf: name={{ item }} state=present enablerepo="updates-testing"
   with_items:
   - python2-fedfind
+  - python2-wikitcms
   tags:
   - packages
 
@@ -28,7 +30,6 @@
   - python2-fedmsg-consumers
   - python2-mwclient
   - python-setuptools
-  - python2-wikitcms
   tags:
   - packages