X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fpuppet-fdio%2Fpuppet-fdio.yaml;h=fd1b214d72bfcfd2deae7678956f1240a78e3c8e;hb=8b90cd8e00dc1e4604b7de1fdfb9d6f3bf0638a1;hp=fc4bc79a6d655eba0e52559a17bb28f29c06262c;hpb=ab26b793f48ea8f583047af6a64df5568ec57cf0;p=ci-management.git

diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml
index fc4bc79a6..fd1b214d7 100644
--- a/jjb/puppet-fdio/puppet-fdio.yaml
+++ b/jjb/puppet-fdio/puppet-fdio.yaml
@@ -1,8 +1,8 @@
 - project:
     name: puppet-fdio
     jobs:
-        - 'puppet-fdio-verify-{stream}-{os}'
-
+        - 'puppet-module-unit'
+        - 'puppet-fdio-verify-beaker-{stream}-{os}'
     project: 'puppet-fdio'
     os:
         - centos7:
@@ -13,7 +13,61 @@
             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}'
+    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}'
+
+    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/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: 'verify-{os}'
@@ -51,9 +105,7 @@
             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/allow-local-ssh-root.sh
+            ./scripts/ci-beaker.sh {os}