Merge "Add opendev/sandbox"
diff --git a/playbooks/roles/zuul-push-upstream/tasks/main.yaml b/playbooks/roles/zuul-push-upstream/tasks/main.yaml
index 1825403..0856c51 100644
--- a/playbooks/roles/zuul-push-upstream/tasks/main.yaml
+++ b/playbooks/roles/zuul-push-upstream/tasks/main.yaml
@@ -18,8 +18,8 @@
state: present
become: true
-- name: Get current patchset revision
- shell: git log| head -1|cut -d' ' -f2
+- name: Get current patchset commit hash
+ shell: git show --format='%H' --quiet
args:
chdir: "/home/ubuntu/src/gerrit.nordix.org/{{ GERRIT_PROJECT }}"
register: revision
@@ -28,8 +28,8 @@
set_fact:
GERRIT_PATCHSET_REVISION: "{{ revision.stdout }}"
-- name: Get branch details
- shell: git branch| head -1 | cut -d' ' -f2-
+- name: Get current branch name
+ shell: git branch --show-current
args:
chdir: "/home/ubuntu/src/gerrit.nordix.org/{{ GERRIT_PROJECT }}"
register: branch
@@ -39,7 +39,7 @@
GERRIT_BRANCH: "{{ branch.stdout }}"
- name: Get author email address
- shell: git log| head -3| grep Author:| cut -d'<' -f2| cut -d'>' -f1
+ shell: git show --format='%ae' --quiet
args:
chdir: "/home/ubuntu/src/gerrit.nordix.org/{{ GERRIT_PROJECT }}"
register: email