diff options
| author | Adam Williamson <awilliam@redhat.com> | 2017-09-07 09:56:23 -0700 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2017-09-07 09:56:23 -0700 |
| commit | ba788afe08bcf908e34d378f95dc8fd60f7d0496 (patch) | |
| tree | 18a6561d9569a49ee70db02d5b1be1a45e4d7b51 | |
| parent | 873c55d3fc28669df0e7bc3f0ef72541ba728b22 (diff) | |
| download | ansible-ba788afe08bcf908e34d378f95dc8fd60f7d0496.tar.gz ansible-ba788afe08bcf908e34d378f95dc8fd60f7d0496.tar.xz ansible-ba788afe08bcf908e34d378f95dc8fd60f7d0496.zip | |
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 <awilliam@redhat.com>
| -rw-r--r-- | roles/openqa/server/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 250b6e9b7..9c029ce66 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 |