X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-node-jobs.yaml;h=21f0fb5a2c026eb0cc6ab4cd4634c27526106af5;hb=f9e0c6aa3c19f8fc5c017f8a84e203d0d50d5b7f;hp=fb27ed7d28accbe3f6d5139489e8accff83f4c00;hpb=e154622c6324f2b4a9db3970c074254649d5eaf3;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml
index fb27ed7d..21f0fb5a 100644
--- a/jjb/lf-node-jobs.yaml
+++ b/jjb/lf-node-jobs.yaml
@@ -1,23 +1,4 @@
 ---
-- job-group:
-    name: '{project-name}-github-node-jobs'
-
-    # Job group containing recommended jobs to deploy for a Node Project.
-
-    node-version: 6.11.4
-
-    jobs:
-      - github-node-verify
-
-- job-group:
-    name: '{project-name}-node-jobs'
-
-    # Job group containing recommended jobs to deploy for a Node Project.
-
-    node-version: 6.11.4
-
-    jobs:
-      - gerrit-node-verify
 
 ###############
 # Node Verify #
@@ -33,10 +14,13 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 10
+    disable-job: false
     git-url: '$GIT_URL/$GERRIT_PROJECT'
+    github-url: 'https://github.com'
     node-dir: ''
     stream: master
     submodule-recursive: true
+    submodule-timeout: 10
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -53,6 +37,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -63,7 +48,6 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          lftools-version: '{lftools-version}'
       - lf-infra-node-parameters:
           node-dir: '{node-dir}'
           node-version: '{node-version}'
@@ -97,7 +81,7 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: recheck$
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
 
     #####################
     # Job Configuration #
@@ -110,6 +94,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: 'origin/$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers:
@@ -130,8 +115,10 @@
     <<: *lf_node_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -139,14 +126,17 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^recheck$'
+          trigger-phrase: '^(recheck|reverify)$'
           only-trigger-phrase: false
           status-context: 'Node Verify'
           permit-all: true
           github-hooks: true
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'