X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc-sdc-distribution-client.yaml;h=df84e993d0f63d8cf50c5a939016e8c109272276;hb=2f25a5853974c7f70361708c91a3df193a730326;hp=9e7a5e10990ebf8a5290664e3a7aca8a8b231c87;hpb=5612f9378b8b41a1cd15e2f3e80593a8c1a8103f;p=ci-management.git

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 9e7a5e109..df84e993d 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -7,90 +7,83 @@
 
 - project:
     name: sdc-sdc-distribution-client
-    project-name: 'sdc-sdc-distribution-client'
+    project-name: "sdc-sdc-distribution-client"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          sbom-generator: true
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-    project: 'sdc/sdc-distribution-client'
+    project: "sdc/sdc-distribution-client"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk11
-      - 'istanbul':
-          branch: 'istanbul'
+      - "london":
+          branch: "london"
           java-version: openjdk11
-    mvn-settings: 'sdc-sdc-distribution-client-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "montreal":
+          branch: "montreal"
+          java-version: openjdk11
+    mvn-settings: "sdc-sdc-distribution-client-settings"
+    files: "**"
+    archive-artifacts: ""
     build-timeout: 60
-    maven-version: 'mvn36'
+    maven-version: "mvn36"
 
 - project:
     name: sdc-sdc-distribution-client-integration-pairwise
     java-version: openjdk11
     jobs:
-       - '{project-name}-{stream}-integration-pairwise'
+      - "{project-name}-{stream}-integration-pairwise"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'sdc/sdc-distribution-client'
-    project-name: 'sdc-sdc-distribution-client'
+    project: "sdc/sdc-distribution-client"
+    project-name: "sdc-sdc-distribution-client"
     stream:
-        - 'master':
-            branch: 'master'
-            java-version: openjdk11
-    mvn-settings: 'sdc-sdc-distribution-client-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+
+    mvn-settings: "sdc-sdc-distribution-client-settings"
+    files: "**"
+    archive-artifacts: ""
     build-timeout: 60
-    maven-version: 'mvn36'
-    mvn-params: ' -P integration-pairwise'
+    maven-version: "mvn36"
+    mvn-params: " -P integration-pairwise"
 
 - project:
     name: sdc-sdc-distribution-client-sonar
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'sdc/sdc-distribution-client'
-    project-name: 'sdc-sdc-distribution-client'
-    branch: 'master'
-    mvn-settings: 'sdc-sdc-distribution-client-settings'
+    project: "sdc/sdc-distribution-client"
+    project-name: "sdc-sdc-distribution-client"
+    branch: "master"
+    mvn-settings: "sdc-sdc-distribution-client-settings"
     java-version: openjdk11
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    mvn-params: "-Dsonar.branch={branch}"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
 
 - project:
     name: sdc-sdc-distribution-client-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: sdc/sdc-distribution-client
-    project-name: 'sdc-sdc-distribution-client'
+    project-name: "sdc-sdc-distribution-client"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-    mvn-settings: 'sdc-sdc-distribution-client-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "sdc-sdc-distribution-client-settings"
     java-version: openjdk11
-
-- project:
-    name: sdc-sdc-distribution-client-info
-    project-name: sdc-sdc-distribution-client
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/sdc-distribution-client
-    branch: master