Merge "Remove topoprocessing from AR validate Oxygen"

[releng/builder.git] / jjb / packaging / puppet.yaml

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index ece33cf8e72ff420e44bd683b84764f3a21e573b..07f92bad148bbd257a2955993e8212a6a0d9d49b 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -13,10 +13,10 @@
     stream:
       - master:
           branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-      - boron:
-          branch: 'stable/boron'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'
@@ -52,7 +52,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-puppet.sh
+      - shell: !include-raw: test-puppet.sh
 
     triggers:
       - timed: '@weekly'
@@ -99,7 +99,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-puppet.sh
+      - shell: !include-raw: test-puppet.sh
 
     triggers:
       - timed: '@daily'
@@ -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