X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fpackaging%2Fpuppet.yaml;h=60d3a826ea5cbc10b78d0054732e60a11d6af3d0;hb=1aaf65a8c4855c8bef7f955b4e0a9937de444d4c;hp=07f92bad148bbd257a2955993e8212a6a0d9d49b;hpb=9b46087a28de418cf2e0ce5d366346dc9adc3a10;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index 07f92bad1..60d3a826e 100644
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -4,24 +4,22 @@
     project-name: puppet
 
     jobs:
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-test-sanity-{stream}'
       - '{project-name}-test-full-{stream}'
+      - gerrit-tox-verify
 
     project: 'integration/packaging/puppet-opendaylight'
 
     stream:
       - master:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
+      - oxygen:
+          branch: 'stable/oxygen'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -57,10 +55,11 @@
     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
@@ -68,7 +67,7 @@
 - job-template:
     name: '{project-name}-test-full-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -104,7 +103,7 @@
     triggers:
       - timed: '@daily'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'puppet-test-full'