From bd1ab3e8bf0e26c656baa9943b8c3bc863365fe6 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Mon, 5 Feb 2018 09:44:58 -0800
Subject: [PATCH] Revert "Test Use item.checkout from zuul.projects when
 mirroring"

This reverts commit c185af7449c50cded02c5c370a467015acc20395.

Change-Id: I070a295cfe418604040e8d9a5174bc88644b8972
Depends-On: https://review.openstack.org/540949
---
 .../README.rst                                |  6 ----
 .../tasks/main.yaml                           | 35 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 roles/test-mirror-workspace-git-repos/README.rst
 delete mode 100644 roles/test-mirror-workspace-git-repos/tasks/main.yaml

diff --git a/roles/test-mirror-workspace-git-repos/README.rst b/roles/test-mirror-workspace-git-repos/README.rst
deleted file mode 100644
index b6e4ed940..000000000
--- a/roles/test-mirror-workspace-git-repos/README.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Mirror the local git repos to remote nodes
-
-This role uses git operations (unlike :zuul:role:`prepare-workspace`
-which uses rsync) to mirror the local prepared git repos to the remote
-nodes.  This may be useful if the remote node already has a copy of
-some or all of the git repos.
diff --git a/roles/test-mirror-workspace-git-repos/tasks/main.yaml b/roles/test-mirror-workspace-git-repos/tasks/main.yaml
deleted file mode 100644
index dc01fd9a8..000000000
--- a/roles/test-mirror-workspace-git-repos/tasks/main.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- name: Allow pushing to non-bare repo
-  git_config:
-    name: receive.denyCurrentBranch ignore
-    value: ignore
-    scope: local
-    repo: "{{ ansible_user_dir }}/{{ item.value.src_dir}}"
-  with_dict: "{{ zuul.projects }}"
-
-- name: Synchronize src repos to workspace directory
-  command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host }}/{{ ansible_user_dir }}/{{ item.value.src_dir}}"
-  args:
-    chdir: "{{ zuul.executor.work_root }}/{{ item.value.src_dir }}"
-  with_dict: "{{ zuul.projects }}"
-  delegate_to: localhost
-  # ANSIBLE0006: Skip linting since it triggers on the "git" command,
-  # but push is not supported by ansible git module.
-  tags:
-    - skip_ansible_lint
-
-# Do this as a multi-line shell so that we can do the loop once
-- name: Update remote repository state correctly
-  shell: |
-    # Reset is needed because we pushed to a non-bare repo
-    git reset --hard
-    # Undo the config setting we did above
-    git config --local --unset receive.denyCurrentBranch
-    # checkout the branch matching the branch set up by the executor
-    git checkout {{ item.value.checkout }}
-  args:
-    chdir: "{{ ansible_user_dir }}/{{ item.value.src_dir }}"
-  with_dict: "{{ zuul.projects }}"
-  # ANSIBLE0006: Skip linting since it triggers on the "git" command,
-  # but we prefer the shell above
-  tags:
-    - skip_ansible_lint