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:
Adam Williamson 2017-03-06 16:35:18 -08:00
parent 434409cee9
commit c32e278190
2 changed files with 19 additions and 45 deletions

View file

@ -27,42 +27,29 @@
# client.conf will be in place (and localhost default would be correct # client.conf will be in place (and localhost default would be correct
# anyhow) # anyhow)
# note: we need updates-testing until fedfind 3.5.0 goes stable #- name: Install required packages (testing)
- name: Install required packages (testing) # dnf: name={{ item }} state=present enablerepo="updates-testing"
dnf: name={{ item }} state=present enablerepo="updates-testing" # with_items:
with_items: # - python2-fedfind
- python2-fedfind # tags:
tags: # - packages
- 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 - name: Install required packages
dnf: name={{ item }} state=present dnf: name={{ item }} state=present
with_items: with_items:
- python2-fedfind
- python2-fedmsg-consumers - python2-fedmsg-consumers
- python2-openqa_client
- python-setuptools - python-setuptools
- python-six - python-six
tags: tags:
- packages - 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 - name: Check out check-compose
git: git:
repo: https://pagure.io/fedora-qa/check-compose.git repo: https://pagure.io/fedora-qa/check-compose.git

View file

@ -45,11 +45,17 @@
# tags: # tags:
# - packages # - 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 - name: Install required packages
dnf: name={{ item }} state=present dnf: name={{ item }} state=present
with_items: with_items:
- python2-fedfind - python2-fedfind
- python2-fedmsg-consumers - python2-fedmsg-consumers
- python2-openqa_client
- python2-requests - python2-requests
- python-resultsdb_api - python-resultsdb_api
- python-setuptools - python-setuptools
@ -58,25 +64,6 @@
tags: tags:
- packages - 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 - name: Remove old openqa_fedora_tools checkout
file: path=/root/openqa_fedora_tools-dispatcher state=absent file: path=/root/openqa_fedora_tools-dispatcher state=absent