Migrate gerrit push change to generic builder

Migrate gerrit push change to generic builder in global-jjb.
This is dependent on the change in global-jjb
I4d269a4dad6ddbd509a134306b61b2214194b479 release with
global-jjb v0.19.0.

https://jira.linuxfoundation.org/browse/RELENG-769

Change-Id: I3be1627eafccbbd93f5aa05ce0384f2cc66ea8eb
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index bd5d84cf37493563ee2a55c0e26a74bf619d1726..2bc9ef1aaa75016a8a833237f563d008b1aa791f 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -273,11 +273,14 @@
     builders:
       - autorelease-update-project-views
       - autorelease-update-validate-projects
-      - opendaylight-infra-push-gerrit-patch:
-          project: 'releng/builder'
+      - lf-infra-push-gerrit-patch:
+          project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
           gerrit-commit-message: |
-              Update validate autorelease projects for {stream}
+              'Update validate autorelease projects for {stream}'
+          reviewers-email: 'release@lists.opendaylight.org'
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index dc435ad8c0b85ca1433cd77497faf28e181adce1..a771d0b213b0c83af858a693f57a1a5bd16429c2 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -445,10 +445,13 @@
       - shell: |
           git status
           git add jjb/integration/*.lst
-      - opendaylight-infra-push-gerrit-patch:
-          project: "releng/builder"
-          gerrit-topic: "auto-update-csit-jobs-{stream}"
-          gerrit-commit-message: "Auto Update CSIT Jobs to run for {stream}"
+      - lf-infra-push-gerrit-patch:
+          project: 'releng/builder'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
+          gerrit-topic: 'auto-update-csit-jobs-{stream}'
+          gerrit-commit-message: 'Auto Update CSIT Jobs to run for {stream}'
+          reviewers-email: 'integration-dev@lists.opendaylight.org'
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index c1f1c0897de973b6ace8c30dee9c881ed61e19ef..f07f229d5ca47717323ae2112ab8eaefefaca325 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -263,10 +263,13 @@
 
     builders:
       - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
-      - opendaylight-infra-push-gerrit-patch:
+      - lf-infra-push-gerrit-patch:
           project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'releng-update-cloud-image-list'
           gerrit-commit-message: 'Update cloud image list docs'
+          reviewers-email: 'jluhrsen@redhat.com'
 
     publishers:
       - email-notification:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index f57959410608274c5f4200b4d047b899e9958e52..0698d2143c82a3056a5358d2c3322fa13ca2f376 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -349,24 +349,6 @@
       - shell: !include-raw: opendaylight-infra-stack.sh
       - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh
 
-- builder:
-    name: opendaylight-infra-push-gerrit-patch
-    # opendaylight-infra-push-gerrit-patch.sh allows a job to push a patch to
-    # Gerrit in an automated fashion. This is meant for tasks that creates
-    # the same patch regularly and needs the ability to detect if an unreviewed
-    # patch already exists. In which case it will update the existing patch.
-    #
-    # Note: This patch assumes the $WORKSPACE contains the project repo with
-    #       the files changed already "git add" and waiting for a "git commit" call.
-    #
-    # 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.
-    # NOTE: Requires git review to be installed on node.
-    builders:
-      - shell: !include-raw: opendaylight-infra-push-gerrit-patch.sh
-
 - builder:
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.