X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc-sdc-tosca.yaml;h=9f6dd3eb9fb3ac2bb3e5a990fe1a47590e214f29;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=51d91ee5c526665236221700d291579f86cd1b44;hpb=fb7a792032752f7e61dd330c6f5ac2032c964bfe;p=ci-management.git

diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 51d91ee5c..9f6dd3eb9 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -4,64 +4,64 @@
     project-name: sdc-sdc-tosca
     views:
       - project-view
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-tosca
-    project-name: 'sdc-sdc-tosca'
+    project-name: "sdc-sdc-tosca"
     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-tosca'
+    project: "sdc/sdc-tosca"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-sdc-tosca-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+      - "montreal":
+          branch: "montreal"
+    mvn-settings: "sdc-sdc-tosca-settings"
+    files: "**"
+    archive-artifacts: ""
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: "mvn36"
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-tosca-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}"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'sdc/sdc-tosca'
-    project-name: 'sdc-sdc-tosca'
-    branch: 'master'
-    mvn-settings: 'sdc-sdc-tosca-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    project: "sdc/sdc-tosca"
+    project-name: "sdc-sdc-tosca"
+    branch: "master"
+    mvn-settings: "sdc-sdc-tosca-settings"
+    mvn-params: "-Dsonar.branch={branch}"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-tosca-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: sdc/sdc-tosca
-    project-name: 'sdc-sdc-tosca'
-    branch: 'master'
-    mvn-settings: 'sdc-sdc-tosca-settings'
-
-- project:
-    name: sdc-sdc-tosca-info
-    project-name: sdc-sdc-tosca
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/sdc-tosca
-    branch: master
+    project-name: "sdc-sdc-tosca"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "sdc-sdc-tosca-settings"
+    java-version: openjdk11