Use fdio-infra-wrappers to simplify common wrapper use

[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 fb5de57..ddef5ee 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -4,6 +4,9 @@
         - 'ci-management-verify-jjb'
         - 'ci-management-merge-jjb'
 
+    project: ci-management
+    branch: master
+
 - job-template:
     name: ci-management-verify-jjb
 
@@ -17,16 +20,24 @@
         artifactDaysToKeep: -1
         artifactNumToKeep: 5
 
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
     scm:
-        - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$ZUUL_REF'
-            commit: '$ZUUL_COMMIT'
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell: |
@@ -49,18 +60,135 @@
         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:
+            !include-raw-escape: include-raw-jjb-update.sh
+
+- 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: '{ssh-credentials}'
+            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:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
-            !include-raw-escape include-raw-jjb-update.sh
+            !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