X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fsweetcomb%2Fsweetcomb.yaml;h=24761b292c3d26a6db16310e33e1a44fea20b87f;hb=cf7b336c2b7a95641bad3d18f7fc655f855c8dbc;hp=c7df3a186b056d3fb3058f1cfbaea3732c9bcc92;hpb=d021d95c1d0df0d53371ba37a2024c8ebc2277f5;p=ci-management.git

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index c7df3a186..24761b292 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -20,7 +20,7 @@
     jobs:
       - 'sweetcomb-verify-{stream}-{os}'
       - 'sweetcomb-merge-{stream}-{os}'
-      - 'sweetcomb-test-{stream}-ubuntu1604'
+      # - 'sweetcomb-test-{stream}-ubuntu1604'
 
     project: 'sweetcomb'
     os:
@@ -32,12 +32,21 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
+      - '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
@@ -69,6 +78,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:
@@ -103,25 +116,12 @@
           !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'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
           fixed-delay: 90
 
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
 - job-template:
     name: 'sweetcomb-merge-{stream}-{os}'
 
@@ -145,6 +145,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:
@@ -179,16 +183,7 @@
           !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'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -248,18 +243,31 @@
           - include-raw-sweetcomb-build.sh
           - include-raw-sweetcomb-test.sh
     publishers:
-      - archive:
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
           fixed-delay: 90
 
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+- project:
+    name: sweetcomb-info
+    project-name: sweetcomb
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-2g
+    project: sweetcomb
+    branch: master
+
+- project:
+    name: sweetcomb-sonar
+    project: sweetcomb
+    project-name: sweetcomb
+    mvn-settings: sweetcomb-settings
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    branch: master
+    build-node: centos7-docker-2c-2g
+    jobs:
+      - gerrit-maven-sonar