X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpackaging%2Fpuppet.yaml;h=60d3a826ea5cbc10b78d0054732e60a11d6af3d0;hb=1aaf65a8c4855c8bef7f955b4e0a9937de444d4c;hp=53b59d33a6fc75f5504c84f3e4132ef5b00c914b;hpb=7f6339311c8536ad21e4884dfda2e7253e14e0c5;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index 53b59d33a..60d3a826e 100644
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -4,20 +4,22 @@
     project-name: puppet
 
     jobs:
-      - '{project-name}-verify-tox-{stream}'
-      - 'puppet-test-sanity-{stream}'
-      - 'puppet-test-full-{stream}'
+      - '{project-name}-test-sanity-{stream}'
+      - '{project-name}-test-full-{stream}'
+      - gerrit-tox-verify
 
     project: 'integration/packaging/puppet-opendaylight'
 
     stream:
       - master:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
 
 - job-template:
-    name: 'puppet-test-sanity-{stream}'
+    name: '{project-name}-test-sanity-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -48,19 +50,24 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-puppet.sh
+      - shell: !include-raw: test-puppet.sh
 
     triggers:
+      - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-    name: 'puppet-test-full-{stream}'
+    name: '{project-name}-test-full-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -91,7 +98,21 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-puppet.sh
+      - shell: !include-raw: test-puppet.sh
 
     triggers:
       - timed: '@daily'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'puppet-test-full'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+
+    publishers:
+      - lf-infra-publish