summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Wienand <iwienand@redhat.com>2018-12-12 16:01:34 +1100
committerIan Wienand <iwienand@redhat.com>2018-12-12 16:02:59 +1100
commita8f1afb5edb74dd668ca091c84ff3c68ee337182 (patch)
treedee975c420605927f44481808ece888c5bafa61e
parent2ea7a1b6bdf69d5a79658aea04a1f6d596e95d0a (diff)
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
Notes
Notes (review): Code-Review+2: Tobias Henkel <tobias.henkel@bmw.de> Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Workflow+1: Andreas Jaeger <jaegerandi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 18 Dec 2018 07:26:29 +0000 Reviewed-on: https://review.openstack.org/624575 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/test-mirror-workspace-git-repos/tasks/main.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/test-mirror-workspace-git-repos/tasks/main.yaml b/roles/test-mirror-workspace-git-repos/tasks/main.yaml
index 2c9f191..3cd81bf 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 @@
7 with_dict: "{{ zuul.projects }}" 7 with_dict: "{{ zuul.projects }}"
8 8
9- name: Synchronize src repos to workspace directory 9- name: Synchronize src repos to workspace directory
10 command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host }}/{{ ansible_user_dir }}/{{ item.value.src_dir}}" 10 command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host | ipwrap }}:{{ ansible_port }}/{{ ansible_user_dir }}/{{ item.value.src_dir}}"
11 args: 11 args:
12 chdir: "{{ zuul.executor.work_root }}/{{ item.value.src_dir }}" 12 chdir: "{{ zuul.executor.work_root }}/{{ item.value.src_dir }}"
13 with_dict: "{{ zuul.projects }}" 13 with_dict: "{{ zuul.projects }}"
@@ -33,6 +33,9 @@
33 git config --local --unset receive.denyCurrentBranch 33 git config --local --unset receive.denyCurrentBranch
34 # checkout the branch matching the branch set up by the executor 34 # checkout the branch matching the branch set up by the executor
35 git checkout {{ item.value.checkout }} 35 git checkout {{ item.value.checkout }}
36 # put out a status line with the current HEAD
37 echo "{{ item.value.canonical_name }} checked out to:"
38 git log --pretty=oneline -1
36 args: 39 args:
37 chdir: "{{ ansible_user_dir }}/{{ item.value.src_dir }}" 40 chdir: "{{ ansible_user_dir }}/{{ item.value.src_dir }}"
38 with_dict: "{{ zuul.projects }}" 41 with_dict: "{{ zuul.projects }}"