X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fci-management%2Fci-management-jobs.yaml;h=f102036a39b0dbf3c868f610e40e71367a6f32ea;hb=ce3ab812d043538db20c8a2d7622b3206473d350;hp=a1225e76b017493397c82496d7bdf7ec0b20f8f8;hpb=d513c4ae32498ec63ab48e5c4171c520eb1cd839;p=ci-management.git

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index a1225e76b..f102036a3 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -1,359 +1,26 @@
+---
 - 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}'
+      - '{project-name}-ci-jobs'
 
-    platforms:
-        - centos
-        - ubuntu-16.04
+    project: ci-management
+    project-name: ci-management
+    build-node: centos7-builder-4c-4g
+    build-timeout: 30
+    jjb-version: 2.6.0
 
-    templates:
-        - basebuild
+- 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: centos7-builder-4c-4g
     project: ci-management
     branch: master
-
-- job-template:
-    name: ci-management-verify-jjb
-
-    project-type: freestyle
-    node: jjb
-    concurrent: true
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    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
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-patch-merged:
-            name: '{project}'
-            branch: '{branch}'
-
-    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-zuul
-
-    project-type: freestyle
-    node: jjb
-    concurrent: true
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    scm:
-        - zuul-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$ZUUL_REF'
-            commit: '$ZUUL_COMMIT'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-test-zuul.sh
-
-- job-template:
-    name: ci-management-merge-zuul
-
-    project-type: freestyle
-    node: jjb
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    scm:
-        - zuul-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            commit: 'origin/$ZUUL_BRANCH'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-test-zuul.sh
-        - shell:
-            !include-raw-escape: include-raw-merge-zuul.sh
-
-- job-template:
-    name: ci-management-verify-nodepool
-
-    project-type: freestyle
-    node: np
-    concurrent: true
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    scm:
-        - zuul-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$ZUUL_REF'
-            commit: '$ZUUL_COMMIT'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-test-nodepool.sh
-
-- job-template:
-    name: ci-management-merge-nodepool
-
-    project-type: freestyle
-    node: np
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    scm:
-        - zuul-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            commit: 'origin/$ZUUL_BRANCH'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-test-nodepool.sh
-        - shell:
-            !include-raw-escape: include-raw-merge-nodepool.sh
-
-
-
-- job-template:
-    name: 'ci-management-verify-packer'
-    project-type: freestyle
-    node: ubuntu1404-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'
-
-    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: 'false'
-                    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: ubuntu1404-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'
-
-    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'