X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fdistribution.yaml;h=fac1cbe07cf8259979ea880d24d623bcc2f78cdf;hb=ede29dc7e974384c1d2885900fc2b8ad8d76d3dd;hp=89b4c4fff28f6083aa738a7f79a8c36042f53ede;hpb=0f48f4583304c1bfddf7cf4d41ce89bcee9583c9;p=ci-management.git

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 89b4c4fff..fac1cbe07 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -3,48 +3,47 @@
     name: ccsdk-distribution
     project-name: 'ccsdk-distribution'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - 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'
+          maven-versions-plugin: true
+          cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-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'
-          maven-version: "mvn35"
-    sign-artifacts: true
-    project: 'ccsdk/distribution'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'ccsdk-distribution-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-docker-8c-8g
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker'
+          maven-versions-plugin: true
+          cron: '@daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-- project:
-    name: ccsdk-distribution-docker
-    project-name: 'ccsdk-distribution'
-    jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
     project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: queue-docker-4c-4g
+    build-node: centos7-docker-8c-8g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+
 
 #- project:
 #    name: ccsdk-distribution-arm64-docker
@@ -61,7 +60,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: centos7-docker-arm64-4c-2g
 #
 - project:
     name: ccsdk-distribution-clm
@@ -73,10 +72,14 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: centos7-docker-8c-8g
 
 
 - project:
@@ -84,14 +87,19 @@
     project-name: ccsdk-distribution
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/distribution
     branch: master
 
 - project:
     name: ccsdk-distribution-whitesource
     project-name: ccsdk-distribution
+    build-node: centos7-builder-4c-4g
     jobs:
-      - gerrit-whitesource-scan
+      - gerrit-whitesource-scan:
+          java-opts: '-Xmx2048m'
+    java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true