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

openqa: slightly broaden "(N|n)ot a git repository" check

Browse source 
I wrote it as "Not" before, so I presumably saw the message that
way, but today it seems to be "not". Let's just skip the letter.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-06-01 17:08:35 -07:00
parent 60da13e4ce
commit 0dc0dd6659
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -202,7 +202,8 @@
repo: https://pagure.io/fedora-qa/fedora_openqa.git # noqa 401 repo: https://pagure.io/fedora-qa/fedora_openqa.git # noqa 401
dest: /root/fedora_openqa dest: /root/fedora_openqa
register: gittools register: gittools
when: "(toolsbranch.stderr.find('Not a git repository') != -1) or (toolsbranch.stdout.find('On branch master') != -1)" # case of the 'n' seems inconstant, so intentionally omitted
when: "(toolsbranch.stderr.find('ot a git repository') != -1) or (toolsbranch.stdout.find('On branch master') != -1)"
- name: Check if fedora_openqa is installed for current Python - name: Check if fedora_openqa is installed for current Python
command: "pip show fedora_openqa" command: "pip show fedora_openqa"

2
roles/openqa/server/tasks/main.yml
View file

@ -182,7 +182,7 @@
become: true become: true
become_user: geekotest become_user: geekotest
when: > when: >
(testsbranch.stderr.find('Not a git repository') != -1) or (testsbranch.stderr.find('ot a git repository') != -1) or
(testsbranch.stdout.find('On branch master') != -1 and (testsbranch.stdout.find('On branch master') != -1 and
testsbranch.stdout.find('Changes not staged') == -1) testsbranch.stdout.find('Changes not staged') == -1)