X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fsweetcomb%2Fsweetcomb.yaml;h=13b1134bc7e37dcebdd1c3937b7e5f5e20589a90;hb=6c837cefdf7161c0684f45970f3739d31cc326a2;hp=5d6dccc6f1c729bd2339f31a268fab040431b876;hpb=bedddb7ddd46317fa487282b0f7a20d82a6e98cc;p=ci-management.git

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 5d6dccc6f..13b1134bc 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -20,6 +20,7 @@
     jobs:
       - 'sweetcomb-verify-{stream}-{os}'
       - 'sweetcomb-merge-{stream}-{os}'
+      # - 'sweetcomb-test-{stream}-ubuntu1604'
 
     project: 'sweetcomb'
     os:
@@ -31,9 +32,18 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - vom:
+          branch: 'vom'
+          repo-stream-part: 'vom'
 
 - project:
     name: sweetcomb-view
@@ -47,6 +57,13 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: >
+      **/build-root/build-package/*.rpm
+      **/build-root/build-package/*.deb
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -65,6 +82,10 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -77,19 +98,47 @@
           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:
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
 
 - job-template:
     name: 'sweetcomb-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
+    archive-artifacts: >
+      **/build-root/build-package/*.rpm
+      **/build-root/build-package/*.deb
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -108,6 +157,10 @@
           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 +186,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
@@ -140,17 +195,79 @@
           !include-raw-escape:
           - ../scripts/packagecloud_push.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
+
+- job-template:
+    name: 'sweetcomb-test-{stream}-ubuntu1604'
+
+    project-type: freestyle
+    node: 'ubuntu1604-us'
+    concurrent: true
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: 100
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: 'ubuntu1604'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+      - stream-parameter:
+          stream: '{stream}'
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: 120
+
+    triggers:
+      - 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-build.sh
+          - include-raw-sweetcomb-test.sh
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
+
+- project:
+    name: sweetcomb-info
+    project-name: sweetcomb
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: sweetcomb
+    branch: master