Switch from git checkout to packaged install of openqa_client
In check-compose and openqa/dispatcher roles, now it's packaged.
This commit is contained in:
parent
434409cee9
commit
c32e278190
2 changed files with 19 additions and 45 deletions
|
@ -27,42 +27,29 @@
|
|||
# client.conf will be in place (and localhost default would be correct
|
||||
# anyhow)
|
||||
|
||||
# note: we need updates-testing until fedfind 3.5.0 goes stable
|
||||
- name: Install required packages (testing)
|
||||
dnf: name={{ item }} state=present enablerepo="updates-testing"
|
||||
with_items:
|
||||
- python2-fedfind
|
||||
tags:
|
||||
- packages
|
||||
#- name: Install required packages (testing)
|
||||
# dnf: name={{ item }} state=present enablerepo="updates-testing"
|
||||
# with_items:
|
||||
# - python2-fedfind
|
||||
# tags:
|
||||
# - packages
|
||||
|
||||
# fileglob doesn't do directory names, so we can't really do this
|
||||
# ansiblifically
|
||||
- name: Remove old from-source openQA-python-client install
|
||||
shell: "rm -rf /usr/lib/python2.?/site-packages/openqa_client*"
|
||||
|
||||
- name: Install required packages
|
||||
dnf: name={{ item }} state=present
|
||||
with_items:
|
||||
- python2-fedfind
|
||||
- python2-fedmsg-consumers
|
||||
- python2-openqa_client
|
||||
- python-setuptools
|
||||
- python-six
|
||||
tags:
|
||||
- packages
|
||||
|
||||
- name: Check out openQA-python-client
|
||||
git:
|
||||
repo: https://github.com/os-autoinst/openQA-python-client.git
|
||||
dest: /root/openQA-python-client
|
||||
register: gitclient
|
||||
|
||||
- name: Check if python-client has ever been installed
|
||||
command: "python -c 'import openqa_client'"
|
||||
register: instclient
|
||||
check_mode: no
|
||||
changed_when: "1 != 1"
|
||||
failed_when: "1 != 1"
|
||||
|
||||
- name: Install openQA-python-client
|
||||
command: "python setup.py install"
|
||||
args:
|
||||
chdir: /root/openQA-python-client
|
||||
when: "gitclient|changed or instclient.rc > 0"
|
||||
|
||||
- name: Check out check-compose
|
||||
git:
|
||||
repo: https://pagure.io/fedora-qa/check-compose.git
|
||||
|
|
|
@ -45,11 +45,17 @@
|
|||
# tags:
|
||||
# - packages
|
||||
|
||||
# fileglob doesn't do directory names, so we can't really do this
|
||||
# ansiblifically
|
||||
- name: Remove old from-source openQA-python-client install
|
||||
shell: "rm -rf /usr/lib/python2.?/site-packages/openqa_client*"
|
||||
|
||||
- name: Install required packages
|
||||
dnf: name={{ item }} state=present
|
||||
with_items:
|
||||
- python2-fedfind
|
||||
- python2-fedmsg-consumers
|
||||
- python2-openqa_client
|
||||
- python2-requests
|
||||
- python-resultsdb_api
|
||||
- python-setuptools
|
||||
|
@ -58,25 +64,6 @@
|
|||
tags:
|
||||
- packages
|
||||
|
||||
- name: Check out openQA-python-client
|
||||
git:
|
||||
repo: https://github.com/os-autoinst/openQA-python-client.git
|
||||
dest: /root/openQA-python-client
|
||||
register: gitclient
|
||||
|
||||
- name: Check if python-client has ever been installed
|
||||
command: "python -c 'import openqa_client'"
|
||||
register: instclient
|
||||
changed_when: "1 != 1"
|
||||
failed_when: "1 != 1"
|
||||
check_mode: no
|
||||
|
||||
- name: Install openQA-python-client
|
||||
command: "python setup.py install"
|
||||
args:
|
||||
chdir: /root/openQA-python-client
|
||||
when: "gitclient|changed or instclient.rc > 0"
|
||||
|
||||
- name: Remove old openqa_fedora_tools checkout
|
||||
file: path=/root/openqa_fedora_tools-dispatcher state=absent
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue