openqa etc.: use pip for local installs, not setuptools
On Fedora 39, we ran into an issue with setuptools that isn't immediately resolvable: https://github.com/pypa/setuptools/issues/3797#issuecomment-1783613895 using pip like this seems to avoid it. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
530f69d967
commit
504b8217d3
4 changed files with 8 additions and 16 deletions
|
@ -110,7 +110,7 @@
|
||||||
|
|
||||||
- name: Install required packages
|
- name: Install required packages
|
||||||
package:
|
package:
|
||||||
name: ['fedora-messaging', 'python3-fedfind', 'python3-openqa_client', 'python3-setuptools',
|
name: ['fedora-messaging', 'python3-fedfind', 'python3-openqa_client', 'python3-pip',
|
||||||
'python3-pip']
|
'python3-pip']
|
||||||
state: present
|
state: present
|
||||||
tags:
|
tags:
|
||||||
|
@ -130,9 +130,7 @@
|
||||||
check_mode: no
|
check_mode: no
|
||||||
|
|
||||||
- name: Install check-compose
|
- name: Install check-compose
|
||||||
command: "python3 setup.py install --nodeps"
|
command: "python3 -m pip install /root/check-compose"
|
||||||
args:
|
|
||||||
chdir: /root/check-compose
|
|
||||||
when: "gitcc is changed or instcc.rc != 0"
|
when: "gitcc is changed or instcc.rc != 0"
|
||||||
notify:
|
notify:
|
||||||
- restart check-compose
|
- restart check-compose
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
package:
|
package:
|
||||||
# 'relval' itself is needed as we call it directly for size
|
# 'relval' itself is needed as we call it directly for size
|
||||||
# checking
|
# checking
|
||||||
name: ['python3-fedfind', 'fedora-messaging', 'python3-pip', 'python3-setuptools', 'python3-openqa_client']
|
name: ['python3-fedfind', 'fedora-messaging', 'python3-pip', 'python3-pip', 'python3-openqa_client']
|
||||||
state: present
|
state: present
|
||||||
tags:
|
tags:
|
||||||
- packages
|
- packages
|
||||||
|
@ -97,9 +97,7 @@
|
||||||
check_mode: no
|
check_mode: no
|
||||||
|
|
||||||
- name: Install fedora_nightlies
|
- name: Install fedora_nightlies
|
||||||
command: "python3 setup.py install"
|
command: "python3 -m pip install /root/fedora_nightlies"
|
||||||
args:
|
|
||||||
chdir: /root/fedora_nightlies
|
|
||||||
when: "gitfn is changed or instfn.rc != 0"
|
when: "gitfn is changed or instfn.rc != 0"
|
||||||
notify:
|
notify:
|
||||||
- restart fedora_nightlies
|
- restart fedora_nightlies
|
||||||
|
|
|
@ -176,7 +176,7 @@
|
||||||
package:
|
package:
|
||||||
name: ['fedora-messaging', 'python3-fedfind', 'python3-wikitcms', 'python3-openqa_client',
|
name: ['fedora-messaging', 'python3-fedfind', 'python3-wikitcms', 'python3-openqa_client',
|
||||||
'python3-requests', 'python3-resultsdb_api', 'python3-resultsdb_conventions-fedora',
|
'python3-requests', 'python3-resultsdb_api', 'python3-resultsdb_conventions-fedora',
|
||||||
'python3-setuptools', 'python3-six', 'python3-pip']
|
'python3-six', 'python3-pip']
|
||||||
state: present
|
state: present
|
||||||
tags:
|
tags:
|
||||||
- packages
|
- packages
|
||||||
|
@ -220,9 +220,7 @@
|
||||||
check_mode: no
|
check_mode: no
|
||||||
|
|
||||||
- name: Install fedora_openqa
|
- name: Install fedora_openqa
|
||||||
command: "python3 setup.py install"
|
command: "python3 -m pip install /root/fedora_openqa"
|
||||||
args:
|
|
||||||
chdir: /root/fedora_openqa
|
|
||||||
when: "gittools is changed or insttools.rc != 0"
|
when: "gittools is changed or insttools.rc != 0"
|
||||||
notify:
|
notify:
|
||||||
- restart openqa consumers
|
- restart openqa consumers
|
||||||
|
|
|
@ -107,7 +107,7 @@
|
||||||
# 'relval' itself is needed as we call it directly for size
|
# 'relval' itself is needed as we call it directly for size
|
||||||
# checking
|
# checking
|
||||||
name: ['python3-fedfind', 'python3-wikitcms', 'fedora-messaging',
|
name: ['python3-fedfind', 'python3-wikitcms', 'fedora-messaging',
|
||||||
'python3-mwclient', 'python3-pip', 'python3-setuptools', 'relval']
|
'python3-mwclient', 'python3-pip', 'python3-pip', 'relval']
|
||||||
state: present
|
state: present
|
||||||
tags:
|
tags:
|
||||||
- packages
|
- packages
|
||||||
|
@ -148,9 +148,7 @@
|
||||||
check_mode: no
|
check_mode: no
|
||||||
|
|
||||||
- name: Install relvalconsumer
|
- name: Install relvalconsumer
|
||||||
command: "python3 setup.py install"
|
command: "python3 -m pip install /root/relvalconsumer"
|
||||||
args:
|
|
||||||
chdir: /root/relvalconsumer
|
|
||||||
when: "gitrvc is changed or instrvc.rc != 0"
|
when: "gitrvc is changed or instrvc.rc != 0"
|
||||||
notify:
|
notify:
|
||||||
- restart relvalconsumer
|
- restart relvalconsumer
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue