X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fccsdk-oran.yaml;h=75c02d9e18eb68a9f5989c4aff179ff1992c8fef;hb=2197d45863af3496355dda957fabed01be445a8f;hp=aee9a76f2855581b84b85e0ebe8154e2788aec5d;hpb=ba3d6e1044bf9d52e1cf8067dca6baf2339553c6;p=ci-management.git

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index aee9a76f2..75c02d9e1 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -3,19 +3,23 @@
     name: ccsdk-oran
     project-name: 'ccsdk-oran'
     jobs:
-      - gerrit-maven-verify
+      - gerrit-maven-verify:
+          cron: ''
       - gerrit-maven-merge:
           cron: '@daily'
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          mvn-params: '-Dmaven.test.skip=true'
           mvn-opts: '-Ddocker.skip=true'
           cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
+          build-node: centos7-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
+          mvn-params: '-Dmaven.test.skip=true -Pdocker'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
@@ -24,24 +28,42 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: centos7-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
+- project:
+    name: ccsdk-oran-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'ccsdk/oran'
+    project-name: 'ccsdk-oran'
+    stream:
+      - 'master':
+          branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn38'
+    mvn-settings: 'ccsdk-oran-settings'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: centos8-builder-4c-4g
+
 - project:
     name: ccsdk-oran-info
     project: ccsdk/oran
     project-name: ccsdk-oran
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -55,27 +77,13 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: centos7-docker-8c-8g
     project: 'ccsdk/oran'
     project-name: 'ccsdk-oran'
     branch: 'master'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- project:
-    name: ccsdk-oran-rtd
-    project-name: 'ccsdk-oran'
-    jobs:
-      - '{project-name}-rtd-jobs'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    project: 'ccsdk/oran'
-    project-pattern: ccsdk/oran
-    rtd-build-url: https://readthedocs.org/api/v2/webhook/onap-ccsdk-oran/133602/
-    rtd-token: 7346b9ecd6195ab86db1fcadd29662512edc86e1