X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fdistribution.yaml;h=a119eb2a449078444e3a028af364e64a3783254e;hb=2197d45863af3496355dda957fabed01be445a8f;hp=d503a39776f8e967c5ccb8163421aa978e3bb83a;hpb=e5a2bbba465484526a78750719c366102867ed53;p=ci-management.git

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index d503a3977..a119eb2a4 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -3,48 +3,44 @@
     name: ccsdk-distribution
     project-name: 'ccsdk-distribution'
     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'
           maven-versions-plugin: 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 -Ddocker.skip.run=true -Pdocker'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-      - gerrit-maven-docker-snapshot-PoC:
-          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 -P docker'
-          maven-versions-plugin: true
-          maven-version: 'mvn36'
-      - '{project-name}-{stream}-docker-staging':
-          script:
-            !include-raw-escape: 'tag-ccsdk-distribution-images-staging.sh'
 
     project: 'ccsdk/distribution'
     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-distribution-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'
 
@@ -64,7 +60,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1804-docker-arm64-4c-2g
+#    build-node: centos7-docker-arm64-4c-2g
 #
 - project:
     name: ccsdk-distribution-clm
@@ -76,12 +72,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: centos7-docker-8c-8g
 
 
 - project:
@@ -96,12 +90,12 @@
 - project:
     name: ccsdk-distribution-whitesource
     project-name: ccsdk-distribution
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos7-builder-4c-4g
     jobs:
       - gerrit-whitesource-scan:
           java-opts: '-Xmx2048m'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true