Fix github-maven-merge scm config

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

diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml
index 44be442..c6bcc9b 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,7 +14,9 @@
     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
@@ -53,6 +36,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -133,7 +117,7 @@
       - 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:
@@ -152,3 +136,5 @@
           permit-all: true
           github-hooks: true
           included-regions: '{obj:github_included_regions}'
+          white-list-target-branches:
+            - '{branch}'