X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fpuppet-fdio%2Fpuppet-fdio.yaml;h=1942f260a6b95a1f2d362ac0331e7da81cddaf39;hb=052de3c10a9ced2d7c37da4a630271d9087770fe;hp=fc4bc79a6d655eba0e52559a17bb28f29c06262c;hpb=b7dcf868c2d994810b8f67745ed58e245b68f978;p=ci-management.git

diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml
index fc4bc79a6..1942f260a 100644
--- a/jjb/puppet-fdio/puppet-fdio.yaml
+++ b/jjb/puppet-fdio/puppet-fdio.yaml
@@ -1,59 +1,116 @@
+---
 - project:
     name: puppet-fdio
     jobs:
-        - 'puppet-fdio-verify-{stream}-{os}'
-
+      - 'puppet-module-unit'
+      - 'puppet-fdio-verify-beaker-{stream}-{os}'
     project: 'puppet-fdio'
-    os:
-        - centos7:
-            repo-os-part: 'centos7'
+    os: 'centos7'
+    repo-os-part: 'centos7'
+
     stream:
-        - master:
-            branch: 'master'
-            repo-stream-part: 'master'
+      - master:
+          branch: 'master'
+          repo-stream-part: 'master'
 
 - job-template:
-    name: 'puppet-fdio-verify-{stream}-{os}'
+    name: 'puppet-fdio-verify-unit-{puppet_version}-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: centos7-basebuild-4c-4g
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: '{os}'
-        - repo-name-parameter:
-            repo-name: '{repo-stream-part}.{repo-os-part}'
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: '{os}'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     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:
-            !include-raw-escape:
-                - include-raw-prepare-node.sh
-        - shell:
-            !include-raw-escape:
-                - include-raw-puppet-fdio-unit.sh
+      - shell: |
+          ./scripts/prepare-node.sh
+          ./scripts/ci-unit-tests.sh {puppet_version}
+
+- job-group:
+    name: 'puppet-module-unit'
+    puppet_version:
+      - 3.6
+      - 3.8
+      - 4.0
+      - 4.5
+      - 'latest'
+    jobs:
+      - 'puppet-fdio-verify-unit-{puppet_version}-{stream}-{os}'
+
+- job-template:
+    name: 'puppet-fdio-verify-beaker-{stream}-{os}'
+
+    project-type: freestyle
+    node: centos7-basebuild-4c-4g
+    concurrent: true
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: '{os}'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
+
+    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: |
+          ./scripts/prepare-node.sh
+          ./scripts/allow-local-ssh-root.sh
+          ./scripts/ci-beaker.sh {os}
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'