Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Use new --nodeps for Python 3 setup.py installs (oqa etc)

Browse source 
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>
This commit is contained in:
Adam Williamson 2018-11-26 15:29:22 -08:00
parent 6e758a7dac
commit 2426ab6e5c
4 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/autocloudreporter/tasks/main.yml
View file

@ -45,7 +45,7 @@
register: gitacr register: gitacr
- name: Install autocloudreporter (Python 2) - name: Install autocloudreporter (Python 2)
command: "python2 setup.py install" command: "python2 setup.py install --nodeps"
args: args:
chdir: /root/autocloudreporter chdir: /root/autocloudreporter
when: "gitacr is changed and 'python34-fedmsg' not in group_names" when: "gitacr is changed and 'python34-fedmsg' not in group_names"
@ -67,7 +67,7 @@
- restart fedmsg-hub - restart fedmsg-hub
- name: Install autocloudreporter (Python 3) - name: Install autocloudreporter (Python 3)
command: "python3 setup.py install" command: "python3 setup.py install --nodeps"
args: args:
chdir: /root/autocloudreporter chdir: /root/autocloudreporter
when: "(gitacr is changed or (py2acrinstalled is defined and py2acrinstalled.files)) and 'python34-fedmsg' in group_names" when: "(gitacr is changed or (py2acrinstalled is defined and py2acrinstalled.files)) and 'python34-fedmsg' in group_names"

4
roles/check-compose/tasks/main.yml
View file

@ -74,7 +74,7 @@
register: gitcc register: gitcc
- name: Install check-compose (Python 2) - name: Install check-compose (Python 2)
command: "python2 setup.py install" command: "python2 setup.py install --nodeps"
args: args:
chdir: /root/check-compose chdir: /root/check-compose
when: "gitcc is changed and 'python34-fedmsg' not in group_names" when: "gitcc is changed and 'python34-fedmsg' not in group_names"
@ -96,7 +96,7 @@
- restart fedmsg-hub - restart fedmsg-hub
- name: Install check-compose (Python 3) - name: Install check-compose (Python 3)
command: "python3 setup.py install" command: "python3 setup.py install --nodeps"
args: args:
chdir: /root/check-compose chdir: /root/check-compose
when: "(gitcc is changed or (py2ccinstalled is defined and py2ccinstalled.files)) and 'python34-fedmsg' in group_names" when: "(gitcc is changed or (py2ccinstalled is defined and py2ccinstalled.files)) and 'python34-fedmsg' in group_names"

15
roles/openqa/dispatcher/tasks/main.yml
View file

@ -107,9 +107,18 @@
register: gittools register: gittools
when: "(toolsbranch.stderr.find('Not a git repository') != -1) or (toolsbranch.stdout.find('On branch master') != -1)" 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 stat: path=/usr/bin/fedora-openqa
register: insttools 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" changed_when: "1 != 1"
failed_when: "1 != 1" failed_when: "1 != 1"
check_mode: no check_mode: no
@ -124,7 +133,7 @@
check_mode: no check_mode: no
- name: Install fedora_openqa (Python 2) - name: Install fedora_openqa (Python 2)
command: "python2 setup.py install" command: "python2 setup.py install --nodeps"
args: args:
chdir: /root/fedora_openqa chdir: /root/fedora_openqa
when: "(gittools is changed or not insttools.stat.exists) and 'python34-fedmsg' not in group_names" when: "(gittools is changed or not insttools.stat.exists) and 'python34-fedmsg' not in group_names"
@ -146,7 +155,7 @@
- restart fedmsg-hub - restart fedmsg-hub
- name: Install fedora_openqa (Python 3) - name: Install fedora_openqa (Python 3)
command: "python3 setup.py install" command: "python3 setup.py install --nodeps"
args: args:
chdir: /root/fedora_openqa 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" when: "(gittools is changed or not insttools.stat.exists or (py2oqainstalled is defined and py2oqainstalled.files)) and 'python34-fedmsg' in group_names"

4
roles/relvalconsumer/tasks/main.yml
View file

@ -104,7 +104,7 @@
register: gitrvc register: gitrvc
- name: Install relvalconsumer (Python 2) - name: Install relvalconsumer (Python 2)
command: "python2 setup.py install" command: "python2 setup.py install --nodeps"
args: args:
chdir: /root/relvalconsumer chdir: /root/relvalconsumer
when: "gitrvc is changed and 'python34-fedmsg' not in group_names" when: "gitrvc is changed and 'python34-fedmsg' not in group_names"
@ -126,7 +126,7 @@
- restart fedmsg-hub - restart fedmsg-hub
- name: Install relvalconsumer (Python 3) - name: Install relvalconsumer (Python 3)
command: "python3 setup.py install" command: "python3 setup.py install --nodeps"
args: args:
chdir: /root/relvalconsumer chdir: /root/relvalconsumer
when: "(gitrvc is changed or (py2rvinstalled is defined and py2rvinstalled.files)) and 'python34-fedmsg' in group_names" when: "(gitrvc is changed or (py2rvinstalled is defined and py2rvinstalled.files)) and 'python34-fedmsg' in group_names"