X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc.yaml;h=2a330ed430661c9a40fec2fa4a5e2af06c86f7d7;hb=627a2bfc1daf1c3b458d46a71bb714f9010cf09a;hp=a40e24019d43f98b6f21055f26dc298368cdb8ff;hpb=d10f2d33a78898e4656d89b81b735765e8864e6c;p=ci-management.git

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index a40e24019..2a330ed43 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -49,13 +49,17 @@
       - gerrit-maven-stage:
           build-timeout: 90
           sign-artifacts: true
+          sbom-generator: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          mvn-version: 'mvn36'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
+          mvn-version: 'mvn36'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -66,36 +70,18 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
+          java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
           java-version: openjdk11
-#     - 'frankfurt':
-#         branch: 'frankfurt'
-#         java-version: openjdk8
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
     maven-version: 'mvn36'
 
-#- project:
-#    name: sdc-arm64
-#    project-name: 'sdc-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
-#    project: 'sdc'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    maven-version: 'mvn35'
-#
 - project:
     name: sdc-sonar
     jobs:
@@ -103,7 +89,6 @@
           build-timeout: 120
     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: '{sonar_mvn_goal}'
     cron: '@daily'
@@ -116,6 +101,7 @@
     mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+    mvn-version: 'mvn36'
 
 - project:
     name: sdc-clm
@@ -128,7 +114,10 @@
     project: sdc
     project-name: 'sdc'
     build-node: ubuntu1804-docker-8c-8g
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-version: 'mvn36'
     mvn-settings: 'sdc-settings'
     java-version: openjdk11
 
@@ -140,19 +129,3 @@
     build-node: centos7-builder-2c-1g
     project: sdc
     branch: master
-
-- project:
-    name: 'sdc-whitesource'
-    project-name: 'sdc'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan:
-          build-timeout: 120
-          submodule-timeout: 30
-          java-opts: '-Xmx2048m'
-    mvn-settings: 'sdc-settings'
-    wss-product-name: 'sdc'
-    mvn-clean-install: true
-    project: 'sdc'
-    branch: master
-    java-version: openjdk11