X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fci-management%2Fci-management-jobs.yaml;h=291309a8551f02a304ad906ee2cd5b04f7c2ae10;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=6625a301d203ba27b3ca26fd0fc1e7d23dff2cc6;hpb=c4551455944692ea557007a8ebfb6a98349cccbf;p=ci-management.git

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 6625a301d..291309a85 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -1,17 +1,18 @@
+---
 - project:
     name: ci-management-jobs
     jobs:
-        - 'ci-management-verify-jjb'
-        - 'ci-management-merge-jjb'
-        - 'ci-management-verify-packer'
-        - 'ci-management-merge-packer-{platforms}-{templates}'
+      - 'ci-management-verify-jjb'
+      - 'ci-management-merge-jjb'
+      - 'ci-management-verify-packer'
+      - 'ci-management-merge-packer-{platforms}-{templates}'
 
     platforms:
-        - centos
-        - ubuntu-16.04
+      - centos
+      - ubuntu-16.04
 
     templates:
-        - basebuild
+      - basebuild
 
     project: ci-management
     branch: master
@@ -23,42 +24,43 @@
     node: jjb
     concurrent: true
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    build-discarder:
+      daysToKeep: 30
+      numToKeep: 10
+      artifactDaysToKeep: -1
+      artifactNumToKeep: 5
 
     parameters:
-        - project-parameter:
-            project: '{project}'
+      - project-parameter:
+          project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - 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}'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
+      - gerrit-trigger-patch-submitted:
+          name: '{project}'
+          branch: '{branch}'
 
     builders:
-        - shell: |
-            jenkins-jobs test --recursive -o job_output jjb/
-        - ci-management-check-unicode
+      - shell: |
+          jenkins-jobs test --recursive -o job_output jjb/
+      - ci-management-check-unicode
 
     publishers:
-        - archive-artifacts:
-            artifacts: 'job_output/*'
+      - archive-artifacts:
+          artifacts: 'job_output/*'
 
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'ci-management-merge-jjb'
@@ -66,152 +68,41 @@
     project-type: freestyle
     node: jjb
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    build-discarder:
+      daysToKeep: 30
+      numToKeep: 40
+      artifactDaysToKeep: -1
+      artifactNumToKeep: 5
 
     parameters:
-        - project-parameter:
-            project: '{project}'
+      - project-parameter:
+          project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
+      - 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}'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-merged:
-            name: '{project}'
-            branch: '{branch}'
+      - gerrit-trigger-patch-merged:
+          name: '{project}'
+          branch: '{branch}'
 
     builders:
-        - shell: |
-            pip freeze
-            jenkins-jobs --version
-            jenkins-jobs update --recursive --delete-old --workers 4 jjb/
+      - 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
-
-
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'ci-management-verify-packer'
@@ -220,67 +111,68 @@
     concurrent: true
 
     properties:
-        - fdio-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
-            build-num-to-keep: '{build-num-to-keep}'
+      - 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}'
+      - 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'
+      - 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'
+      - 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/**
+      - 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:
+      - packer-validate:
 
     publishers:
-        - archive:
-            artifacts: 'packer/*.log'
-            allow-empty: 'true'
-            only-if-success: 'true'
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
+      - 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}'
@@ -289,71 +181,72 @@
     concurrent: true
 
     properties:
-        - fdio-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
-            build-num-to-keep: '{build-num-to-keep}'
+      - 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}'
+      - 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'
+      - 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'
+      - 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'
+      - 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}'
+      - 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'
+      - archive:
+          artifacts: 'packer/*.log'
+          allow-empty: 'true'
+          only-if-success: 'true'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'