Merge "Chore: Automation adds portal-ng/preferences config files"

diff --git a/INFO.yaml b/INFO.yaml
index bf38e97..31657ad 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -66,5 +66,20 @@ committers:
       company: 'LF'
       id: 'kevin.sandi'
       timezone: 'America/Costa_Rica'
+    - name: 'Matt Watkins'
+      email: 'mwatkins@linuxfoundation.org'
+      company: 'LF'
+      id: 'modeSevenindustrialsolutions'
+      timezone: 'Europe/London'
+    - name: 'Thomas Kulik'
+      email: 'thomas.kulik@telekom.de'
+      company: 'Deutsche Telekom'
+      id: 'thmsdt'
+      timezone: 'Germany/Berlin'
+    - name: 'Cédric Ollivier'
+      email: 'cedric.ollivier@orange.com'
+      company: 'Orange'
+      id: 'ollivier'
+      timezone: 'Europe/Paris'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index 8419cd9..fd98ad0 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20221111-031113.988
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20230329-210041.650
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
index a7eab68..a55f55f 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 20.04 - helm - x86_64 - 20220907-184211.729
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - helm - x86_64 - 20230329-210733.748
 LABELS=ubuntu2004-helm-2c-1g
 HARDWARE_ID=v3-standard-4

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index bca81a1..2e8eb00 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -12,10 +12,10 @@
       - '{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
-          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'aai/aai-common'
@@ -87,6 +87,7 @@
       - '{project-name}-{stream}-verify-docker'
       - '{project-name}-{stream}-merge-docker'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index a184d51..2905fdf 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -14,10 +14,11 @@
           cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 0f938b4..2fd4f28 100644 (file)
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -13,10 +13,11 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 1e051ea..bac59be 100644 (file)
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -13,10 +13,11 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 87f607d..cd37af3 100644 (file)
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - '{project-name}-gerrit-release-jobs':

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index d86b6db..89925a5 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -14,10 +14,11 @@
           cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -B -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 5a4f5e8..474dc7e 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -16,10 +16,11 @@
       - gerrit-maven-stage:
           mvn-params: '-DskipTests'
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index e4a7cea..2bb0127 100644 (file)
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - '{project-name}-gerrit-release-jobs':

diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 4492587..738ecc5 100644 (file)
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -13,10 +13,11 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 6e39797..6aedc77 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -14,10 +14,11 @@
           cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 1e2fc21..68b058d 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -16,10 +16,11 @@
       - gerrit-maven-stage:
           mvn-params: '-DskipTests'
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 4383b2b..e55776b 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -30,7 +30,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-goals: 'clean deploy -Ddocker.skip'
       - gerrit-maven-docker-stage:
@@ -77,6 +77,6 @@
     project-name: dcaegen2-collectors-hv-ves
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/collectors/hv-ves
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index c5dbf97..af4c1fa 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -10,7 +10,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
@@ -75,6 +75,6 @@
     java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/collectors/restconf
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 0460f09..a02937e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -53,6 +53,6 @@
     project-name: dcaegen2-collectors-snmptrap
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/collectors/snmptrap
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index ff4142a..b3fd439 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -78,6 +78,6 @@
     project-name: dcaegen2-collectors-ves
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/collectors/ves
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
index b695e9e..6c50f2f 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors.yaml
@@ -4,6 +4,6 @@
     project-name: dcaegen2-collectors
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/collectors
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index b034846..6b47e11 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -45,6 +45,6 @@
     project-name: dcaegen2-deployments
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/deployments
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index bacc870..1fdace9 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -9,7 +9,7 @@
           - gerrit-maven-merge
           - gerrit-maven-stage:
                 sign-artifacts: true
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
                 sbom-generator: true
           - gerrit-maven-docker-stage:
@@ -81,6 +81,6 @@
     name: dcaegen2-platform-ves-openapi-manager-info
     project: dcaegen2/platform/ves-openapi-manager
     project-name: dcaegen2-platform-ves-openapi-manager
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify

diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
index 23d22ed..ee8f0f5 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform.yaml
@@ -4,7 +4,7 @@
     project-name: dcaegen2-platform
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/platform
     branch: master
 

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 8ad14c8..c6158bd 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -38,7 +38,7 @@
           sign-artifacts: true
           sbom-generator: true
           sbom-path: 'components/datalake-handler/'
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-pom: 'components/datalake-handler/pom.xml'
           mvn-params: '-f components/datalake-handler/pom.xml'
@@ -73,7 +73,7 @@
           sbom-generator: true
           sbom-path: 'components/datalake-handler/'
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-pom: 'components/datalake-handler/pom.xml'
           mvn-params: '-f components/datalake-handler/pom.xml'
@@ -108,7 +108,7 @@
           sbom-generator: true
           sbom-path: 'components/datalake-handler/'
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-pom: 'components/datalake-handler/pom.xml'
           mvn-params: '-f components/datalake-handler/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 0f82463..5522f26 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -58,6 +58,6 @@
     project-name: dcaegen2-services-heartbeat
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/services/heartbeat
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 84ffba1..69392e7 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -10,7 +10,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
@@ -73,6 +73,6 @@
     java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/services/mapper
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 9af26f4..508d544 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -28,7 +28,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -75,6 +75,6 @@
     project-name: dcaegen2-services-pm-mapper
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/services/pm-mapper
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 5f10421..d8db018 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -8,7 +8,7 @@
       - gerrit-maven-merge
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
@@ -71,6 +71,6 @@
     project-name: dcaegen2-services-prh
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/services/prh
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index ba376a1..8d01e0e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -9,7 +9,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: false
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -26,7 +26,7 @@
     nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
-    build-node: 'centos7-docker-8c-8g'
+    build-node: 'centos8-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -55,7 +55,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'dcaegen2/services/sdk'
     project-name: 'dcaegen2-services-sdk'
     branch: 'master'
@@ -70,7 +70,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/sdk
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project-name: 'dcaegen2-services-sdk'
     stream:
       - 'master':
@@ -82,6 +82,6 @@
     project-name: dcaegen2-services-sdk
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/services/sdk
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 2ebe9e1..92db626 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -9,7 +9,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
@@ -72,6 +72,6 @@
     project-name: dcaegen2-services-son-handler
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/services/son-handler
     branch: master

diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml
index 4ff813e..7949ae9 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services.yaml
+++ b/jjb/dcaegen2/dcaegen2-services.yaml
@@ -4,7 +4,7 @@
     project-name: dcaegen2-services
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/services
     branch: master
 - project:

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 83d5546..55a5bb4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -61,7 +61,7 @@
     project-name: dcaegen2-utils
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/utils
     branch: master
 
@@ -74,7 +74,7 @@
     # push credentials
     mvn-settings: dcaegen2-utils-settings
     # requires centos to sign release
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-docker-4c-4g
     tox-dir: onap-dcae-cbs-docker-client
     stream:
       - master:

diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index deea062..e1f6ca0 100644 (file)
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -47,6 +47,6 @@
     project-name: dcaegen2
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2
     branch: master

diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 93adf4d..dfe1fe9 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -48,7 +48,7 @@
     project-name: demo
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: demo
     branch: master
 

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index e76024e..e2cc2f2 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -81,6 +81,6 @@
     project-name: dmaap-buscontroller
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dmaap/buscontroller
     branch: master

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 239263a..d9ecb98 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -76,6 +76,6 @@
     project-name: dmaap-datarouter
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dmaap/datarouter
     branch: master

diff --git a/jjb/dmaap/dmaap-kafka-client.yaml b/jjb/dmaap/dmaap-kafka-client.yaml
index 298fb3a..e933bcc 100644 (file)
--- a/jjb/dmaap/dmaap-kafka-client.yaml
+++ b/jjb/dmaap/dmaap-kafka-client.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           cron: ''
       - '{project-name}-gerrit-release-jobs':
@@ -54,6 +54,6 @@
     project-name: dmaap-kafka-client
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dmaap/kafka11aaf
     branch: master

diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 4dc1ad1..6f70c58 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           cron: ''
       - '{project-name}-gerrit-release-jobs':
@@ -56,6 +56,6 @@
     project-name: dmaap-messagerouter-dmaapclient
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dmaap/messagerouter/dmaapclient
     branch: master

diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index aaa0b8e..30db7f5 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -80,6 +80,6 @@
     project-name: dmaap-messagerouter-messageservice
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dmaap/messagerouter/messageservice
     branch: master

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index ad3cea7..856d017 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -10,6 +10,6 @@
     project-name: doc
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: doc
     branch: master

diff --git a/jjb/doc/rules.yaml b/jjb/doc/rules.yaml
index 5f74492..7618f7d 100644 (file)
--- a/jjb/doc/rules.yaml
+++ b/jjb/doc/rules.yaml
@@ -31,12 +31,116 @@
     name: doc-rules
     builders:
       - shell: |
-          echo Checking if all Sphinx warnings are treated as errors
-          find -name tox.ini |xargs grep sphinx-build | grep -v spelling | grep -v \\-W  && exit 1 || exit 0
+          #!/bin/bash
+          . /lib/lsb/init-functions || exit 0
+          exitstatus="0"
+          warning="0"
+          # message, begin
+          log_success_msg "Starting additional checks related to documentation."
+          log_success_msg "See https://git.onap.org/doc/doc-best-practice for example config files (master branch)."
+          log_success_msg "Modify example config files if you like to use them in a release branch."
+          log_success_msg "See https://wiki.onap.org/x/w4IEBw for the detailed procedure #02."
+          log_success_msg "In case of questions please contact the ONAP documentation team."
+          # docs directory
+          if [ ! -d docs ] ; then
+            log_success_msg "Directory docs not found. Skipping further checks."
+            exit 0
+          fi
+          # config files, required
+          for i in docs/index.rst docs/conf.py docs/requirements-docs.txt docs/_static/css/ribbon.css; do
+            if [ ! -f $i ] ; then
+              log_failure_msg "$i missing. Please add it or remove the full docs directory."
+              exitstatus="1"
+            else
+              log_success_msg "$i found."
+            fi
+          done
+          # config files, no longer required
+          for i in docs/conf.yaml; do
+            if [ -f $i ] ; then
+              log_failure_msg "$i found. It is no longer required. Please remove it."
+              exitstatus="1"
+            else
+              log_success_msg "$i not found."
+            fi
+          done
+          # tox.ini @ docs directory
+          filename="docs/tox.ini"
+          if [ ! -f $filename ] ; then
+            log_failure_msg "$filename missing. Please add it or remove the full docs directory."
+            exitstatus="1"
+          else
+            log_success_msg "$filename found."
+            # sphinx-build command and -W option
+            sphinxbuild_detected=0
+            linenumber=0
+            while IFS="" read -r line || [ -n "$line" ] ; do
+              linenumber=$((linenumber+1))
+              if echo $line | grep -q '^[ \t]*sphinx-build.*' ; then
+                sphinxbuild_detected="1"
+                if echo $line | grep -q '^[ \t]*sphinx-build.* -W ' ; then
+                  log_success_msg "sphinx-build option '-W' used in $filename, line $linenumber."
+                elif echo $line | grep -q ' \-b spelling ' ; then
+                  log_warning_msg "sphinx-build option '-W' missing for spellcheck in $filename, line $linenumber."
+                  warning="1"
+                else
+                  log_failure_msg "sphinx-build option '-W' missing in $filename, line $linenumber. Please add it."
+                  exitstatus="1"
+                fi
+              fi
+            done < $filename
+            if [ "$sphinxbuild_detected" = "0" ]; then
+              log_failure_msg "Sphinx-build command(s) missing in $filename. Please add it."
+              exitstatus="1"
+            fi
+            # second tox.ini @ root directory
+            if [ -f ./tox.ini ] ; then
+              # sphinx-build command
+              if cat ./tox.ini | grep -q '^[ \t]*sphinx-build.*' ; then
+                log_warning_msg "tox.ini also exists in root directory and contains sphinx-build command(s). Please check for redundancies."
+                warning="1"
+              fi
+            fi
+            unset sphinxbuild_detected
+            unset linenumber
+          fi
+          unset filename
+          # ribbon.css
+          filename="docs/_static/css/ribbon.css"
+          if [ ! -f $filename ]; then
+            log_failure_msg "$filename missing. Please add it or remove the full docs directory."
+            exitstatus="1"
+          else
+            log_success_msg "$filename found."
+            # max-width parameter
+            cssmaxwidth=$(grep '^[ \t]*max-width:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//');
+            if [[ ! $cssmaxwidth == *"max-width: 800px"* ]]; then
+              log_failure_msg "Setting 'max-width: 800px' missing in $filename. Please add it."
+              exitstatus="1"
+            else
+              log_success_msg "Setting 'max-width: 800px' found in $filename."
+            fi
+            unset cssmaxwidth
+          fi
+          unset filename
+          # message, end
+          if [ "$exitstatus" = "0" ]; then
+            if [ "$warning" = "0" ]; then
+              log_success_msg "Congratulations! No documentation problem(s) detected."
+            else
+              log_warning_msg "No major documentation problem(s) detected but there are warnings!"
+            fi
+          else
+            if [ ! "$warning" = "0" ]; then
+              log_warning_msg "Please check the detected documentation warning(s)!"
+            fi
+            log_failure_msg "Please fix the detected documentation problem(s)!"
+          fi
+          exit $exitstatus
 
 - job-template:
     name: doc-rules
-    node: centos7-builder-2c-1g
+    node: ubuntu1804-docker-8c-8g
     triggers:
       - doc-rules-patchset-created
     scm:

diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 35ef4a2..5821aab 100644 (file)
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -88,6 +88,6 @@
     project-name: externalapi-nbi
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: externalapi/nbi
     branch: master

diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index dada9ed..cb43d25 100644 (file)
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           java-version: openjdk11
           sbom-generator: true
@@ -64,6 +64,6 @@
     project-name: holmes-common
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: holmes/common
     branch: master

diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 6e5682b..b9a1d95 100644 (file)
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           java-version: openjdk11
           sbom-generator: true
@@ -64,6 +64,6 @@
     project-name: holmes-engine-management
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: holmes/engine-management
     branch: master

diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 385721e..1357f69 100644 (file)
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           java-version: openjdk11
           sbom-generator: true
@@ -64,6 +64,6 @@
     project-name: holmes-rule-management
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: holmes/rule-management
     branch: master

diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
index 5074a0c..f290699 100644 (file)
--- a/jjb/integration/docker/integration-docker-onap-java11.yaml
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -4,7 +4,7 @@
     project-name: integration-docker-onap-java
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: integration/docker/onap-java11
     branch: master
 

diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
index 84c8b72..7723a66 100644 (file)
--- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
@@ -28,7 +28,7 @@
         - '{project-name}-gerrit-release-jobs':
             build-node: centos7-docker-8c-8g
         - gerrit-maven-docker-stage:
-            build-node: centos7-docker-8c-8g
+            build-node: centos8-docker-8c-8g
             maven-versions-plugin: true
             container-public-registry: 'nexus3.onap.org:10001'
             container-staging-registry: 'nexus3.onap.org:10003'
@@ -36,6 +36,6 @@
             mvn-params: '-P docker'
         - gerrit-maven-stage:
             sign-artifacts: true
-            build-node: centos7-docker-8c-8g
+            build-node: centos8-docker-8c-8g
             maven-versions-plugin: true
             mvn-goals: 'clean deploy'

diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index b73e5f2..4d6fe87 100644 (file)
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -22,7 +22,7 @@
                  build-node: centos7-docker-8c-8g
           - gerrit-maven-stage:
                 sign-artifacts: true
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
                 mvn-goals: 'clean deploy'
           - gerrit-maven-docker-stage:

diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 2c8584c..ff8faf2 100644 (file)
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -23,7 +23,7 @@
                  build-node: centos7-docker-8c-8g
           - gerrit-maven-stage:
                 sign-artifacts: true
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
                 mvn-goals: 'clean deploy'
 

diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
index 4b396e8..bad0801 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
@@ -8,7 +8,7 @@
           - '{project-name}-{stream}-merge-java'
           - gerrit-maven-stage:
                 sign-artifacts: true
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
           - gerrit-maven-docker-stage:
                 build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index 5a1c2e9..8cb50d6 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -8,7 +8,7 @@
           - '{project-name}-{stream}-merge-java'
           - gerrit-maven-stage:
                 sign-artifacts: true
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
           - gerrit-maven-docker-stage:
                 build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
index 282ca45..cca5dab 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
@@ -9,7 +9,7 @@
           - '{project-name}-{stream}-merge-java'
           - gerrit-maven-stage:
                 sign-artifacts: true
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
           - gerrit-maven-docker-stage:
                 build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index 75e5a02..8c83a9c 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -8,7 +8,7 @@
           - '{project-name}-{stream}-merge-java'
           - gerrit-maven-stage:
                 sign-artifacts: true
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
           - gerrit-maven-docker-stage:
                 build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index 548a28c..2c29f1b 100644 (file)
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -18,7 +18,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           sbom-generator: true
 

diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index c7b6db3..7d89c30 100644 (file)
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -12,10 +12,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-pom: 'distributions/msb-apigateway/pom.xml'

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index e1de868..e59e9bc 100644 (file)
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -6,10 +6,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index dd7bc75..ccaeb32 100644 (file)
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index f4815e9..4217d21 100644 (file)
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 8ef2bcb..59cc20a 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -17,10 +17,12 @@
           pattern: 'artifactbroker/**'
     jobs:
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-goals: install
           mvn-params: '-P docker'

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 1b59ff8..98f207e 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -13,10 +13,12 @@
           pattern: 'vio/**'
     jobs:
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-goals: install
           mvn-params: '-P docker'

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 4d83ed2..5ab40ed 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -59,11 +59,13 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: centos8-docker-8c-8g
+          sbom-generator: true
           maven-goals: install
           mvn-params: '-P docker'
           maven-versions-plugin: true

diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index 23af12c..c899e0a 100644 (file)
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -10,6 +10,7 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-version-plugin: true

diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
index 55ea68b..9a09775 100644 (file)
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -38,11 +38,13 @@
           -  '{project-name}-gerrit-release-jobs':
                  build-node: centos7-docker-8c-8g
           - gerrit-maven-stage:
+                sbom-generator: true
                 sign-artifacts: true
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: true
                 mvn-goals: 'clean deploy -P docker'
           - gerrit-maven-docker-stage:
+                sbom-generator: true
                 build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'

diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index 0b0ecaa..adb5158 100644 (file)
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -6,11 +6,13 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - '{project-name}-{stream}-release-version-java-daily'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-pom: 'pom.xml'

diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index c4434f7..3cea163 100644 (file)
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -12,6 +12,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 4616a57..7aef569 100644 (file)
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -20,12 +20,14 @@
       - '{project-name}-{stream}-{subproject}-merge-java':
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index e57a5ea..46e719f 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -21,12 +21,14 @@
       - '{project-name}-{stream}-{subproject}-merge-java':
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index af713bd..94228b7 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -15,11 +15,13 @@
          mvn-profile: 'docker'
          mvn-params: "-P docker"
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 85e765b..0f6093a 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -9,11 +9,13 @@
           mvn-params: '-P docker'
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 36fec99..de8ac8e 100644 (file)
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -4,11 +4,13 @@
     project-name: 'policy-clamp'
     jobs:
       - gerrit-maven-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
+          sbom-generator: true
           maven-versions-plugin: true
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index b488b1f..4fbfc7c 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index ef6f3fc..ef64891 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -9,11 +9,13 @@
           mvn-params: '-P docker'
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index e37c0e9..cae1d4d 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -10,6 +10,7 @@
           mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 7a49954..81559a7 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -9,11 +9,13 @@
           mvn-profile: 'docker'
           mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker  -Dmaven.test.skip=true'

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 76ee7af..32ebcf7 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -9,11 +9,13 @@
           mvn-profile: 'docker'
           mvn-params: "-P docker"
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker  -Dmaven.test.skip=true'

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index f6843f6..d7951ee 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -9,11 +9,13 @@
           mvn-params: '-P docker'
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 9831f14..e47a33c 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -9,11 +9,13 @@
           mvn-params: '-P docker'
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 092b6ab..760014a 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -9,11 +9,13 @@
           mvn-params: '-P docker'
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 3df4a95..057e712 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 0d2e581..4d75461 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -9,11 +9,13 @@
           mvn-params: '-P docker'
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'

diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index 7fc8c4e..77a9240 100644 (file)
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -10,7 +10,7 @@
     project-name: 'sdc-onap-ui-angular'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'sdc/onap-ui-angular'
     branch: 'master'
 

diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index e5d262b..4770759 100644 (file)
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -4,7 +4,7 @@
     project-name: 'sdc-onap-ui-common'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'sdc/onap-ui-common'
     branch: 'master'
 

diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 88edc50..4e05756 100644 (file)
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -14,7 +14,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -67,6 +67,6 @@
     project-name: sdc-sdc-be-common
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: sdc/sdc-be-common
     branch: master

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index dea96a1..f393f22 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -14,7 +14,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -93,6 +93,6 @@
     project-name: sdc-sdc-distribution-client
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: sdc/sdc-distribution-client
     branch: master

diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml
index 9877904..d928a19 100644 (file)
--- a/jjb/sdc/sdc-sdc-helm-validator.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator.yaml
@@ -9,7 +9,7 @@
     name: sdc-sdc-helm-validator-info
     project: sdc/sdc-helm-validator
     project-name: sdc-sdc-helm-validator
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -23,7 +23,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-goals: 'clean deploy'
       - gerrit-maven-docker-stage:

diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 4b77468..d2d07da 100644 (file)
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -4,7 +4,7 @@
     project-name: 'sdc-sdc-pubsub'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'sdc/sdc-pubsub'
     branch: 'master'
 

diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 5b566b3..d9387f4 100644 (file)
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -15,7 +15,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -72,7 +72,7 @@
     project-name: sdc-sdc-tosca
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: sdc/sdc-tosca
     branch: master
     java-version: openjdk11

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 68a03fc..de01ff3 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -15,7 +15,7 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           sbom-generator: true
@@ -82,7 +82,7 @@
     project-name: sdc-sdc-workflow-designer
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: sdc/sdc-workflow-designer
     branch: master
     java-version: openjdk11

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 2a330ed..a8b578f 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -50,7 +50,7 @@
           build-timeout: 90
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-version: 'mvn36'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
@@ -126,6 +126,6 @@
     project-name: sdc
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: sdc
     branch: master

diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml
index 663656b..84ace63 100644 (file)
--- a/jjb/so/so-adapters-so-cnf-adapter.yaml
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@ -9,7 +9,7 @@
     name: so-adapters-so-cnf-adapter-info
     project: so/adapters/so-cnf-adapter
     project-name: so-adapters-so-cnf-adapter
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -20,10 +20,12 @@
       - '{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'

diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index f1578f2..37ffeac 100644 (file)
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -20,10 +20,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           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'

diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
index f90c894..db9f91d 100644 (file)
--- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@ -20,10 +20,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           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'

diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index 6e51b8b..7a45cd9 100644 (file)
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -20,10 +20,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           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'

diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
index c59c8ba..2f5ba19 100644 (file)
--- a/jjb/so/so-adapters-so-oof-adapter.yaml
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@ -20,10 +20,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           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'

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index c6f2e8a..2f5c9b0 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
index 810b739..f33d945 100644 (file)
--- a/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -20,10 +20,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           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'

diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index 40796c8..1ce164f 100644 (file)
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -20,10 +20,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           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'

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 7f3c1aa..3ded1b5 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -13,10 +13,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           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'

diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
index 92cc787..0e86992 100644 (file)
--- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml
+++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
@@ -14,10 +14,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml
index ef52d2c..cb2c810 100644 (file)
--- a/jjb/usecaseui/usecase-ui-nlp.yaml
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@ -14,6 +14,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 86dfa30..3ff14dd 100644 (file)
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -14,6 +14,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 518f73e..4f39952 100644 (file)
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -19,6 +19,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 4fc3df1..827e072 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -21,6 +21,7 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 5df66c4..9044300 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -15,6 +15,7 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 54509ea..4773938 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -16,6 +16,7 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 258ae31..c9c9b4c 100644 (file)
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -12,6 +12,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 5d975c4..8a6505b 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -16,6 +16,7 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index e779697..ea4177a 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -16,6 +16,7 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 24f98c1..425d489 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -11,6 +11,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 1b2dedd..25a7b49 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -6,6 +6,7 @@
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
     - gerrit-maven-stage:
+        sbom-generator: true
         sign-artifacts: true
         build-node: centos8-docker-4c-4g
         maven-versions-plugin: true

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index b10c146..e04e730 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -6,11 +6,13 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: centos8-docker-8c-8g
+          sbom-generator: true
           maven-versions-plugin: true
           mvn-goals: 'clean package -Pdocker'
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 54cee4a..c34c2df 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -6,6 +6,7 @@
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
     - gerrit-maven-stage:
+        sbom-generator: true
         sign-artifacts: true
         build-node: centos8-docker-4c-4g
         maven-versions-plugin: true

diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index 7173e98..c5ce8a8 100644 (file)
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -8,7 +8,7 @@
   vars:
     kubectl_version: 1.23.8
     helm3_8_version: 3.8.2
-    chartmuseum_version: 0.12.0
+    chartmuseum_version: 0.15.0
 
   tasks:
     - name: 'Install kubectl {{kubectl_version}}'
@@ -54,11 +54,22 @@
 
     - name: 'Install ChartMuseum {{chartmuseum_version}}'
       block:
-        - name: 'Fetch bin for ChartMuseum'
+        - name: 'Create directory /tmp/chartmuseum'
+          file:
+            path: /tmp/chartmuseum
+            state: directory
+        - name: 'Fetch tar.gz for chartmuseum'
           get_url:
-            url: "https://s3.amazonaws.com/chartmuseum/release/v{{ chartmuseum_version }}/bin/linux/amd64/chartmuseum"
-            dest: /usr/local/bin/chartmuseum
-            mode: "0755"
+            url: "https://get.helm.sh/chartmuseum-v{{chartmuseum_version}}-linux-amd64.tar.gz"
+            dest: /tmp/chartmuseum
+        - name: 'Unarchive chartmuseum'
+          unarchive:
+            src: "/tmp/chartmuseum/chartmuseum-v{{chartmuseum_version}}-linux-amd64.tar.gz"
+            dest: /tmp/chartmuseum
+            remote_src: true
+          become: yes
+        - name: 'Move chartmuseum bin to /usr/local/bin and set as executable'
+          command: 'mv /tmp/chartmuseum/linux-amd64/chartmuseum /usr/local/bin/chartmuseum'
           become: yes
         - name: 'Check ChartMuseum {{chartmuseum_version}}'
           command: 'which chartmuseum'

diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index 6554fb6..c25a564 100644 (file)
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -41,9 +41,7 @@
   "provisioners": [
     {
       "type": "shell",
-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
@@ -52,6 +50,8 @@
     },
     {
       "type": "ansible",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "playbook_file": "provision/memcached.yaml",
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",