X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fsweetcomb%2Fsweetcomb.yaml;h=c67ee238c128487b265d87b6d390c21bae51cdb5;hb=a399668452b7e8442be9ec79f73850fca9620afe;hp=a297d92e9a2d7bf8e7f4022ae5c957785e8618a2;hpb=8de2cfcd58f7bde5b66b48766badf7acdd9aa32b;p=ci-management.git

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index a297d92e9..c67ee238c 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -30,27 +30,41 @@
     stream:
       - master:
           branch: 'master'
+          repo-stream-part: 'master'
+      - '1901':
+          branch: 'stable/1901'
+          repo-stream-part: 'stable.1901'
+
+- project:
+    name: sweetcomb-view
+    views:
+      - project-view
+    project-name: sweetcomb
 
 - job-template:
     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:
@@ -60,11 +74,11 @@
 
     wrappers:
       - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: 120
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          name: 'sweetcomb'
+          name: '{project}'
           branch: '{branch}'
 
     publishers:
@@ -75,21 +89,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:
@@ -103,10 +121,36 @@
 
     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