CI: Remove disabled jobs and updgrade to C8 node

- Remove jjb verify and merge jobs which are now running
  reliably in GHA
- Upgrade the rest of the jobs to C8

Change-Id: Ib6d031326a9036eebd04cfe570a39887cc484656
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml
index 64ca277..8c377b0 100644 (file)
--- a/jjb/ci-management/ci-jobs.yaml
+++ b/jjb/ci-management/ci-jobs.yaml
@@ -5,7 +5,7 @@
 
     project: ci-management
     project-name: ci-management
-    build-node: centos7-builder-1c-1g
+    build-node: centos8-builder-1c-1g
 
 - project:
     name: ci-jobs
@@ -18,10 +18,6 @@
       - gerrit-jenkins-cfg-verify
       - gerrit-jenkins-sandbox-cleanup
       - gerrit-jjb-deploy-job
-      - gerrit-jjb-merge:
-          disable-job: true
-      - gerrit-jjb-verify:
-          disable-job: true
 
     <<: *ci_jobs_common