Add global-jjb jobs to ci-management

Change-Id: I6cc5340cb57f8806a9d8a68f7d6a5bd69d7755a4
JIRA: CIMAN-4
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 3181eab..96464f3 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -1,13 +1,15 @@
 ---
 - project:
     name: ci-management-jobs
-    project: 'ci-management'
     jobs:
       - '{project}-verify-jjb'
       - '{project}-merge-jjb'
+      - '{project-name}-ci-jobs'
       - '{project}-verify-packer'
       - '{project}-merge-packer-{platforms}-{templates}'
 
+    project: 'ci-management'
+    project-name: 'ci-management'
     archive-artifacts: '**/*.log'
     branch: 'master'
     build-timeout: '60'

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 59b7bcd..2662ce4 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -13,6 +13,7 @@
 
     # default gerrit server definition
     server-name: 'Primary'
+    gerrit-server-name: 'Primary'
 
     # Java
     jdk: ''
@@ -36,4 +37,7 @@
     maven-version: 'mvn33'
 
     # git submodule attributes
-    submodule-recursive: true
\ No newline at end of file
+    submodule-recursive: true
+
+    # Jenkins
+    jenkins-ssh-credential: onap-jenkins-ssh
\ No newline at end of file