X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpackaging%2Fpuppet.yaml;h=5ef7d58efb1af09a798d0768477f4319a98e8e05;hb=a6bb232e154d0ac8f8f493ea51c19ad4db223d92;hp=ece33cf8e72ff420e44bd683b84764f3a21e573b;hpb=9861b08bd3bb5651e2fa275c210f0845b3af1887;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index ece33cf8e..5ef7d58ef 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'
-      - carbon:
-          branch: 'stable/carbon'
-      - boron:
-          branch: 'stable/boron'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -52,12 +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: '**'
@@ -68,7 +68,7 @@
 - job-template:
     name: '{project-name}-test-full-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -99,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'
@@ -114,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