summaryrefslogtreecommitdiffstats
path: root/jjb/ci-management
diff options
context:
space:
mode:
authorAndrew Grimberg <agrimberg@linuxfoundation.org>2016-02-22 09:44:44 -0800
committerAndrew Grimberg <agrimberg@linuxfoundation.org>2016-02-22 09:44:44 -0800
commit2b0e2f99c893948655a5c7e41b6190fae8a7c0dd (patch)
tree424ecdb8175851670d0e81320ebf1ecf5ff321a0 /jjb/ci-management
parentc20075ac3e89e88149ae49418b77bb84843e05df (diff)
Rename ci-management-merge
Rename the ci-managment-merge job to be ci-management-merge-jjb as it is jjb specific. This sets us up to support ci-managment-{verify,merge}-{zuul,nodepool} job definitions as each of these job definitions is verify specific to the tool being managed Change-Id: I1bfcc02411af043f349ca5b62aac17bffe8df363 Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Diffstat (limited to 'jjb/ci-management')
-rw-r--r--jjb/ci-management/ci-management-jobs.yaml6
1 files changed, 2 insertions, 4 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index dec69b0a7..fb5de572b 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -2,9 +2,7 @@
name: ci-management-jobs
jobs:
- 'ci-management-verify-jjb'
- - 'ci-management-merge'
-
- project: 'ci-management'
+ - 'ci-management-merge-jjb'
- job-template:
name: ci-management-verify-jjb
@@ -40,7 +38,7 @@
artifacts: 'job_output/*'
- job-template:
- name: 'ci-management-merge'
+ name: 'ci-management-merge-jjb'
project-type: freestyle
node: jjb