X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fpackaging%2Fpuppet.yaml;h=5d8a89e41fbb951cdbf1849bd5852043ec4a1d0d;hb=e666ec01ef9cfd0d4839bb5ea3cec34e21e0841c;hp=5b84a1fef11747499239a4dda8156169150177ae;hpb=eafe65d034ba20f98e2b49743f852c786938ab2f;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index 5b84a1fef..5d8a89e41 100644
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -4,9 +4,9 @@
     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'
 
@@ -17,13 +17,11 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-      - boron:
-          branch: 'stable/boron'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -59,7 +57,7 @@
     triggers:
       - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -70,7 +68,7 @@
 - job-template:
     name: '{project-name}-test-full-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -106,7 +104,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'