X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpackaging%2Fpuppet.yaml;h=5d8a89e41fbb951cdbf1849bd5852043ec4a1d0d;hb=def5fedd2cc686080b3253f672ea8c24625cd7e3;hp=5d82cf063bb5554ac0d43d1fbbc83eb8d495a2c6;hpb=3db1010a1acc7ec4f4cd9ca4d4171b733fe8091b;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index 5d82cf063..5d8a89e41 100644
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -4,24 +4,24 @@
     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'
-      - 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
 
@@ -52,11 +52,12 @@
           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: '**'
@@ -67,7 +68,7 @@
 - job-template:
     name: '{project-name}-test-full-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -98,12 +99,12 @@
           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: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'puppet-test-full'
@@ -113,11 +114,6 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
 
     publishers:
       - lf-infra-publish