Merge "Make the task that remove the remote idempotent"

2018-03-19 04:30:45 +00:00 · 2018-03-19 04:30:45 +00:00 · 7b3158698d
commit 7b3158698d
parent 8a018fef93 cf1ae5235b
1 changed files with 2 additions and 1 deletions
--- a/roles/use-cached-repos/tasks/main.yaml
+++ b/roles/use-cached-repos/tasks/main.yaml
@ -31,7 +31,8 @@
    - skip_ansible_lint

 - name: Remove origin from local git repos
-  command: "git remote rm origin"
+  # To be idempotent, remove origin only if it's found in the local list.
+  shell: "git remote -v | grep origin && git remote rm origin || true"
  args:
    chdir: "{{ ansible_user_dir }}/{{ item.src_dir}}"
  with_items: "{{ zuul.projects.values() | list }}"