X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-jjb-templates.yaml;h=58320ce2e5f45ac5a095d4f8f7b6459f2f32d655;hb=a92e70705b6da900f27d4ff392d237c0abfb810b;hp=82cf0850f1d3e74ae0c5cdc1fa8ac8a92e9bb258;hpb=280e31428b195ac11dcfede11a447730ba68ad92;p=ci-management.git

diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml
index 82cf085..58320ce 100644
--- a/jjb/akraino-templates/akraino-jjb-templates.yaml
+++ b/jjb/akraino-templates/akraino-jjb-templates.yaml
@@ -281,8 +281,8 @@
     parameters:
       - lf-infra-parameters:
           project: '{project}'
-          branch: '{branch}'
           stream: '{stream}'
+          branch: '{branch}'
           lftools-version: '{lftools-version}'
 
       - string:
@@ -299,11 +299,11 @@
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           git-url: '{git-url}/{project}.git'
-          refspec: '{refspec}'
-          branch: '{branch}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
 
     triggers:
       - gerrit:
@@ -315,8 +315,6 @@
                 exclude-no-code-change: 'false'
             - change-merged-event
             - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: remerge$
             - comment-added-contains-event:
                 comment-contains-value: 'recheck'
             - comment-added-contains-event:
@@ -336,11 +334,9 @@
                   pattern: 'docs/**'
           readable-message: true
 
-
-
     builders:
       - shell: !include-raw-escape:
-          - ../shell/eliot-verify.sh
+          - ../shell/verify.sh
 
     publishers:
       - lf-infra-publish