X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-info-vote.yaml;h=c69ea09ea1932b248c4e51d155bbb63006153642;hb=0ff7cbacb76c80c8e2222d6d5917de5119c0d8fd;hp=3c421aa6cf7097d74d9b144de93b0a45c647dcbf;hpb=00abd5048e7fa6b55c2ccda441a8c7e72cd2d48d;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-info-vote.yaml b/jjb/lf-info-vote.yaml
index 3c421aa6..c69ea09e 100644
--- a/jjb/lf-info-vote.yaml
+++ b/jjb/lf-info-vote.yaml
@@ -3,19 +3,19 @@
 # COMMON FUNCTIONS #
 ####################
 
-- lf_info_vote_common: &lf_info_vote_common
+- _lf_info_vote_common: &lf_info_vote_common
     name: lf-info-vote-common
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'INFO.yaml'
+        pattern: "INFO.yaml"
 
     #####################
     # Job Configuration #
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
 
     properties:
       - lf-infra-properties:
@@ -24,20 +24,19 @@
     parameters:
       - lf-infra-parameters:
           project: $GERRIT_PROJECT
-          branch: 'master'
-          refspec: 'refs/heads/{branch}'
-          stream: 'master'
+          branch: "master"
+          refspec: "refs/heads/{branch}"
+          stream: "master"
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     publishers:
       - lf-infra-publish
 
-
-- lf_info_vote_verify: &lf_info_vote_verify
+- _lf_info_vote_verify: &lf_info_vote_verify
     name: lf-info-vote-verify
 
     branch: master
@@ -45,33 +44,31 @@
     build-days-to-keep: 7
     build-timeout: 15
     disable-job: false
-    git-url: '$GIT_URL/$PROJECT'
+    git-url: "$GIT_URL/$PROJECT"
     submodule-timeout: 10
+    submodule-disable: false
     submodule-recursive: true
     gerrit-skip-vote: false
 
     gerrit_verify_triggers:
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(vote)$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+vote\s*$'
       - comment-added-event:
-          approval-category: 'CRVW'
-          approval-value: 2
-      - comment-added:
-          approval-category: 'Code-Review'
+          approval-category: "Code-Review"
           approval-value: 2
 
     #####################
     # Job Configuration #
     #####################
 
-    disabled: '{disable-job}'
+    disabled: "{disable-job}"
 
     builders:
       - check-info-votes:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
 - job-template:
-    name: 'info-vote'
+    name: "info-vote"
     id: info-vote-verify
     <<: *lf_info_vote_common
     # yamllint disable-line rule:key-duplicates
@@ -79,27 +76,28 @@
 
     scm:
       - lf-infra-gerrit-scm:
-          branch: '$GERRIT_BRANCH'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          branch: "$GERRIT_BRANCH"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: gerrit
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_verify_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_verify_triggers}"
           projects:
-            - project-compare-type: 'REG_EXP'
-              project-pattern: '**'
+            - project-compare-type: "ANT"
+              project-pattern: "**"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/master"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
           skip-vote:
-            successful: '{gerrit-skip-vote}'
-            failed: '{gerrit-skip-vote}'
-            unstable: '{gerrit-skip-vote}'
-            notbuilt: '{gerrit-skip-vote}'
+            successful: "{gerrit-skip-vote}"
+            failed: "{gerrit-skip-vote}"
+            unstable: "{gerrit-skip-vote}"
+            notbuilt: "{gerrit-skip-vote}"