X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-jjb-templates.yaml;h=7090b3141a3f5d05e53f966cf429b2c06cfc2f33;hp=33035f1371ea68f6127457e1fd7defeca72c6bd8;hb=07692838aa0635a24fbfefabf129cf08c1b418c3;hpb=85275b36b0b768e9d6b69c1852b6807c471d664e

diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml
index 33035f1..7090b31 100644
--- a/jjb/akraino-templates/akraino-jjb-templates.yaml
+++ b/jjb/akraino-templates/akraino-jjb-templates.yaml
@@ -16,7 +16,7 @@
 #
 - job-template:
     id: akraino-project-stream-release-config
-    name: '{project}-{stream}-release-config'
+    name: '{project-name}-{stream}-release-config'
 
     ######################
     # Default parameters #
@@ -138,7 +138,7 @@
 
 - job-template:
     id: akraino-project-stream-stage-config
-    name: '{project}-{stream}-stage-config'
+    name: '{project-name}-{stream}-stage-config'
 
     ######################
     # Default parameters #
@@ -264,7 +264,7 @@
 
 - job-template:
     id: akraino-project-stream-verify
-    name: '{project}-{stream}-verify'
+    name: '{project-name}-{stream}-verify'
     archive-artifacts: >
       **/*.log
     build-days-to-keep: 30
@@ -282,7 +282,6 @@
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
-          refspec: '{refspec}'
           branch: '{branch}'
           lftools-version: '{lftools-version}'
 
@@ -300,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:
@@ -316,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:
@@ -337,11 +334,9 @@
                   pattern: 'docs/**'
           readable-message: true
 
-
-
     builders:
       - shell: !include-raw-escape:
-          - ../shell/eliot-verify.sh
+          - ../shell/verify.sh
 
     publishers:
       - lf-infra-publish