X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fccsdk-csit.yaml;h=ead2542bf6ee29825806853fcce024801f16c3e4;hb=4d5baac7dfd358c558f764f9368137b6d9d06865;hp=5f3b2cd9fb3962c80617f016b33c0860fddfbc8c;hpb=088ca7569fb783b15a3256f9f9f64259dea0871c;p=ci-management.git

diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 5f3b2cd9f..ead2542bf 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -3,18 +3,11 @@
     name: ccsdk-distribution-csit
     jobs:
       - '{project-name}-review-verification-maven-{stream}':
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-snapshot-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
           maven-versions-plugin: true
       - '{project-name}-merge-verification-maven-{stream}':
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-snapshot-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
           maven-versions-plugin: true
-
     project-name: 'ccsdk-distribution'
     recipients: 'dtimoney@att.com'
     # project name in gerrit
@@ -22,26 +15,32 @@
     stream:
       - 'master':
           branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'ccsdk-distribution-settings'
-    mvn-global-settings: global-settings
     robot-options: ''
     branch: 'master'
 
 - project:
     name: ccsdk-oran-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
+      - '{project-name}-review-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
+      - '{project-name}-merge-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
     project-name: 'ccsdk-oran'
-    recipients: 'bjorn.magnusson@est.tech maxime.bonneau@est.tech'
+    recipients: 'bjorn.magnusson@est.tech martin.c.yan@est.tech'
+    # project name in gerrit
+    project: 'ccsdk/oran'
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    functionality:
-      - 'polmansuite':
-          trigger_jobs: '{project-name}-maven-merge-{stream}'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    mvn-settings: 'ccsdk-oran-settings'
     robot-options: ''
+    branch: 'master'