diff options
author | 2017-07-11 10:20:23 -0500 | |
---|---|---|
committer | 2017-07-12 14:04:14 -0500 | |
commit | b007d78168d2680ef1cc20976ff24a9e518f6ebb (patch) | |
tree | 7148f16287cbc0cf9a4340341358c077476455d2 /jjb | |
parent | 2c76e4970a1b9a1e4153754dd563af48b855f134 (diff) |
Add global-jjb jobs to ci-management
Change-Id: I6cc5340cb57f8806a9d8a68f7d6a5bd69d7755a4
JIRA: CIMAN-4
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/ci-management/ci-management.yaml | 4 | ||||
-rw-r--r-- | 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 |