From ba788afe08bcf908e34d378f95dc8fd60f7d0496 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 7 Sep 2017 09:56:23 -0700 Subject: [PATCH] openqa/dispatcher: don't check out tests when locally modified Also don't check out the tests if we're on master branch, but have local modifications. Signed-off-by: Adam Williamson --- roles/openqa/server/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 250b6e9b74..9c029ce666 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -119,7 +119,7 @@ register: gittests become: true become_user: geekotest - when: "(testsbranch.stderr.find('Not a git repository') != -1) or (testsbranch.stdout.find('On branch master') != -1)" + when: "(testsbranch.stderr.find('Not a git repository') != -1) or (testsbranch.stdout.find('On branch master') != -1 and testsbranch.stdout.find('Changes not staged') = -1)" - name: Remove old openqa_fedora_tools checkout file: path=/root/openqa_fedora_tools state=absent