Fix: Remove failing jenkins-cfg-merge job

This job is no longer needed after the move to JCasC. Only the needed
jobs from the ci-jobs group are now included.

Change-Id: I57d79fba41a9614a7a6566fad1aeaf9f702628c4
Signed-off-by: Eric Ball <eball@linuxfoundation.org>

diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml
index a27fe15..212fa90 100644 (file)
--- a/jjb/ci-management/ci-jobs.yaml
+++ b/jjb/ci-management/ci-jobs.yaml
@@ -3,7 +3,11 @@
     name: ci-jobs
 
     jobs:
     name: ci-jobs
 
     jobs:

-      - '{project-name}-ci-jobs'
+      - gerrit-jenkins-cfg-verify
+      - gerrit-jenkins-sandbox-cleanup
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge
+      - gerrit-jjb-verify

 
     project: ci-management
     project-name: ci-management
 
     project: ci-management
     project-name: ci-management