Merge "Extract common RPM test builder steps to macro"

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

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index acfc7c345bb957d5fffdcf83b5854b2c15917228..5d8a89e41fbb951cdbf1849bd5852043ec4a1d0d 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -4,20 +4,24 @@
     project-name: puppet
 
     jobs:
-      - '{project-name}-verify-tox-{stream}'
-      - 'puppet-test-sanity-{stream}'
-      - 'puppet-test-full-{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'
 
 - job-template:
-    name: 'puppet-test-sanity-{stream}'
+    name: '{project-name}-test-sanity-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -48,19 +52,23 @@
           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: '**'
 
+    publishers:
+      - lf-infra-publish
+
 - job-template:
-    name: 'puppet-test-full-{stream}'
+    name: '{project-name}-test-full-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -77,7 +85,7 @@
           artifacts: '{archive-artifacts}'
       - string:
           name: TEST_SUITE
-          default: 'acceptance6_dock'
+          default: 'acceptance_dock'
           description: 'Set of tests to execute, Rakefile task'
 
     scm:
@@ -91,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'
@@ -106,8 +114,6 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
+
+    publishers:
+      - lf-infra-publish