X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-ta-common-templates.yaml;h=d340775a635292f4c5ff44b3ac6b5173ba6606f3;hb=9a9833b1f48b3a95a32816c411297cd3c6b2d1c8;hp=7151f5e54d13dda95ed0fa51c00d16fe45dd2582;hpb=c109904304d487c973b3bcfab90425661826a401;p=ci-management.git

diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml
index 7151f5e..d340775 100644
--- a/jjb/akraino-templates/akraino-ta-common-templates.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-templates.yaml
@@ -19,6 +19,7 @@
     submodule-recursive: true
     node: '{build-node}'
     arch: amd64
+    gerrit-skip-vote: false
 
     properties:
       - lf-infra-properties:
@@ -45,19 +46,19 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     scm:
-      - ta-lf-infra-gerrit-scm:
+      - ta-lf-infra-gerrit-scm-{project-type}:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           git-url: '{git-url}/{project}.git'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: 'gerrit'
           basedir: '$GERRIT_PROJECT'
 
     triggers:
       - ta-trigger-job-{project-type}:
           gerrit-server-name: '{gerrit-server-name}'
+          gerrit-skip-vote: '{gerrit-skip-vote}'
           project: '{project}'
           branch: '{branch}'
 
@@ -89,6 +90,7 @@
     project-type: freestyle
     submodule-recursive: true
     node: '{build-node}'
+    gerrit-skip-vote: false
 
     properties:
       - lf-infra-properties:
@@ -102,7 +104,7 @@
           branch: '{branch}'
           lftools-version: '{lftools-version}'
 
-      - ta-parameters-ci-{project-name}
+      - ta-parameters-ci-{project}
 
       - string:
           name: ARCHIVE_ARTIFACTS
@@ -128,11 +130,12 @@
     triggers:
       - ta-trigger-job-{project-type}:
           gerrit-server-name: '{gerrit-server-name}'
+          gerrit-skip-vote: '{gerrit-skip-vote}'
           project: '{project}'
           branch: '{branch}'
 
     builders:
-      - ta-builder-job-{project-type}-{project-name}:
+      - ta-builder-job-{project-type}-{project}:
           git-url: '{git-url}'
 
     publishers:
@@ -157,6 +160,7 @@
     project-type: freestyle
     submodule-recursive: true
     node: '{build-node}'
+    gerrit-skip-vote: false
 
     properties:
       - lf-infra-properties:
@@ -194,6 +198,7 @@
     triggers:
       - ta-trigger-job-{project-type}:
           gerrit-server-name: '{gerrit-server-name}'
+          gerrit-skip-vote: '{gerrit-skip-vote}'
           project: '{project}'
           branch: '{branch}'