From b007d78168d2680ef1cc20976ff24a9e518f6ebb Mon Sep 17 00:00:00 2001 From: Jeremy Phelps Date: Tue, 11 Jul 2017 10:20:23 -0500 Subject: [PATCH] Add global-jjb jobs to ci-management Change-Id: I6cc5340cb57f8806a9d8a68f7d6a5bd69d7755a4 JIRA: CIMAN-4 Signed-off-by: Jeremy Phelps --- jjb/ci-management/ci-management.yaml | 4 +++- jjb/global-defaults.yaml | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 3181eabca..96464f334 100644 --- 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 59b7bcd08..2662ce4c4 100644 --- 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 -- 2.16.6