1 files changed, 44 insertions, 9 deletions

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 661adf9ee..10f042ab4 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -39,22 +39,26 @@
     name: 'sweetcomb-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-us'
     concurrent: true
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
+      numToKeep: 100
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
       - project-parameter:
-          project: 'sweetcomb'
+          project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: '{stream}'
 
     scm:
       - gerrit-trigger-scm:
@@ -64,11 +68,11 @@
 
     wrappers:
       - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: 120
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          name: 'sweetcomb'
+          name: '{project}'
           branch: '{branch}'
 
     publishers:
@@ -79,21 +83,25 @@
     name: 'sweetcomb-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-us'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
+      numToKeep: 100
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
       - project-parameter:
-          project: 'sweetcomb'
+          project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
+      - stream-parameter:
+          stream: '{stream}'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
       - gerrit-trigger-scm:
@@ -107,10 +115,37 @@
 
     triggers:
       - gerrit-trigger-patch-merged:
-          name: 'sweetcomb'
+          name: '{project}'
           branch: '{branch}'
 
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: '.packagecloud'
+              target: '/root'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/root'
+      - shell:
+          !include-raw-escape:
+          - include-raw-sweetcomb-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
     publishers:
+      - archive:
+          artifacts: >
+            **/build-root/*.rpm,
+            **/build-root/*.deb,
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90