Merge "Remove opflexvpp jobs"

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

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 3f58ccd..24761b2 100644 (file)
--- 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,6 +32,12 @@
       - 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'
@@ -61,14 +67,6 @@
       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}'
@@ -118,8 +116,7 @@
           !include-raw-escape:
           - include-raw-sweetcomb-build.sh
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -137,14 +134,6 @@
       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}'
@@ -194,8 +183,7 @@
           !include-raw-escape:
           - ../scripts/packagecloud_push.sh
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -214,12 +202,6 @@
       artifactDaysToKeep: '{build-artifact-days-to-keep}'
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
-    archive-artifacts: >
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
-
     parameters:
       - project-parameter:
           project: '{project}'
@@ -261,8 +243,7 @@
           - include-raw-sweetcomb-build.sh
           - include-raw-sweetcomb-test.sh
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -273,6 +254,20 @@
     project-name: sweetcomb
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-4c-4g
+    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