From 2426ab6e5c59610b51a4e3b79d0472e4070027bf Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 26 Nov 2018 15:29:22 -0800
Subject: [PATCH] Use new --nodeps for Python 3 setup.py installs (oqa etc)

This should hopefully avoid an awkward problem I noticed with
'python3 setup.py install' dumping replacements in /usr/local
for packaged scripts (e.g. fedmsg-logger)...

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 roles/autocloudreporter/tasks/main.yml |  4 ++--
 roles/check-compose/tasks/main.yml     |  4 ++--
 roles/openqa/dispatcher/tasks/main.yml | 15 ++++++++++++---
 roles/relvalconsumer/tasks/main.yml    |  4 ++--
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/roles/autocloudreporter/tasks/main.yml b/roles/autocloudreporter/tasks/main.yml
index 9b78292d54..6a9273c932 100644
--- a/roles/autocloudreporter/tasks/main.yml
+++ b/roles/autocloudreporter/tasks/main.yml
@@ -45,7 +45,7 @@
   register: gitacr
 
 - name: Install autocloudreporter (Python 2)
-  command: "python2 setup.py install"
+  command: "python2 setup.py install --nodeps"
   args:
     chdir: /root/autocloudreporter
   when: "gitacr is changed and 'python34-fedmsg' not in group_names"
@@ -67,7 +67,7 @@
   - restart fedmsg-hub
 
 - name: Install autocloudreporter (Python 3)
-  command: "python3 setup.py install"
+  command: "python3 setup.py install --nodeps"
   args:
     chdir: /root/autocloudreporter
   when: "(gitacr is changed or (py2acrinstalled is defined and py2acrinstalled.files)) and 'python34-fedmsg' in group_names"
diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml
index 2a78263684..b92fd79486 100644
--- a/roles/check-compose/tasks/main.yml
+++ b/roles/check-compose/tasks/main.yml
@@ -74,7 +74,7 @@
   register: gitcc
 
 - name: Install check-compose (Python 2)
-  command: "python2 setup.py install"
+  command: "python2 setup.py install --nodeps"
   args:
     chdir: /root/check-compose
   when: "gitcc is changed and 'python34-fedmsg' not in group_names"
@@ -96,7 +96,7 @@
   - restart fedmsg-hub
 
 - name: Install check-compose (Python 3)
-  command: "python3 setup.py install"
+  command: "python3 setup.py install --nodeps"
   args:
     chdir: /root/check-compose
   when: "(gitcc is changed or (py2ccinstalled is defined and py2ccinstalled.files)) and 'python34-fedmsg' in group_names"
diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index 41e29ecb19..4ca21beb84 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -107,9 +107,18 @@
   register: gittools
   when: "(toolsbranch.stderr.find('Not a git repository') != -1) or (toolsbranch.stdout.find('On branch master') != -1)"
 
-- name: Check if fedora_openqa has ever been installed
+- name: Check if fedora_openqa has ever been installed (Python 2)
   stat: path=/usr/bin/fedora-openqa
   register: insttools
+  when: "'python34-fedmsg' not in group_names"
+  changed_when: "1 != 1"
+  failed_when: "1 != 1"
+  check_mode: no
+
+- name: Check if fedora_openqa has ever been installed (Python 3)
+  stat: path=/usr/local/bin/fedora-openqa
+  register: insttools
+  when: "'python34-fedmsg' not in group_names"
   changed_when: "1 != 1"
   failed_when: "1 != 1"
   check_mode: no
@@ -124,7 +133,7 @@
   check_mode: no
 
 - name: Install fedora_openqa (Python 2)
-  command: "python2 setup.py install"
+  command: "python2 setup.py install --nodeps"
   args:
     chdir: /root/fedora_openqa
   when: "(gittools is changed or not insttools.stat.exists) and 'python34-fedmsg' not in group_names"
@@ -146,7 +155,7 @@
   - restart fedmsg-hub
 
 - name: Install fedora_openqa (Python 3)
-  command: "python3 setup.py install"
+  command: "python3 setup.py install --nodeps"
   args:
     chdir: /root/fedora_openqa
   when: "(gittools is changed or not insttools.stat.exists or (py2oqainstalled is defined and py2oqainstalled.files)) and 'python34-fedmsg' in group_names"
diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml
index 9d142c550a..17ad87b806 100644
--- a/roles/relvalconsumer/tasks/main.yml
+++ b/roles/relvalconsumer/tasks/main.yml
@@ -104,7 +104,7 @@
   register: gitrvc
 
 - name: Install relvalconsumer (Python 2)
-  command: "python2 setup.py install"
+  command: "python2 setup.py install --nodeps"
   args:
     chdir: /root/relvalconsumer
   when: "gitrvc is changed and 'python34-fedmsg' not in group_names"
@@ -126,7 +126,7 @@
   - restart fedmsg-hub
 
 - name: Install relvalconsumer (Python 3)
-  command: "python3 setup.py install"
+  command: "python3 setup.py install --nodeps"
   args:
     chdir: /root/relvalconsumer
   when: "(gitrvc is changed or (py2rvinstalled is defined and py2rvinstalled.files)) and 'python34-fedmsg' in group_names"