Revert gerrit-patch macro back to git review

Use git review for pushing gerrit
patches from jenkins. This was
changed due to absence of
git review on some nodes. It is
changed back with a note warning
that not all jenkins nodes have
git review installed.

Change-Id: I43e37b909d26b4940a24132713b5145aa60ea628
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

diff --git a/jjb/opendaylight-infra-push-gerrit-patch.sh b/jjb/opendaylight-infra-push-gerrit-patch.sh
index 73be6055cdc580bd0db0582686ad0ec9b93c9225..6679d271ce1af0037d3cf3718a68bd04280b2450 100644 (file)
--- a/jjb/opendaylight-infra-push-gerrit-patch.sh
+++ b/jjb/opendaylight-infra-push-gerrit-patch.sh
@@ -17,4 +17,4 @@ git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/buil
 
 # Don't fail the build if this command fails because it's possible that there
 # is no changes since last update.
-git push ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/builder HEAD:refs/for/master%topic={gerrit-topic} || true
+git review --yes -t {gerrit-topic} || true

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 94f03fd06edd44f19b7f92cc24f63b9fecf1f445..ef6b63e45d471be20e23263b44f729f9da630238 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -329,7 +329,8 @@
     # This script requires the following JJB variables to be passed in:
     #     {project}       Gerrit project-name
     #     {gerrit-topic}  Gerrit topic, please make a unique topic.
-    #     {gerrit-commit-message}  Commit message to assign to commit.
+    #     {gerrit-commit-message} Commit message to assign to commit.
+    # NOTE: Requires git review to be installed on node.
     builders:
         - shell: !include-raw: opendaylight-infra-push-gerrit-patch.sh