From a8eba01a5687f02b358ef0cf49c7ed0d482f9247 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 8 Mar 2016 14:09:01 -0800
Subject: [PATCH] openqa/check-compose: tweak package installs and sources

we need some from updates-testing for now. also, we need
openqa-httpd for the server.
---
 roles/check-compose/tasks/main.yml     |  9 ++++++++-
 roles/openqa/dispatcher/tasks/main.yml | 11 +++++++++--
 roles/openqa/server/tasks/main.yml     | 10 ++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml
index bdb43697c0..84d4550ba8 100644
--- a/roles/check-compose/tasks/main.yml
+++ b/roles/check-compose/tasks/main.yml
@@ -27,10 +27,17 @@
 # client.conf will be in place (and localhost default would be correct
 # anyhow)
 
+# note: we need updates-testing until fedfind/wikitcms 2.x go stable
+- name: Install required packages (testing)
+  dnf: name={{ item }} state=present enablerepo="updates-testing"
+  with_items:
+  - fedfind
+  tags:
+  - packages
+
 - name: Install required packages
   dnf: name={{ item }} state=present
   with_items:
-  - fedfind
   - python2-fedmsg-consumers
   - python-setuptools
   - python-six
diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index 120c604ca2..ac569b5992 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -22,12 +22,19 @@
 # as we now use the openQA asset downloading capability so that the
 # scheduler is no longer responsible for downloading assets.
 
+# note: we need updates-testing until fedfind/wikitcms 2.x go stable
+- name: Install required packages (testing)
+  dnf: name={{ item }} state=present enablerepo="updates-testing"
+  with_items:
+  - fedfind
+  - python2-wikitcms
+  tags:
+  - packages
+
 - name: Install required packages
   dnf: name={{ item }} state=present
   with_items:
-  - fedfind
   - python2-fedmsg-consumers
-  - python2-wikitcms
   - python-requests
   - python-setuptools
   - python-six
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index cdcde94c9b..3e67d27cd0 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -61,6 +61,16 @@
     shell: /sbin/nologin
   when: "gotgeeko.rc > 0"
 
+# note: we need updates-testing until fedfind 2.x and openQA 4.3-18 go stable
+- name: Install required packages (testing)
+  dnf: name={{ item }} state=present enablerepo="updates-testing"
+  with_items:
+  - python2-fedfind
+  - openqa
+  - openqa-httpd
+  tags:
+  - packages
+
 - name: Install required packages
   dnf: name={{ item }} state=present enablerepo=adamwill-openQA
   with_items: