Configure Sweetcomb archive artifacts

[ci-management.git] / jjb / sweetcomb / sweetcomb.yaml

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index c67ee23..e0db408 100644 (file)
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -31,6 +31,9 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
@@ -77,10 +80,43 @@
           build-timeout: 120
 
     triggers:
+      - gerrit-trigger-checkstyle:
+          name: '{project}'
+          branch: '{branch}'
       - gerrit-trigger-patch-submitted:
           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-checkstyle.sh
+      - shell:
+          !include-raw-escape:
+          - include-raw-sweetcomb-build.sh
+    publishers:
+      - archive:
+          artifacts: >
+            **/build-root/build-package/*.rpm,
+            **/build-root/build-package/*.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
+
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
@@ -97,6 +133,14 @@
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
+    archive-artifacts: >
+        **/build-root/build-package/*.rpm
+        **/build-root/build-package/*.deb,
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
     parameters:
       - project-parameter:
           project: '{project}'
@@ -108,6 +152,11 @@
           stream: '{stream}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
 
     scm:
       - gerrit-trigger-scm:
@@ -133,6 +182,8 @@
           files:
             - file-id: 'packagecloud_api'
               target: '/root'
+      - shell:
+          !include-raw-escape: include-raw-sweetcomb-checkstyle.sh
       - shell:
           !include-raw-escape:
           - include-raw-sweetcomb-build.sh
@@ -142,8 +193,8 @@
     publishers:
       - archive:
           artifacts: >
-            **/build-root/*.rpm,
-            **/build-root/*.deb,
+            **/build-root/build-package/*.rpm,
+            **/build-root/build-package/*.deb,
           allow-empty: 'true'
           fingerprint: false
           only-if-success: true