From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 14 Sep 2016 23:51:42 +0000 (+1000)
Subject: Fix merge-packer job
X-Git-Tag: release/boron~5^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F45609%2F1;p=releng%2Fbuilder.git

Fix merge-packer job

* trigger the job with 'remerge' instead of 'recheck'
* removed refspecs and branch points to master
under parameters section

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 3bc20228a..8bd622071 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -384,14 +384,14 @@
     parameters:
         - opendaylight-infra-parameters:
             project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
+            branch: 'master'
+            refspec: 'refs/heads/master'
             artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            refspec: ''
+            choosing-strategy: 'default'
 
     wrappers:
         - opendaylight-infra-wrappers:
@@ -401,21 +401,15 @@
         - gerrit:
             server-name: 'OpenDaylight'
             trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
+                - change-merged-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: '{project}'
+                project-pattern: 'releng/builder'
                 branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/master'
                 file-paths:
                     - compare-type: ANT
                       pattern: 'packer/**'