Feat!: Upgrade Jenkins-job-builder to 6x

[ci-management.git] / jjb / ci-management / ci-management-jobs.yaml

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index dec69b0..3380eda 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -1,68 +1,32 @@
+---
 - project:
-    name: ci-management-jobs
+    name: ci-management-ci-jobs
     jobs:
-        - 'ci-management-verify-jjb'
-        - 'ci-management-merge'
+      - gerrit-jenkins-cfg-verify
+      - gerrit-jenkins-cfg-merge
+      - gerrit-jenkins-sandbox-cleanup
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge:
+          build-node: centos8-builder-2c-2g
+      - gerrit-jjb-verify
+
+    project: ci-management
+    project-name: ci-management
+    build-node: centos8-builder-2c-2g
+    build-timeout: 15
+    jjb-version: 6.0.0
 
-    project: 'ci-management'
-
-- job-template:
-    name: ci-management-verify-jjb
-
-    project-type: freestyle
-    node: jjb
-    concurrent: true
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    scm:
-        - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$ZUUL_REF'
-            commit: '$ZUUL_COMMIT'
-
-    wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    builders:
-        - shell: |
-            jenkins-jobs test --recursive -o job_output jjb/
-        - ci-management-check-unicode
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'job_output/*'
-
-- job-template:
-    name: 'ci-management-merge'
-
-    project-type: freestyle
-    node: jjb
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    scm:
-        - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            commit: 'origin/$ZUUL_BRANCH'
-
-    wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    builders:
-        - shell:
-            !include-raw-escape include-raw-jjb-update.sh
+- project:
+    name: ci-management
+    views:
+      - project-view
+    project-name: ci-management
 
+- project:
+    name: ci-management-info
+    project-name: ci-management
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-2g
+    project: ci-management
+    branch: master