From a8f1afb5edb74dd668ca091c84ff3c68ee337182 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 12 Dec 2018 16:01:34 +1100 Subject: [PATCH] Update test-mirror-workspace-git-repos, add test This updates the test-mirror-workspace-git-repos to be the same as mirror-workspace-git-repos, and adds the change proposed in I84d9a8a460e99d3bc558b3a7584d787b22f2ed33 for testing. Change-Id: If0792190c75c7716e94f1f5ae0f2d4fc37e0b306 --- roles/test-mirror-workspace-git-repos/tasks/main.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/test-mirror-workspace-git-repos/tasks/main.yaml b/roles/test-mirror-workspace-git-repos/tasks/main.yaml index 2c9f19184..3cd81bf6f 100644 --- a/roles/test-mirror-workspace-git-repos/tasks/main.yaml +++ b/roles/test-mirror-workspace-git-repos/tasks/main.yaml @@ -7,7 +7,7 @@ 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}}" + command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host | ipwrap }}:{{ ansible_port }}/{{ ansible_user_dir }}/{{ item.value.src_dir}}" args: chdir: "{{ zuul.executor.work_root }}/{{ item.value.src_dir }}" with_dict: "{{ zuul.projects }}" @@ -33,6 +33,9 @@ git config --local --unset receive.denyCurrentBranch # checkout the branch matching the branch set up by the executor git checkout {{ item.value.checkout }} + # put out a status line with the current HEAD + echo "{{ item.value.canonical_name }} checked out to:" + git log --pretty=oneline -1 args: chdir: "{{ ansible_user_dir }}/{{ item.value.src_dir }}" with_dict: "{{ zuul.projects }}"