From 31eadd8442422fab827c994fa1da1f0575a5b68c Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Wed, 1 Apr 2015 20:29:54 +0000
Subject: [PATCH] changing taskotron roles that use infra repo to use
 infra-testing for dev/stg, explicitly adding resultsdb_api to
 taskotron-client

---
 roles/taskotron/fake_fedorainfra/tasks/main.yml   |  8 ++++++++
 roles/taskotron/resultsdb-backend/tasks/main.yml  | 10 ++++++++++
 roles/taskotron/resultsdb-frontend/tasks/main.yml |  8 ++++++++
 roles/taskotron/taskotron-client/tasks/main.yml   | 10 ++++++++++
 roles/taskotron/taskotron-trigger/tasks/main.yml  | 11 +++++++++++
 5 files changed, 47 insertions(+)

diff --git a/roles/taskotron/fake_fedorainfra/tasks/main.yml b/roles/taskotron/fake_fedorainfra/tasks/main.yml
index 5281510416..3491d577ff 100644
--- a/roles/taskotron/fake_fedorainfra/tasks/main.yml
+++ b/roles/taskotron/fake_fedorainfra/tasks/main.yml
@@ -1,5 +1,13 @@
 - name: ensure packages required for fakefedorainfra are installed
   action: yum name={{ item }} state=latest
+  when: deployment_type == 'prod'
+  with_items:
+    - mod_wsgi
+    - fake_fedorainfra
+
+- name: ensure packages required for fakefedorainfra are installed (infra-testing)
+  action: yum name={{ item }} state=latest enablerepo=infrastructure-testing
+  when: deployment_type == 'dev' or deployment_type == 'stg'
   with_items:
     - mod_wsgi
     - fake_fedorainfra
diff --git a/roles/taskotron/resultsdb-backend/tasks/main.yml b/roles/taskotron/resultsdb-backend/tasks/main.yml
index 331eff3471..3653629b60 100644
--- a/roles/taskotron/resultsdb-backend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-backend/tasks/main.yml
@@ -1,5 +1,15 @@
 - name: ensure packages required for resultsdb are installed
   action: yum name={{ item }} state=latest
+  when: deployment_type == 'prod'
+  with_items:
+    - resultsdb
+    - mod_wsgi
+    - python-psycopg2
+    - libsemanage-python
+
+- name: ensure packages required for resultsdb are installed (infra-testing)
+  action: yum name={{ item }} state=latest enablerepo=infrastructure-testing
+  when: deployment_type == 'dev' or deployment_type == 'stg'
   with_items:
     - resultsdb
     - mod_wsgi
diff --git a/roles/taskotron/resultsdb-frontend/tasks/main.yml b/roles/taskotron/resultsdb-frontend/tasks/main.yml
index 46bd77c471..d4a84334a7 100644
--- a/roles/taskotron/resultsdb-frontend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-frontend/tasks/main.yml
@@ -1,5 +1,13 @@
 - name: ensure packages required for resultsdb_frontend are installed
   action: yum name={{ item }} state=latest
+  when: deployment_type == 'prod'
+  with_items:
+    - resultsdb_frontend
+    - mod_wsgi
+
+- name: ensure packages required for resultsdb_frontend are installed (infra-testing)
+  action: yum name={{ item }} state=latest enablerepo=infrastructure-testing
+  when: deployment_type == 'dev' or deployment_type == 'stg'
   with_items:
     - resultsdb_frontend
     - mod_wsgi
diff --git a/roles/taskotron/taskotron-client/tasks/main.yml b/roles/taskotron/taskotron-client/tasks/main.yml
index 2733bda5d5..f99688c3cb 100644
--- a/roles/taskotron/taskotron-client/tasks/main.yml
+++ b/roles/taskotron/taskotron-client/tasks/main.yml
@@ -1,8 +1,18 @@
 - name: ensure packages required for libtaskotron are installed
   action: yum name={{ item }} state=latest
+  when: deployment_type == 'prod'
   with_items:
     - PyYAML
     - libtaskotron
+    - resultsdb_api
+
+- name: ensure packages required for libtaskotron are installed (infra-testing)
+  action: yum name={{ item }} state=latest enablerepo=infrastructure-testing
+  when: deployment_type == 'dev' or deployment_type == 'stg'
+  with_items:
+    - PyYAML
+    - libtaskotron
+    - resultsdb_api
 
 - name: ensure packages required for taskotron tasks are installed
   action: yum name={{ item }} state=latest
diff --git a/roles/taskotron/taskotron-trigger/tasks/main.yml b/roles/taskotron/taskotron-trigger/tasks/main.yml
index 133494044e..09965bd467 100644
--- a/roles/taskotron/taskotron-trigger/tasks/main.yml
+++ b/roles/taskotron/taskotron-trigger/tasks/main.yml
@@ -1,5 +1,16 @@
 - name: ensure packages required for taskotron-trigger are installed
   action: yum name={{ item }} state=latest
+  when: deployment_type == 'prod'
+  with_items:
+    - fedmsg
+    - fedmsg-hub
+    - taskotron-trigger
+    # needed for cron script
+    - resultsdb_api
+
+- name: ensure packages required for taskotron-trigger are installed (infra-testing)
+  action: yum name={{ item }} state=latest enablerepo=infrastructure-testing
+  when: deployment_type == 'dev' or deployment_type == 'stg'
   with_items:
     - fedmsg
     - fedmsg-hub