From 0dc0dd66594e9df29e3a6a60dc4153832569fdfa Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Jun 02 2020 00:09:38 +0000 Subject: openqa: slightly broaden "(N|n)ot a git repository" check 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 --- diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index ed24376..fff793e 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -202,7 +202,8 @@ repo: https://pagure.io/fedora-qa/fedora_openqa.git # noqa 401 dest: /root/fedora_openqa 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 command: "pip show fedora_openqa" diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 9935d96..291d5c8 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -182,7 +182,7 @@ become: true become_user: geekotest 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('Changes not staged') == -1)