Pass multiple pattern args in logs-deploy.sh

[releng/global-jjb.git] / jjb / lf-node-jobs.yaml

diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml
index 79f1124..21f0fb5 100644 (file)
--- 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,11 +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
@@ -54,6 +37,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -64,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}'
@@ -111,6 +94,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: 'origin/$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
 
     triggers:
@@ -142,6 +126,7 @@
           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}'