X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fso%2Fso.yaml;h=de5c111f2fedef692d87d5d779296e5ed6c94b80;hb=972401c4d8cb29bf83a88f90183754bbc725cd0f;hp=a8d9971f9ddc41bbbcdebe9219e3b0f81968b964;hpb=2def5294889322dc20f5d272f4038ea992800282;p=ci-management.git

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index a8d9971f9..de5c111f2 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -13,30 +13,32 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+          build-node: centos7-docker-2c-1g
     project: 'so'
     stream:
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'guilin':
-          branch: 'guilin'
+      - 'jakarta':
+          branch: 'jakarta'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'kohn':
+          branch: 'kohn'
           java-version: openjdk11
-      - 'Custom_Workflow':
-          branch: 'Custom_Workflow'
+      - 'recursive-orch':
+          branch: 'recursive-orch'
           java-version: openjdk11
     mvn-settings: 'so-settings'
     files: '**'
@@ -50,7 +52,6 @@
       - 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: '{sonar_mvn_goal}'
     cron: '@daily'
@@ -112,8 +113,15 @@
     java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: so
-    branch: master
-    branch: guilin
-    branch: honolulu
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'jakarta':
+          branch: 'jakarta'
+          java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11