Add global-jjb ci jobs

Change-Id: Ifa0d21c7d1f3acd5f3aaf0c784f8e34ef0a49f57
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 7ce067a..249b093 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -1,9 +1,17 @@
 ---
+- project:
+    name: ci-management-ci-jobs
+    jobs:
+      - '{project-name}-ci-jobs'
+
+    project: ci-management
+    project-name: ci-management
+    build-node: centos7-builder-2c-2g
+    jjb-version: 2.6.0
+
 - project:
     name: ci-management-jobs
     jobs:
-      - 'ci-management-verify-jjb'
-      - 'ci-management-merge-jjb'
       - 'ci-management-verify-packer'
       - 'ci-management-merge-packer-{platforms}-{templates}'
 

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index c1203c8..48bb40f 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -11,5 +11,10 @@
     build-timeout: 360
     build-perf-timeout: 5760
 
+    # global-jjb
+    gerrit-server-name: gerrit.fd.io
+    jenkins-ssh-credential: jenkins-gerrit-credentials
+    lftools-version: <1.0.0
+
     # fd.io branch defaults
     branch: master