X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fci-management%2Fci-management-jobs.yaml;h=d1e3a66ae8d0aae547edf0a651072147f5b52375;hb=49b3712b4e2477f38a0e70f1f2d235d51cef1887;hp=7ce067a948da7ba489b212ef0ad3d4707c9234e2;hpb=e37aee87472656644472da3a34d0bb287191624b;p=ci-management.git

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 7ce067a94..d1e3a66ae 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -1,252 +1,17 @@
 ---
 - project:
-    name: ci-management-jobs
+    name: ci-management-ci-jobs
     jobs:
-      - 'ci-management-verify-jjb'
-      - 'ci-management-merge-jjb'
-      - 'ci-management-verify-packer'
-      - 'ci-management-merge-packer-{platforms}-{templates}'
-
-    platforms:
-      - centos
-      - ubuntu-16.04
-
-    templates:
-      - basebuild
+      - '{project-name}-ci-jobs'
 
     project: ci-management
-    branch: master
-
-- job-template:
-    name: ci-management-verify-jjb
-
-    project-type: freestyle
-    node: jjb
-    concurrent: true
-
-    build-discarder:
-      daysToKeep: 30
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: 5
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-
-    scm:
-      - gerrit-trigger-scm-recursive:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: true
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell: |
-          jenkins-jobs test --recursive -o job_output jjb/
-      - ci-management-check-unicode
-
-    publishers:
-      - archive-artifacts:
-          artifacts: 'job_output/*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'ci-management-merge-jjb'
-
-    project-type: freestyle
-    node: jjb
-
-    build-discarder:
-      daysToKeep: 30
-      numToKeep: 40
-      artifactDaysToKeep: -1
-      artifactNumToKeep: 5
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-
-    scm:
-      - gerrit-trigger-scm-recursive:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: ''
-          choosing-strategy: 'gerrit'
-          submodule-recursive: true
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          name: '{project}'
-          branch: '{branch}'
+    project-name: ci-management
+    build-node: centos7-builder-4c-4g
+    build-timeout: 30
+    jjb-version: 2.6.0
 
-    builders:
-      - shell: |
-          pip freeze
-          jenkins-jobs --version
-          jenkins-jobs update --recursive --delete-old --workers 4 jjb/
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'ci-management-verify-packer'
-    project-type: freestyle
-    node: ubuntu1604-basebuild-4c-4g
-    concurrent: true
-
-    properties:
-      - fdio-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          build-num-to-keep: '{build-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: 'refs/heads/{branch}'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - '$GERRIT_BRANCH'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: true
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      - ssh-agent-credentials:
-          users:
-            - 'jenkins-gerrit-credentials'
-
-    triggers:
-      - timed: 'H H 1 * *'
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'true'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'ci-management'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
-              file-paths:
-                - compare-type: ANT
-                  pattern: packer/**
-
-    builders:
-      - packer-validate:
-
-    publishers:
-      - archive:
-          artifacts: 'packer/*.log'
-          allow-empty: 'true'
-          only-if-success: 'true'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'ci-management-merge-packer-{platforms}-{templates}'
-    project-type: freestyle
-    node: ubuntu1604-basebuild-4c-4g
-    concurrent: true
-
-    properties:
-      - fdio-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          build-num-to-keep: '{build-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: 'refs/heads/{branch}'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - '$GERRIT_BRANCH'
-          choosing-strategy: 'default'
-          submodule-recursive: true
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      - ssh-agent-credentials:
-          users:
-            - 'jenkins-gerrit-credentials'
-
-    triggers:
-      - timed: 'H H 1 * *'
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'ci-management'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'packer/vars/{platforms}.json'
-                - compare-type: ANT
-                  pattern: 'packer/templates/{templates}.json'
-                - compare-type: ANT
-                  pattern: 'packer/provision/{templates}.sh'
-                - compare-type: ANT
-                  pattern: 'packer/provision/system_reseal.sh'
-                - compare-type: ANT
-                  pattern: 'packer/provision/rh-user_data.sh'
-                - compare-type: ANT
-                  pattern: 'packer/provision/baseline.sh'
-
-    builders:
-      - packer-validate:
-      - packer-build:
-          platform: '{platforms}'
-          template: '{templates}'
-
-    publishers:
-      - archive:
-          artifacts: 'packer/*.log'
-          allow-empty: 'true'
-          only-if-success: 'true'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+- project:
+    name: ci-management
+    views:
+      - project-view
+    project-name: ci-management