Merge "Chore: Turn on SBOM for USECASEUI"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Mon, 3 Apr 2023 16:53:04 +0000 (16:53 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 3 Apr 2023 16:53:04 +0000 (16:53 +0000)
181 files changed:
INFO.yaml
global-jjb
jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/centos8-docker-2c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml [new file with mode: 0644]
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-graphadmin.yaml
jjb/aai/aai-graphgraph.yaml
jjb/aai/aai-logging-service.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-rest-client.yaml
jjb/aai/aai-schema-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-traversal.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/ccsdk-csit.yaml
jjb/ccsdk/ccsdk-oran.yaml
jjb/ccsdk/cds.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/odl-legacy.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/sli.yaml
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/ci-management/ci-management.yaml
jjb/cli/cli.yaml
jjb/cps/cps-cps-tbdmt.yaml
jjb/cps/cps-cps-temporal.yaml
jjb/cps/cps-ncmp-dmi-plugin.yaml
jjb/cps/cps.yaml
jjb/dcaegen2/dcaegen2-analytics-flink.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-analytics.yaml
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml [deleted file]
jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml [deleted file]
jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml [deleted file]
jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml [deleted file]
jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml [deleted file]
jjb/demo/demo.yaml
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-kafka-client.yaml
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/doc/rules.yaml [new file with mode: 0644]
jjb/externalapi/externalapi-nbi.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/integration/docker/integration-docker-onap-java11.yaml
jjb/integration/include-raw-integration-install-robotframework-py3.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-python-onapsdk.yaml
jjb/integration/integration-templates.yaml
jjb/integration/prepare-csit.sh
jjb/integration/run-csit.sh
jjb/integration/simulators/integration-core-nssmf-simulator.yaml
jjb/integration/simulators/integration-onap-components-simulators.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-pnf-simulator.yaml
jjb/integration/simulators/integration-ran-simulator.yaml
jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
jjb/integration/xtesting/integration-xtesting.yaml
jjb/lf-infra-sandbox-3.yaml
jjb/modeling/modeling-etsicatalog.yaml
jjb/modeling/modeling-modelspec.yaml
jjb/msb/msb-apigateway.yaml
jjb/msb/msb-discovery.yaml
jjb/msb/msb-java-sdk.yaml
jjb/msb/msb-swagger-sdk.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-framework.yaml
jjb/multicloud/multicloud-info.yaml
jjb/multicloud/multicloud-openstack-vmware-java.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/music/music-distributed-kv-store.yaml
jjb/music/music-jar.yaml
jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml
jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
jjb/oom-utils/oom-utils.yaml
jjb/oom/offline-installer.yaml
jjb/oom/oom-consul.yaml
jjb/oom/oom-oneclick-config.yaml
jjb/oom/oom-readiness.yaml
jjb/oom/oom-registrator.yaml
jjb/oparent/oparent.yaml
jjb/optf/optf-has.yaml
jjb/optf/optf-osdf.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-clamp.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-csit-jobs.yaml
jjb/policy/policy-csit.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-docker-base-common.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-gui.yaml
jjb/policy/policy-k8s-csit.yaml [new file with mode: 0644]
jjb/policy/policy-models.yaml
jjb/policy/policy-pap.yaml
jjb/policy/policy-parent.yaml
jjb/policy/policy-xacml-pdp.yaml
jjb/portal-ng/portal-ng-history.yaml [new file with mode: 0644]
jjb/portal-ng/portal-ng-ui.yaml [new file with mode: 0644]
jjb/portal-ng/portal-ng.yaml [new file with mode: 0644]
jjb/relman/relman.yaml
jjb/rtdv3/rtdv3.yaml
jjb/sdc/sdc-sdc-docker-base.yaml [deleted file]
jjb/sdc/sdc-sdc-helm-validator.yaml
jjb/sdc/sdc-sdc-workflow-designer.yaml
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-csit.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/so/so-adapters-so-cnf-adapter.yaml
jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
jjb/so/so-adapters-so-nssmf-adapter.yaml
jjb/so/so-adapters-so-oof-adapter.yaml
jjb/so/so-csit.yaml
jjb/so/so-libs.yaml
jjb/so/so-so-admin-cockpit.yaml
jjb/so/so-so-etsi-nfvo.yaml
jjb/so/so.yaml
jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
jjb/testsuite/robot-utils/testsuite-robot-utils.yaml
jjb/testsuite/testsuite-cds-mock-odl.yaml
jjb/testsuite/testsuite-cds-mock-server.yaml
jjb/testsuite/testsuite-cds-mock-ssh.yaml
jjb/testsuite/testsuite-cds.yaml
jjb/testsuite/testsuite-oom.yaml
jjb/testsuite/testsuite.yaml
jjb/usecaseui/usecase-ui-intent-analysis.yaml
jjb/usecaseui/usecase-ui-nlp.yaml
jjb/usecaseui/usecase-ui-server.yaml
jjb/usecaseui/usecase-ui.yaml
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
jjb/vfc/vfc-gvnfm-vnfres-java.yaml
jjb/vfc/vfc-nfvo-db.yaml
jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
jjb/vnfrqts/vnfrqts-epics.yaml
jjb/vnfrqts/vnfrqts-guidelines.yaml
jjb/vnfrqts/vnfrqts-requirements.yaml
jjb/vnfrqts/vnfrqts-testcases.yaml
jjb/vnfrqts/vnfrqts-usecases.yaml
jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
jjb/vnfsdk/vnfsdk-functest.yaml
jjb/vnfsdk/vnfsdk-lctest.yaml
jjb/vnfsdk/vnfsdk-model.yaml
jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
jjb/vvp/vvp-documentation.yaml
jjb/vvp/vvp-em.yaml
jjb/vvp/vvp-oom.yaml
jjb/vvp/vvp-regression.yaml
packer/provision/helm.yaml
packer/templates/helm.json
packer/templates/memcached.json
packer/templates/redis.json

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'
index 14fb8af..fd801fd 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 14fb8afebd969c5b3febddded00b72ba7c6e39f8
+Subproject commit fd801fd5832b6f8538960e0ddb5fd98d71255b8d
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg
new file mode 100644 (file)
index 0000000..6a7f3dd
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220919-201912.261
+LABELS=centos7-docker-2c-8g
+HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-2c-8g.cfg
new file mode 100644 (file)
index 0000000..9e8361f
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297
+LABELS=centos8-docker-2c-8g
+HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-4c-4g.cfg
new file mode 100644 (file)
index 0000000..d7d096c
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297
+LABELS=centos8-docker-4c-4g
+HARDWARE_ID=v3-standard-4
index 6df78aa..bebde4b 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230131-200840.321
+IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230215-011800.297
 LABELS=centos8-docker-8c-8g
 HARDWARE_ID=v3-standard-8
index 8419cd9..fd98ad0 100644 (file)
@@ -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
index a7eab68..a55f55f 100644 (file)
@@ -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/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml
new file mode 100644 (file)
index 0000000..f294117
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "portal-ng-history"
+comment: "portal-ng-history"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..8f92057
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..4c5895e
--- /dev/null
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - serverId: "ecomp-snapshots"
+    credentialsId: "portal-ng-history"
+  - serverId: "ecomp-site"
+    credentialsId: "portal-ng-history"
+  - serverId: "ecomp-staging"
+    credentialsId: "portal-ng-history"
+  - serverId: "nexus3.onap.org:10001"
+    credentialsId: "portal-ng-history"
+  - serverId: "nexus3.onap.org:10002"
+    credentialsId: "portal-ng-history"
+  - serverId: "nexus3.onap.org:10003"
+    credentialsId: "portal-ng-history"
+  - serverId: "nexus3.onap.org:10004"
+    credentialsId: "portal-ng-history"
+  - serverId: "docker.io"
+    credentialsId: "onap_dockerhub_creds"
\ No newline at end of file
index bca81a1..2e8eb00 100644 (file)
       - '{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'
index a184d51..2905fdf 100644 (file)
           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'
index 0f938b4..2fd4f28 100644 (file)
       - '{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'
index 1e051ea..bac59be 100644 (file)
       - '{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'
index 87f607d..cd37af3 100644 (file)
@@ -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':
index d86b6db..89925a5 100644 (file)
           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'
index 5a4f5e8..474dc7e 100644 (file)
       - 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'
index e4a7cea..2bb0127 100644 (file)
@@ -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':
index 4492587..738ecc5 100644 (file)
       - '{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'
index 6e39797..6aedc77 100644 (file)
           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'
index 1e2fc21..68b058d 100644 (file)
       - 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'
index 40d57d0..423e4af 100644 (file)
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
 
       - gerrit-maven-docker-stage:
           container-public-registry: 'nexus3.onap.org:10001'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     project: 'ccsdk/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -69,7 +68,7 @@
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: ccsdk-apps-clm
@@ -84,6 +83,7 @@
     java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: ubuntu1804-builder-4c-4g
 
 #- project:
index bfebf74..11c5374 100644 (file)
@@ -15,8 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
       - 'kohn':
           branch: 'kohn'
     mvn-settings: 'ccsdk-distribution-settings'
     project: 'ccsdk/oran'
     stream:
       - 'master':
+          java-version: openjdk17
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
       - 'kohn':
+          java-version: openjdk11
           branch: 'kohn'
     mvn-settings: 'ccsdk-oran-settings'
     mvn-version: 'mvn38'
index 6b49939..3817186 100644 (file)
@@ -9,12 +9,12 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           mvn-opts: '-Ddocker.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos8-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
     project: 'ccsdk/oran'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
     files: '**'
@@ -56,7 +55,7 @@
     java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
-    mvn-opts: '-Ddocker.skip=true'
+    mvn-opts: '-Ddocker.skip=true --add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-builder-4c-4g
 
 - project:
@@ -87,6 +86,6 @@
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     mvn-opts: '-Ddocker.skip=true'
     mvn-params: '-f a1-policy-management'
index a0447db..aaaef80 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: ccsdk-cds-java11
+    name: ccsdk-cds-java17
     project-name: 'ccsdk-cds'
     jobs:
       - gerrit-maven-verify:
@@ -9,11 +9,11 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk11
+          java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -41,7 +40,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: ccsdk-cds-clm
     stream:
       - 'master':
           branch: 'master'
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-builder-4c-4g
 
 - project:
index 26eb0b6..c409ef0 100644 (file)
@@ -9,12 +9,12 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           maven-versions-plugin: true
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos8-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk11
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
@@ -75,6 +74,7 @@
     java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-docker-8c-8g
 
 
index 4a2ba1d..60d6f67 100644 (file)
@@ -9,23 +9,24 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     project: 'ccsdk/features'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
+          mvn-opts: '-Xmx3072m'
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
+          mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -35,7 +36,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     build-node: centos8-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -57,7 +57,7 @@
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx3072m'
 
 - project:
     name: ccsdk-features-clm
@@ -72,7 +72,7 @@
     java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-builder-4c-4g
 
 - project:
index 21036bc..ea8331b 100644 (file)
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos8-docker-8c-8g
 
@@ -58,7 +58,7 @@
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-odl-legacy-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: ccsdk-odl-legacy-clm
@@ -73,6 +73,7 @@
     java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-odl-legacy-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-builder-4c-4g
 
 
index 2a8cc5e..eedabbe 100644 (file)
@@ -9,13 +9,13 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -23,6 +23,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk17
           jobs:
             - gerrit-maven-verify:
                 mvn-params: '-Drevision=3.0.0-SNAPSHOT'
                 mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0'
             - '{project-name}-gerrit-release-jobs':
                 mvn-params: '-Drevision=3.0.0'
-      - 'jakarta':
-          branch: 'jakarta'
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -60,6 +59,7 @@
     java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-builder-4c-4g
 
 - project:
index 51407c2..c9efc90 100644 (file)
@@ -9,23 +9,22 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     project: 'ccsdk/sli'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -56,7 +55,7 @@
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: ccsdk-sli-clm
@@ -71,6 +70,7 @@
     java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-builder-4c-4g
 
 - project:
index 74c9f96..a589c61 100644 (file)
@@ -10,7 +10,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     build-timeout: 90
 
     platforms:
@@ -32,7 +32,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     build-timeout: 90
 
     platforms:
@@ -56,7 +56,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     build-timeout: 90
 
     platforms:
@@ -76,7 +76,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
 
     platforms:
       - centos-7
@@ -95,7 +95,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
 
     platforms:
       - ubuntu-18.04
index f6000c7..9a64462 100644 (file)
@@ -10,7 +10,7 @@
     project-name: ci-management
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: ci-management
     branch: master
 
@@ -29,7 +29,7 @@
     archive-artifacts: '**/*.log'
     branch: 'master'
     build-timeout: '60'
-    build-node: 'centos7-builder-2c-1g'
+    build-node: 'centos8-builder-2c-1g'
     jjb-version: 4.1.0
     # configure the gerrit-jjb-verify job
     build-node-label-check: true
@@ -42,7 +42,7 @@
 
     project: ci-management
     project-name: ci-management
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
 
     jenkins-urls: >
         https://jenkins.onap.org
@@ -60,7 +60,7 @@
     archive-artifacts: '**/*.log'
     jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     # update-cloud-image: true
     build-timeout: 10
 
index 8733f3d..bec3795 100644 (file)
       - '{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
       - gerrit-maven-docker-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -93,7 +93,7 @@
     project-name: cli
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: cli
     branch: master
 
index 1743613..60b4758 100644 (file)
@@ -9,7 +9,7 @@
     name: cps-tbdmt-info
     project: cps/cps-tbdmt
     project-name: cps-cps-tbdmt
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -25,7 +25,7 @@
       project-name: cps-cps-tbdmt
       branch: 'master'
       mvn-settings: 'cps-cps-tbdmt-settings'
-      build-node: centos7-docker-8c-8g
+      build-node: centos8-docker-8c-8g
 
 - project:
       name: cps-tbdmt
           - 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
           - gerrit-maven-docker-stage:
-                build-node: centos7-docker-8c-8g
+                build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
                 mvn-params: '-P docker'
                 container-public-registry: 'nexus3.onap.org:10001'
@@ -58,7 +58,7 @@
       mvn-settings: 'cps-cps-tbdmt-settings'
       files: '**'
       archive-artifacts: ''
-      build-node: centos7-docker-8c-8g
+      build-node: centos8-docker-8c-8g
 
 - project:
       name: cps-tbdmt-sonar
@@ -72,7 +72,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: 'cps/cps-tbdmt'
       project-name: 'cps-cps-tbdmt'
       branch: 'master'
@@ -92,7 +92,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-qualitygate-wait: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps/cps-tbdmt'
     project-name: 'cps-cps-tbdmt'
     branch: 'master'
index 75e9313..f2115e2 100644 (file)
@@ -9,7 +9,7 @@
     name: cps-cps-temporal-info
     project: cps/cps-temporal
     project-name: cps-cps-temporal
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -29,7 +29,7 @@
           container-public-registry: nexus3.onap.org:10001
           container-snapshot-registry: nexus3.onap.org:10003
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: -Pdocker
           container-public-registry: nexus3.onap.org:10001
@@ -48,7 +48,7 @@
     mvn-settings: cps-cps-temporal-settings
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-cps-temporal-clm
@@ -62,7 +62,7 @@
     project-name: cps-cps-temporal
     branch: master
     mvn-settings: cps-cps-temporal-settings
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-cps-temporal-sonar
@@ -76,7 +76,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: 'cps/cps-temporal'
     project-name: 'cps-cps-temporal'
     branch: 'master'
@@ -96,7 +96,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-qualitygate-wait: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps/cps-temporal'
     project-name: 'cps-cps-temporal'
     branch: 'master'
index 7ec0f75..61a4e2e 100644 (file)
@@ -9,7 +9,7 @@
     name: cps-ncmp-dmi-plugin-info
     project: cps/ncmp-dmi-plugin
     project-name: cps-ncmp-dmi-plugin
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
       - 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:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: -Pdocker
           container-public-registry: nexus3.onap.org:10001
@@ -51,7 +51,7 @@
     mvn-settings: cps-ncmp-dmi-plugin-settings
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-ncmp-dmi-plugin-clm
@@ -65,7 +65,7 @@
     project-name: cps-ncmp-dmi-plugin
     branch: master
     mvn-settings: cps-ncmp-dmi-plugin-settings
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-ncmp-dmi-plugin-sonar
@@ -79,7 +79,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: 'cps/ncmp-dmi-plugin'
     project-name: 'cps-ncmp-dmi-plugin'
     branch: 'master'
@@ -99,7 +99,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-qualitygate-wait: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps/ncmp-dmi-plugin'
     project-name: 'cps-ncmp-dmi-plugin'
     branch: 'master'
index 9147565..a56a50e 100644 (file)
@@ -9,7 +9,7 @@
     name: cps-info
     project: cps
     project-name: cps
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -25,7 +25,7 @@
       project-name: 'cps'
       branch: 'master'
       mvn-settings: 'cps-settings'
-      build-node: centos7-docker-8c-8g
+      build-node: centos8-docker-8c-8g
 
 - project:
     name: cps
           mvn-params: "-P cps-ncmp-docker"
       - 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:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P cps-ncmp-docker'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -64,7 +64,7 @@
     mvn-settings: 'cps-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-sonar
@@ -78,7 +78,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: 'cps'
     project-name: 'cps'
     branch: 'master'
@@ -98,7 +98,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-qualitygate-wait: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'cps'
     project-name: 'cps'
     branch: 'master'
index 9d76d41..6b9321c 100644 (file)
@@ -4,6 +4,6 @@
     project-name: dcaegen2-analytics-flink
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/analytics/flink
     branch: master
index c4d6126..68d39e9 100644 (file)
@@ -17,7 +17,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: 'dcaegen2/analytics/tca-gen2'
     # job template iterators
@@ -81,6 +81,6 @@
     project-name: dcaegen2-analytics-tca-gen2
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/analytics/tca-gen2
     branch: master
index 80ac689..aa66495 100644 (file)
@@ -4,6 +4,6 @@
     project-name: dcaegen2-analytics
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/analytics
     branch: master
index f2f6621..85252e0 100644 (file)
@@ -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-collectors-datafile
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/collectors/datafile
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
deleted file mode 100644 (file)
index 8b94b21..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
----
-- job-group:
-    # This job group contains all the jobs that should be deployed for
-    # a subproject of dcaegen2/platform that builds a Docker image from
-    # Python code.
-    #
-    # Required parameters:
-    #  build-node: The node to run build on.
-    #  mvn-settings: Maven settings.xml file containing credentials to use.
-    #  project-name: The job name prefix
-    #  src-dir: The subdirectory of the repository containing subproject code
-    #  stream: The stream to build
-    #  branch: The branch to build
-    #
-    #  Note: Multiple subprojects can be built with a single JJB project
-    #  by specifying the value of project-name as a list.
-    #  Similarly, multiple streams can be built with a single JJB project
-    #  by specifying the value of the stream as a list.
-    #  For example:
-    #    project-name:
-    #      - subproject-name1:
-    #          src-dir: subproject-dir1
-    #          docker-name: onap/org.onap.dcaegen2.platform.something.name1
-    #      - subproject-name2:
-    #          src-dir: subproject-dir2
-    #          docker-name: onap/org.onap.dcaegen2.platform.something.name2
-    #      - subproject-name3:
-    #          src-dir: subproject-dir3
-    #          docker-name: onap/org.onap.dcaegen2.platform.something.name3
-    #    stream:
-    #      - master:
-    #          branch: master
-    #      - release1:
-    #          branch: release1.0
-    #    jobs:
-    #      - dcaegen2-docker-python-jobs
-
-    name: '{project-name}-dcaegen2-docker-python-jobs'
-    id: dcaegen2-docker-python-jobs
-    container-tag-method: latest
-    docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh
-    nexus-iq-namespace: 'onap-'
-    tox-dir: '{src-dir}'
-    docker-root: '{src-dir}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{src-dir}/.*'
-    jobs:
-      - gerrit-tox-verify:
-          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-          stream: all
-          branch: '*'
-      - gerrit-docker-verify
-      - gerrit-docker-merge:
-          post_docker_build_script: |
-              #!/bin/bash
-              set -uex -o pipefail
-              DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
-              DNAME={container-snapshot-registry}/{docker-name}
-              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
-              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest
-              docker push $DNAME:$DOCKER_IMAGE_TAG2
-              docker push $DNAME:latest
-
-      - gerrit-maven-clm:
-          mvn-params: '-f {src-dir}'
-          stream: master
-          branch: master
-      - gerrit-tox-sonar:
-          # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
-          sonar-mvn-goal: '-f {src-dir} sonar:sonar'
-          cron: '@daily'
-          stream: master
-          branch: master
-          sonarcloud: true
-          sonarcloud-project-organization: '{sonarcloud_project_organization}'
-          sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-
-
-- project:
-    name: dcaegen2-platform-docker-python-subprojects
-    project: dcaegen2/platform
-    mvn-settings: dcaegen2-platform-settings
-    build-node: ubuntu1804-docker-8c-8g
-    project-name:
-      - dcaegen2-platform-adapter-acumos:
-          src-dir: adapter/acumos
-          docker-name: onap/org.onap.dcaegen2.platform.adapter.acumos
-      - dcaegen2-platform-mod-distributorapi:
-          src-dir: mod/distributorapi
-          docker-name: onap/org.onap.dcaegen2.platform.mod.distributorapi
-      - dcaegen2-platform-mod-onboardingapi:
-          src-dir: mod/onboardingapi
-          docker-name: onap/org.onap.dcaegen2.platform.mod.onboardingapi
-    stream:
-      - master:
-          branch: master
-      - kohn:
-          branch: kohn
-
-    views:
-      - project-view:
-          project-name: dcaegen2-platform-adapter
-      - project-view:
-          project-name: dcaegen2-platform-mod
-    jobs:
-      - dcaegen2-docker-python-jobs
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
deleted file mode 100644 (file)
index 0920ead..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod-designtool
-    project-name: dcaegen2-platform-mod-designtool
-    # git repo
-    project: dcaegen2/platform
-    jobs:
-      - gerrit-maven-verify:
-          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-      - gerrit-maven-merge
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          sbom-generator: true
-          sbom-path: 'mod/designtool/'
-          maven-versions-plugin: true
-          version-properties-file: 'mod/designtool/version.properties'
-          mvn-pom: 'mod/designtool/pom.xml'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: dcaegen2-platform-settings
-    container-public-registry: 'nexus3.onap.org:10001'
-    container-staging-registry: 'nexus3.onap.org:10003'
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: 'mod/designtool/**'
-    mvn-goals: 'clean package install'
-    mvn-params: '-f mod/designtool/pom.xml'
-    pattern: 'mod/designtool/**'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-
-- project:
-    name: dcaegen2-platform-mod-designtool-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform
-    build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-platform-mod-designtool'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
deleted file mode 100644 (file)
index 4117b81..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod-genprocessor
-    project-name: dcaegen2-platform-mod-genprocessor
-    # git repo
-    project: dcaegen2/platform
-    jobs:
-      - gerrit-maven-verify:
-          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-      - gerrit-maven-merge
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          sbom-generator: true
-          sbom-path: 'mod/runtimeapi/'
-          maven-versions-plugin: true
-          version-properties-file: 'mod/genprocessor/version.properties'
-          mvn-pom: 'mod/genprocessor/pom.xml'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: dcaegen2-platform-settings
-    container-public-registry: 'nexus3.onap.org:10001'
-    container-staging-registry: 'nexus3.onap.org:10003'
-    mvn-goals: 'clean package install'
-    mvn-params: '-f mod/genprocessor/pom.xml'
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: 'mod/genprocessor/**'
-    pattern: 'mod/genprocessor/**'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dcaegen2-platform-mod-genprocessor-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-mod-genprocessor'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-    mvn-params: '-f mod/genprocessor/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-mod-genprocessor-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: dcaegen2-platform-mod-genprocessor-clm
-    mvn-params: '-f mod/genprocessor/pom.xml'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
deleted file mode 100644 (file)
index dd3bd28..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod-runtimeapi
-    project-name: dcaegen2-platform-mod-runtimeapi
-    # git repo
-    project: dcaegen2/platform
-    jobs:
-      - gerrit-maven-verify:
-          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-      - gerrit-maven-merge
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          sbom-generator: true
-          sbom-path: 'mod/runtimeapi/'
-          maven-versions-plugin: true
-          version-properties-file: 'mod/runtimeapi/version.properties'
-          mvn-pom: 'mod/runtimeapi/pom.xml'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    java-version: openjdk11
-    mvn-settings: dcaegen2-platform-settings
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: 'mod/runtimeapi/**'
-    container-public-registry: 'nexus3.onap.org:10001'
-    container-staging-registry: 'nexus3.onap.org:10003'
-    mvn-goals: 'clean package install'
-    mvn-params: '-f mod/runtimeapi/pom.xml'
-    pattern: 'mod/runtimeapi/**'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dcaegen2-platform-mod-runtimeapi-sonar
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-mod-runtimeapi'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-    mvn-params: '-f mod/runtimeapi/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-mod-runtimeapi-clm
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: dcaegen2-platform-mod-runtimeapi-clm
-    mvn-params: '-f mod/runtimeapi/pom.xml'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
deleted file mode 100644 (file)
index 760d95e..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod2-helm-generator
-    project-name: dcaegen2-platform-mod2-helm-generator
-    # git repo
-    project: dcaegen2/platform
-    jobs:
-      - gerrit-maven-verify:
-          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
-      - gerrit-maven-merge
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          sbom-generator: true
-          sbom-path: 'mod2/helm-generator/'
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-          version-properties-file: 'mod2/helm-generator/version.properties'
-          mvn-pom: 'mod2/helm-generator/pom.xml'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    java-version: openjdk11
-    mvn-settings: dcaegen2-platform-settings
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: 'mod2/helm-generator/**'
-    container-public-registry: 'nexus3.onap.org:10001'
-    container-staging-registry: 'nexus3.onap.org:10003'
-    mvn-params: '-f mod2/helm-generator/pom.xml'
-    pattern: 'mod2/helm-generator/**'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    maven-version: 'mvn35'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dcaegen2-platform-mod2-helm-generator-sonar
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-mod2-helm-generator'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-    mvn-params: '-f mod2/helm-generator/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-mod2-helm-generator-clm
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: dcaegen2-platform-mod2-helm-generator
-    mvn-params: '-f mod2/helm-generator/pom.xml'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
index 93adf4d..dfe1fe9 100644 (file)
@@ -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
 
index e76024e..e2cc2f2 100644 (file)
@@ -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
index 239263a..d9ecb98 100644 (file)
@@ -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
index 298fb3a..e933bcc 100644 (file)
@@ -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
index 4dc1ad1..6f70c58 100644 (file)
@@ -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
index aaa0b8e..30db7f5 100644 (file)
@@ -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/rules.yaml b/jjb/doc/rules.yaml
new file mode 100644 (file)
index 0000000..7024490
--- /dev/null
@@ -0,0 +1,136 @@
+- scm:
+    name: doc-scm
+    scm:
+      - git:
+          url: 'https://gerrit.onap.org/r/{project}'
+          refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
+          branches:
+            - '{ref}'
+
+- trigger:
+    name: doc-rules-patchset-created
+    triggers:
+      - gerrit:
+          trigger-on:
+            - patchset-created-event
+            - comment-added-contains-event:
+                comment-contains-value: recheck
+            - comment-added-contains-event:
+                comment-contains-value: reverify
+          server-name: 'Primary'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '**'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/*'
+                - branch-compare-type: 'ANT'
+                  branch-pattern: 'refs/tags/**'
+
+- builder:
+    name: doc-rules
+    builders:
+      - shell: |
+          #!/bin/bash
+          . /lib/lsb/init-functions || exit 0
+          exitstatus="0"
+          warning="0"
+          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."
+          if [ ! -d docs ] ; then
+            log_success_msg "Directory docs not found. Skipping further checks."
+            exit 0
+          fi
+          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
+          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
+          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."
+            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' not used 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
+            unset sphinxbuild_detected
+            unset linenumber
+          fi
+          unset filename
+          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."
+            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
+          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
+            log_failure_msg "Please fix the detected documentation problem(s)!"
+          fi
+          exit $exitstatus
+
+- job-template:
+    name: doc-rules
+    node: ubuntu1804-docker-8c-8g
+    triggers:
+      - doc-rules-patchset-created
+    scm:
+      - doc-scm:
+          ref: $GERRIT_REFSPEC
+          project: $GERRIT_PROJECT
+    builders:
+      - doc-rules
+
+- project:
+    name: 'doc-rules'
+    jobs:
+      - 'doc-rules'
index 35ef4a2..5821aab 100644 (file)
@@ -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
index dada9ed..cb43d25 100644 (file)
@@ -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
index 6e5682b..b9a1d95 100644 (file)
@@ -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
index 385721e..1357f69 100644 (file)
@@ -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
index 4ad47ab..f290699 100644 (file)
@@ -1,17 +1,17 @@
 ---
 - project:
-    name: integration-docker-onap-java11-info
-    project-name: integration-docker-onap-java11
+    name: integration-docker-onap-java-info
+    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
 
 - project:
-      name: integration-docker-onap-java11-linters
+      name: integration-docker-onap-java-linters
       project: integration/docker/onap-java11
-      project-name: integration-docker-onap-java11
+      project-name: integration-docker-onap-java
       python-version: python3
       jobs:
           - integration-linters
@@ -37,8 +37,8 @@
                 branch: 'master'
 
 - project:
-    name: integration-docker-onap-java11-release
-    project-name: 'integration-docker-onap-java11'
+    name: integration-docker-onap-java-release
+    project-name: 'integration-docker-onap-java'
     project: 'integration/docker/onap-java11'
     mvn-settings: 'integration-settings'
     jobs:
           build-node: centos7-docker-8c-8g
 
 - project:
-    name: 'integration-docker-onap-java11-docker'
+    name: 'integration-docker-onap-java-docker'
     jobs:
-      - gerrit-docker-verify
-      - gerrit-docker-merge
-    project-name: 'integration-docker-onap-java11'
+      - gerrit-docker-verify:
+          project-name: 'integration-docker-onap-java11'
+          docker-name: 'onap/integration-java11'
+      - gerrit-docker-merge:
+          project-name: 'integration-docker-onap-java11'
+          docker-name: 'onap/integration-java11'
+      - gerrit-docker-verify:
+          project-name: 'integration-docker-onap-java17'
+          docker-name: 'onap/integration-java17'
+          docker-build-args: '--build-arg java_ver=onap-java17'
+      - gerrit-docker-merge:
+          project-name: 'integration-docker-onap-java17'
+          docker-name: 'onap/integration-java17'
+          docker-build-args: '--build-arg java_ver=onap-java17'
     project: 'integration/docker/onap-java11'
     stream:
       - 'master':
             branch: 'master'
             files: ''
-    docker-name: 'onap/integration-java11'
-    docker-build-args: '-f ./Dockerfile'
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
     build-node: ubuntu1804-docker-8c-8g
index 6d0b496..efeb0f7 100644 (file)
 ##############################################################################
 # vim: sw=4 ts=4 sts=4 et ft=sh :
 
-set -eu pipefail
+set -euxo pipefail
 
-# shellcheck disable=SC1090
-. ~/lf-env.sh
+echo "---> install-robotframework-py3.sh"
 
-# Create a virtual environment for robot tests and make sure setuptools & wheel
-# are up-to-date in addition to pip
-lf-activate-venv --python python3 --venv-file "${WORKSPACE}/.robot3_venv" \
-    setuptools \
-    wheel
+### Common variables
+
+REQUIRED_PYTHON="3.7.0"
+
+### Common functions
+
+# Allows for the comparison of two Python version strings
+ver_cmp()
+{
+    local IFS=.
+    # shellcheck disable=SC2206
+    local V1=($1) V2=($2) I
+    for ((I=0 ; I<${#V1[*]} || I<${#V2[*]} ; I++)) ; do
+        [[ ${V1[$I]:-0} -lt ${V2[$I]:-0} ]] && echo -1 && return
+        [[ ${V1[$I]:-0} -gt ${V2[$I]:-0} ]] && echo 1 && return
+    done
+    echo 0
+}
+# Checks if first version/string is greater than or equal to the second
+ver_ge()
+{
+    [[ ! $(ver_cmp "$1" "$2") -eq -1 ]]
+}
 
-# Save the virtual environment in ROBOT_VENV
-ROBOT3_VENV="$(cat "${WORKSPACE}/.robot3_venv")"
-echo ROBOT3_VENV="${ROBOT3_VENV}" >> "${WORKSPACE}/env.properties"
+### Main script entry point
 
-set -exu
+# Check for required Python versions and activate/warn appropriately
+# Use PYENV for selecting the latest python version, if available
+if [[ -d "/opt/pyenv" ]]; then
+    echo "Setup pyenv:"
+    export PYENV_ROOT="/opt/pyenv"
+    export PATH="$PYENV_ROOT/bin:$PATH"
+    pyenv versions
+    if command -v pyenv 1>/dev/null 2>&1; then
+        eval "$(pyenv init - --no-rehash)"
+        # Choose the latest numeric Python version from installed list
+        version=$(pyenv versions --bare | sed '/^[^0-9]/d' |\
+            sort -V | tail -n 1)
+        pyenv local "${version}"
+    fi
+fi
 
-echo "Installing Python Requirements"
+# Store the active/current Python3 version
+PYTHON_VERSION=$(python3 --version | awk '{print $2}')
+
+#  Check that the required minimum version has been met
+if ! (ver_ge "${PYTHON_VERSION}" "${REQUIRED_PYTHON}"); then
+    echo "Warning: possible Python version problem"
+    echo "Python ${PYTHON_VERSION} does not meet requirement: ${REQUIRED_PYTHON}"
+fi
+
+if (python3 -m robot.run --version > /dev/null 2>&1); then
+    echo "Working robot framework found; no installation necessary"
+    echo "Installed under Python version: ${PYTHON_VERSION}"
+    exit 0
+fi
+
+
+# Create a requirements file; keep it around for potential later use
+# Versions and dependencies below have been carefully tested for Python3
 cat << 'EOF' > "requirements.txt"
 paramiko
 six
@@ -79,6 +125,49 @@ PyVirtualDisplay
 odltools
 EOF
 
-python3 -m pip install -r requirements.txt
+
+if [[ -f ~/lf-env.sh ]]; then
+    echo "Installing robot-framework using LF common tooling"
+    # shellcheck disable=SC1090
+    source ~/lf-env.sh
+
+    # Create a virtual environment for robot tests and make sure setuptools & wheel
+    # are up-to-date in addition to pip
+    lf-activate-venv --python python3 --venv-file "${WORKSPACE}/.robot3_venv" \
+    setuptools \
+    pip \
+    wheel
+
+    # Install the robot framework and other dependencies
+    python3 -m pip install -r requirements.txt
+
+    # Save the virtual environment in ROBOT3_VENV
+    ROBOT3_VENV="$(cat "${WORKSPACE}/.robot3_venv")"
+
+else
+    echo "Installing robot-framework in a virtual environment"
+    if [[ -z "${WORKSPACE}" ]]; then
+        # Use a temporary folder location
+        WORKSPACE="/tmp"
+        ROBOT3_VENV=$(mktemp -d --suffix=-robot3_venv)
+    else
+        ROBOT3_VENV="${WORKSPACE}/.robot3_venv"
+    fi
+
+    # The --system-site-packages parameter allows us to pick up system level
+    # installed packages. This allows us to bake matplotlib which takes very long
+    # to install into the image.
+    python3 -m venv --system-site-packages "${ROBOT3_VENV}"
+    source "${ROBOT3_VENV}/bin/activate"
+
+    echo "Installing robot-framework using basic methods"
+    python3 -m pip install -r requirements.txt
+fi
+
+# Store the virtual environment location
+echo "ROBOT3_VENV=${ROBOT3_VENV}" >> "${WORKSPACE}/env.properties"
+
+# Display versioning/debugging output
+python3 --version
 python3 -m pip freeze
 python3 -m robot.run --version || :
index 7d831c6..920d5ed 100644 (file)
 - builder:
     name: integration-run-test
     builders:
-      - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
+      - shell: |
+          git clone https://gerrit.onap.org/r/ci-management /tmp/ci-management
+          cp /tmp/ci-management/jjb/integration/*csit.sh ${WORKSPACE}
+          ${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}
 
 - builder:
     name: integration-run-project-test
     builders:
       - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTOPTIONS}"
 
+
+- builder:
+      name: integration-run-project-k8s-test
+      builders:
+          - shell: "${WORKSPACE}/csit/run-k8s-csit.sh install ${TESTOPTIONS}"
+
 - builder:
     name: integration-autorelease-fix-relativepaths
     builders:
index e780058..0c7e6b4 100644 (file)
           tox-dir: '.'
           tox-envs: 'py39'
           pattern: '**/*.py'
-      - 'python3.10':
-          tox-dir: '.'
-          tox-envs: 'py310'
-          pattern: '**/*.py'
-      - 'python3.11':
-          tox-dir: '.'
-          tox-envs: 'py311'
-          pattern: '**/*.py'
+      # Disable due to https://jira.linuxfoundation.org/plugins/servlet/desk/portal/2/IT-25247
+      # - 'python3.10':
+      #     tox-dir: '.'
+      #     tox-envs: 'py310'
+      #     pattern: '**/*.py'
+      # - 'python3.11':
+      #     tox-dir: '.'
+      #     tox-envs: 'py311'
+      #     pattern: '**/*.py'
       - 'pylint':
           tox-dir: '.'
           tox-envs: 'pylint'
index 77be42b..34e3ed6 100644 (file)
@@ -57,7 +57,7 @@
     id: integration-linters
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos8-builder-2c-1g
     node: '{build-node}'
 
     parameters:
index 1052bff..dc732c6 100644 (file)
@@ -24,18 +24,48 @@ set -exo pipefail
 
 ROBOT_INSTALLER='include-raw-integration-install-robotframework-py3.sh'
 
-if !(which git > /dev/null 2>&1); then
-    echo "GIT binary not found current PATH"
-    echo $PATH; exit 1
+# Allows testing for root permissions
+REQ_USER=$(id -un)
+
+if ! (which git > /dev/null 2>&1); then
+    echo "GIT binary not found in current PATH"
+    # Add missing package to prevent script/job failures
+    if (grep Ubuntu /etc/os-release > /dev/null 2>&1) || \
+    (grep Debian /etc/os-release > /dev/null 2>&1); then
+        echo "Installing package dependency for Ubuntu/Debian"
+        if [[ "${REQ_USER}" == 'root' ]]; then
+            apt-get update
+            apt-get install -y git
+        else
+            sudo apt-get update
+            sudo apt-get install -y git
+        fi
+    elif (grep RedHat /etc/os-release > /dev/null 2>&1) || \
+    (grep CentOS /etc/os-release > /dev/null 2>&1); then
+        echo "Installing package dependency for CentOS/RedHat"
+        if [[ "${REQ_USER}" == 'root' ]]; then
+            yum install -y git
+        else
+            sudo yum install -y git
+        fi
+    else
+        echo "Warning: unmatched OS/distribution"
+        echo "Missing software will not be installed"
+    fi
 fi
 
-if [ -z "$WORKSPACE" ]; then
-    # shellcheck disable=SC2155
-    export WORKSPACE=`git rev-parse --show-toplevel`
+if [[ -z "${WORKSPACE}" ]]; then
+    if (git rev-parse --show-toplevel > /dev/null 2>&1); then
+        WORKSPACE=$(git rev-parse --show-toplevel)
+        export WORKSPACE
+    else
+        WORKSPACE=$(pwd)
+        export WORKSPACE
+    fi
 fi
 
 # shellcheck disable=SC2034
-TESTPLANDIR=${WORKSPACE}/${TESTPLAN}
+TESTPLANDIR="${WORKSPACE}/${TESTPLAN}"
 
 # Python version should match that used to setup
 #  robot-framework in other jobs/stages
@@ -56,22 +86,30 @@ fi
 
 # Assume that if ROBOT3_VENV is set, virtualenv
 #  with system site packages can be activated
-if [ -f ${WORKSPACE}/env.properties ]; then
-    source ${WORKSPACE}/env.properties
+if [[ -f "${WORKSPACE}/env.properties" ]]; then
+    source "${WORKSPACE}/env.properties"
+elif [[ -f /tmp/env.properties ]]; then
+    source /tmp/env.properties
 fi
-if [ -f ${ROBOT3_VENV}/bin/activate ]; then
-    source ${ROBOT3_VENV}/bin/activate
+
+if [[ -f "${ROBOT3_VENV}/bin/activate" ]]; then
+    source "${ROBOT3_VENV}/bin/activate"
 else
     # Robot framework was not found
-    #  clone ci-management repository and use install script
-    git clone "https://gerrit.onap.org/r/ci-management" \
+    #  Clone/update ci-management repository and invoke install script
+    if [[ ! -d /tmp/ci-management ]]; then
+        git clone "https://gerrit.onap.org/r/ci-management" \
         /tmp/ci-management
-    source /tmp/ci-management/jjb/integration/${ROBOT_INSTALLER}
+    else
+        git pull /tmp/ci-management
+    fi
+    # shellcheck disable=SC1090
+    source "/tmp/ci-management/jjb/integration/${ROBOT_INSTALLER}"
 fi
 
 # install eteutils
-mkdir -p ${ROBOT3_VENV}/src/onap
-rm -rf ${ROBOT3_VENV}/src/onap/testsuite
+mkdir -p "${ROBOT3_VENV}/src/onap"
+rm -rf "${ROBOT3_VENV}/src/onap/testsuite"
 # Source from the Nexus repository
 python3 -m pip install --upgrade \
     --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" \
index bd35ac4..4ee5d75 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# $1 project/functionality
-# $2 robot options
+# $1 project/functionality {TESTPLAN}
+# $2 robot options         {TESTOPTIONS}
 
 echo "---> run-csit.sh"
 
-WORKDIR=$(mktemp -d --suffix=-robot-workdir)
-
-# Python version should match that used to setup
-#  robot-framework in other jobs/stages
-# Use pyenv for selecting the python version
-if [[ -d "/opt/pyenv" ]]; then
-    echo "Setup pyenv:"
-    export PYENV_ROOT="/opt/pyenv"
-    export PATH="$PYENV_ROOT/bin:$PATH"
-    pyenv versions
-    if command -v pyenv 1>/dev/null 2>&1; then
-        eval "$(pyenv init - --no-rehash)"
-        # Choose the latest numeric Python version from installed list
-        version=$(pyenv versions --bare \
-            | sed '/^[^0-9]/d' | sort -V | tail -n 1)
-        pyenv local "${version}"
-    fi
-fi
-
 #
 # functions
 #
 
-# wrapper for sourcing a file
-function source_safely {
-    [ -z "$1" ] && return 1
-    relax_set
-    . "$1"
-    load_set
-}
-
 function on_exit {
     rc=$?
     if [[ ${WORKSPACE} ]]; then
@@ -134,6 +107,14 @@ function relax_set {
     set +o pipefail
 }
 
+# wrapper for sourcing a file
+function source_safely {
+    [ -z "$1" ] && return 1
+    relax_set
+    . "$1"
+    load_set
+}
+
 #
 # main
 #
@@ -175,10 +156,11 @@ source_safely "${WORKSPACE}/prepare-csit.sh"
 # Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
 source_safely "${ROBOT3_VENV}/bin/activate"
 
+WORKDIR=$(mktemp -d --suffix=-robot-workdir)
 cd "${WORKDIR}"
 
 # Add csit scripts to PATH
-export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT_VENV}/bin"
+export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT3_VENV}/bin"
 export SCRIPTS="${WORKSPACE}/scripts"
 export ROBOT_VARIABLES=
 
@@ -199,23 +181,23 @@ docker_stats | tee "$WORKSPACE/archives/$TESTPLAN/_sysinfo-1-after-setup.txt"
 # Run test plan
 cd "$WORKDIR"
 echo "Reading the testplan:"
-cat "${TESTPLANDIR}/testplan.txt" | egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' | sed "s|^|${WORKSPACE}/tests/|" > testplan.txt
+grep -E -v '(^[[:space:]]*#|^[[:space:]]*$)' "${TESTPLANDIR}/testplan.txt" |\
+    sed "s|^|${WORKSPACE}/tests/|" > testplan.txt
 cat testplan.txt
 SUITES=$( xargs -a testplan.txt )
 
-echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
-echo "Starting Robot test suites ${SUITES} ..."
-relax_set
-
 echo "Versioning information:"
 python3 --version
-pip freeze
+pip3 freeze
 python3 -m robot.run --version || :
 
-python -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
+echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
+echo "Starting Robot test suites ${SUITES} ..."
+relax_set
+# Do NOT quote variables below, it breaks testing
+python3 -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
 RESULT=$?
 load_set
 echo "RESULT: $RESULT"
 # Note that the final steps are done in on_exit function after this exit!
 exit $RESULT
-
index 84c8b72..7723a66 100644 (file)
@@ -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-onap-components-simulators.yaml b/jjb/integration/simulators/integration-onap-components-simulators.yaml
new file mode 100644 (file)
index 0000000..7c1f818
--- /dev/null
@@ -0,0 +1,85 @@
+- project:
+    name: 'integration-onap-components-simulators-docker'
+    jobs:
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-aai'
+          docker-root: ./mock-aai
+          docker-name: 'onap/onap-component-mock-aai'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-aai'
+          docker-root: ./mock-aai
+          docker-name: 'onap/onap-component-mock-aai'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-cds'
+          docker-root: ./mock-cds
+          docker-name: 'onap/onap-component-mock-cds'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-cds'
+          docker-root: ./mock-cds
+          docker-name: 'onap/onap-component-mock-cds'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-clamp'
+          docker-root: ./mock-clamp
+          docker-name: 'onap/onap-component-mock-clamp'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-clamp'
+          docker-root: ./mock-clamp
+          docker-name: 'onap/onap-component-mock-clamp'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-dmaap'
+          docker-root: ./mock-dmaap
+          docker-name: 'onap/onap-component-mock-dmaap'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-dmaap'
+          docker-root: ./mock-dmaap
+          docker-name: 'onap/onap-component-mock-dmaap'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-msb-k8s'
+          docker-root: ./mock-msb-k8s
+          docker-name: 'onap/onap-component-mock-k8s'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-msb-k8s'
+          docker-root: ./mock-msb-k8s
+          docker-name: 'onap/onap-component-mock-k8s'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-sdc'
+          docker-root: ./mock-sdc
+          docker-name: 'onap/onap-component-mock-sdc'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-sdc'
+          docker-root: ./mock-sdc
+          docker-name: 'onap/onap-component-mock-sdc'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-sdnc'
+          docker-root: ./mock-sdnc
+          docker-name: 'onap/onap-component-mock-sdnc'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-sdnc'
+          docker-root: ./mock-sdnc
+          docker-name: 'onap/onap-component-mock-sdnc'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-so'
+          docker-root: ./mock-so
+          docker-name: 'onap/onap-component-mock-so'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-so'
+          docker-root: ./mock-so
+          docker-name: 'onap/onap-component-mock-so'
+      - gerrit-docker-verify:
+          project-name: 'integration-onap-component-simulators-ves'
+          docker-root: ./mock-ves
+          docker-name: 'onap/onap-component-mock-ves'
+      - gerrit-docker-merge:
+          project-name: 'integration-onap-component-simulators-ves'
+          docker-root: ./mock-ves
+          docker-name: 'onap/onap-component-mock-ves'
+    project: 'integration/onap-component-simulators'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'integration-settings'
+    build-node: ubuntu1804-docker-8c-8g
+    cron: '@daily'
+    container-tag-method: stream
\ No newline at end of file
index b73e5f2..4d6fe87 100644 (file)
@@ -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:
index 2c8584c..ff8faf2 100644 (file)
@@ -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'
 
index 4b396e8..bad0801 100644 (file)
@@ -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
index 5a1c2e9..8cb50d6 100644 (file)
@@ -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
index 282ca45..cca5dab 100644 (file)
@@ -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
index e260745..ba4c331 100644 (file)
@@ -35,7 +35,7 @@
       name: integration-simulators-nf-simulator-info
       jobs:
           - gerrit-info-yaml-verify
-      build-node: centos7-builder-2c-1g
+      build-node: centos8-builder-2c-1g
       project: 'integration/simulators/nf-simulator'
       project-name: 'integration-simulators-nf-simulator'
       branch: 'master'
index a36665b..8c83a9c 100644 (file)
@@ -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
@@ -60,6 +60,6 @@
       name: integration-simulators-nf-simulator-ves-client-info
       project: integration/simulators/nf-simulator/ves-client
       project-name: integration-simulators-nf-simulator-ves-client
-      build-node: centos7-builder-2c-1g
+      build-node: centos8-builder-2c-1g
       jobs:
           - gerrit-info-yaml-verify
index f61a878..bab397e 100644 (file)
@@ -3,7 +3,7 @@
     name: integration-usecases-A1-policy-enforcement-r-apps-info
     project: integration/usecases/A1-policy-enforcement-r-apps
     project-name: integration-usecases-A1-policy-enforcement-r-apps
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 13659e6..d7f43cd 100644 (file)
@@ -4,7 +4,7 @@
     name: integration-usecases-A1-policy-enforcement-info
     project: integration/usecases/A1-policy-enforcement
     project-name: integration-usecases-A1-policy-enforcement
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 67be689..8d9e058 100644 (file)
@@ -4,7 +4,7 @@
     project-name: integration-xtesting
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: integration/xtesting
     branch: master
 
index 6f496d5..4bd142b 100644 (file)
@@ -4,6 +4,6 @@
     project-name: sandbox-3
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: sandbox-3
     branch: master
index 3ca61db..2c29f1b 100644 (file)
@@ -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
 
@@ -67,6 +67,6 @@
     project-name: modeling-etsicatalog
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: modeling/etsicatalog
     branch: master
index 1cae6b7..8a0b3d6 100644 (file)
@@ -4,6 +4,6 @@
     project-name: modeling-modelspec
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: modeling/modelspec
     branch: master
index 0eb834a..7d89c30 100644 (file)
       - '{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-8c-8g
           maven-versions-plugin: true
           mvn-pom: 'distributions/msb-apigateway/pom.xml'
@@ -84,6 +86,6 @@
     project-name: msb-apigateway
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: msb/apigateway
     branch: master
index 3764b2c..e59e9bc 100644 (file)
@@ -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: 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-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
@@ -77,6 +79,6 @@
     project-name: msb-discovery
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: msb/discovery
     branch: master
index 15aa9a0..ccaeb32 100644 (file)
@@ -6,8 +6,9 @@
       - '{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
     project: 'msb/java-sdk'
     stream:
@@ -50,6 +51,6 @@
     project-name: msb-java-sdk
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: msb/java-sdk
     branch: master
index fbd5009..4217d21 100644 (file)
@@ -6,8 +6,9 @@
       - '{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
     project: 'msb/swagger-sdk'
     stream:
@@ -50,6 +51,6 @@
     project-name: msb-swagger-sdk
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: msb/swagger-sdk
     branch: master
index 56f8da1..8ef2bcb 100644 (file)
@@ -18,7 +18,7 @@
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: 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
index cec2f67..ffb58ae 100644 (file)
@@ -3,6 +3,6 @@
     project-name: multicloud-framework
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/framework
     branch: master
index c1aa85e..9519ea6 100644 (file)
@@ -5,7 +5,7 @@
     project-name: multicloud
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud
     branch: master
 
@@ -14,7 +14,7 @@
     project-name: multicloud-windriver
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/openstack/windriver
     branch: master
 
@@ -23,7 +23,7 @@
     project-name: multicloud-oom
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/oom
     branch: master
 
@@ -32,6 +32,6 @@
     project-name: multicloud-k8s
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/k8s
     branch: master
index 6b05bec..1b59ff8 100644 (file)
@@ -14,7 +14,7 @@
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: 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
@@ -93,7 +93,7 @@
     project-name: multicloud-openstack-vmware
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/openstack/vmware
     branch: master
     disabled: true
index e13705c..4d83ed2 100644 (file)
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-goals: install
           mvn-params: '-P docker'
           maven-versions-plugin: true
@@ -73,7 +73,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: 'centos7-builder-4c-4g'
+    build-node: 'centos8-builder-4c-4g'
 
 #- project:
 #    name: multicloud-openstack-arm64
     project-name: multicloud-openstack
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: multicloud/openstack
     branch: master
index 0985d66..adf8b3a 100644 (file)
@@ -24,6 +24,6 @@
     project-name: music-distributed-kv-store
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: music/distributed-kv-store
     branch: master
index aaac0b4..c899e0a 100644 (file)
@@ -10,8 +10,9 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-version-plugin: true
           mvn-pom: 'jar/pom.xml'
           mvn-params: '-f jar/pom.xml'
index f694051..7a5f037 100644 (file)
@@ -9,6 +9,6 @@
     name: oom-platform-cert-manager-info
     project: oom/platform/cert-manager
     project-name: oom-platform-cert-manager
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
index a2f54f3..9a09775 100644 (file)
@@ -9,7 +9,7 @@
     name: oom-platform-cert-service-info
     project: oom/platform/cert-service
     project-name: oom-platform-cert-service
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
           -  '{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'
index 477d66e..fe55f15 100644 (file)
@@ -9,6 +9,6 @@
     name: oom-utils-info
     project: oom/utils
     project-name: oom-utils
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
index be47867..3ce7466 100644 (file)
@@ -20,7 +20,7 @@
     project-name: offline-installer
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oom/offline-installer
     branch: master
 
index 4b7ec30..caff95b 100644 (file)
@@ -9,7 +9,7 @@
     name: oom-consul-info
     project: oom/consul
     project-name: oom-consul
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 8defb44..52cdd85 100644 (file)
@@ -53,6 +53,6 @@
     project-name: oomconfig
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oom
     branch: master
index de93089..d88533e 100644 (file)
@@ -4,7 +4,7 @@
     project-name: oom-readiness
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oom/readiness
     branch: master
 
index 93fabe7..adb5158 100644 (file)
@@ -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: centos7-builder-4c-4g
+          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'
@@ -43,6 +45,6 @@
     project-name: oom-registrator
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oom/registrator
     branch: master
index 513b73c..3cea163 100644 (file)
@@ -12,8 +12,9 @@
       - '{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
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -45,6 +46,6 @@
     project-name: oparent
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: oparent
     branch: master
index a342bcd..7aef569 100644 (file)
       - '{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'
@@ -72,6 +74,6 @@
     project-name: optf-has
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: optf/has
     branch: master
index 64d7db4..46e719f 100644 (file)
       - '{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'
@@ -73,6 +75,6 @@
     project-name: optf-osdf
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: optf/osdf
     branch: master
index 290e674..af713bd 100644 (file)
@@ -16,7 +16,7 @@
          mvn-params: "-P docker"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -82,6 +82,6 @@
     project-name: policy-apex-pdp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/apex-pdp
     branch: master
index fc2287d..85e765b 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-api
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/api
     branch: master
index ad5641f..5baaf02 100644 (file)
@@ -4,7 +4,7 @@
     project-name: 'policy-clamp'
     jobs:
       - gerrit-maven-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
@@ -78,6 +78,6 @@
     project-name: policy-clamp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/clamp
     branch: master
index bb9b1d4..b488b1f 100644 (file)
@@ -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
           mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-gerrit-release-jobs':
@@ -67,6 +67,6 @@
     project-name: policy-common
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/common
     branch: master
index a7ae387..ee37054 100644 (file)
           recipients: '{recipients}'
           notify-every-unstable-build: false
           send-to-individuals: true
+
+- job-template:
+      name: '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      disabled: '{disabled}'
+      project-type: freestyle
+      build-node: 'ubuntu1804-docker-8c-8g'
+      node: '{build-node}'
+      recipients: ''
+      java-version: 'openjdk11'
+      python-version: python3
+
+      properties:
+          - lf-infra-properties:
+                project: '{project}'
+                build-days-to-keep: '{build-days-to-keep}'
+
+      parameters:
+          - infra-parameters:
+                project: '{project}'
+                branch: '{branch}'
+                refspec: 'refs/heads/{branch}'
+                artifacts: '{archive-artifacts}'
+          - integration-test-options:
+                test-options: '{functionality}'
+
+      scm:
+          - gerrit-trigger-scm:
+                refspec: '$GERRIT_REFSPEC'
+                choosing-strategy: 'default'
+                submodule-recursive: '{submodule-recursive}'
+
+      wrappers:
+          - lf-infra-wrappers:
+                build-timeout: '{build-timeout}'
+                jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+      triggers:
+          - timed: '@daily'
+          - reverse:
+                jobs: '{obj:trigger_jobs}'
+
+      builders:
+          - lf-infra-pre-build
+          - lf-update-java-alternatives:
+                java-version: '{java-version}'
+          - integration-run-project-k8s-test
+
+      publishers:
+          - integration-project-robot:
+                unstable-if: 0.0
+                pass-if: 100.0
+          - lf-infra-publish
+          - email:
+                recipients: '{recipients}'
+                notify-every-unstable-build: false
+                send-to-individuals: true
+
+
+- job-template:
+      name: '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+      disabled: '{disabled}'
+
+      project-type: freestyle
+      build-node: 'ubuntu1804-docker-8c-8g'
+      node: '{build-node}'
+      recipients: ''
+      java-version: 'openjdk11'
+      python-version: python3
+
+      properties:
+          - lf-infra-properties:
+                project: '{project}'
+                build-days-to-keep: '{build-days-to-keep}'
+
+      parameters:
+          - infra-parameters:
+                project: '{project}'
+                branch: '{branch}'
+                refspec: 'refs/heads/{branch}'
+                artifacts: '{archive-artifacts}'
+          - integration-test-options:
+                test-options: '{functionality}'
+
+      scm:
+          - gerrit-trigger-scm:
+                refspec: '$GERRIT_REFSPEC'
+                choosing-strategy: 'gerrit'
+                submodule-recursive: '{submodule-recursive}'
+
+      wrappers:
+          - lf-infra-wrappers:
+                build-timeout: '{build-timeout}'
+                jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+      triggers:
+          - gerrit-trigger-patch-submitted:
+                server: '{server-name}'
+                project: '{project}'
+                branch: '{branch}'
+                files: '**/csit/**'
+
+      builders:
+          - lf-infra-pre-build
+          - lf-update-java-alternatives:
+                java-version: '{java-version}'
+          - integration-run-project-k8s-test
+
+      publishers:
+          - integration-project-robot:
+                unstable-if: 0.0
+                pass-if: 100.0
+          - lf-infra-publish
+          - email:
+                recipients: '{recipients}'
+                notify-every-unstable-build: false
+                send-to-individuals: true
index fdb74e9..4a0736d 100644 (file)
       - '{project-name}-{stream}-project-csit-verify-{functionality}'
       - '{project-name}-{stream}-project-csit-{functionality}'
     project-name: 'policy-clamp'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech ajith.sreekumar@est.tech pd1248@att.com'
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
     project: 'policy/docker'
     stream:
       - 'master':
index 3a6d3b9..ef6f3fc 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-distribution
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/distribution
     branch: master
index 5626e58..e37c0e9 100644 (file)
@@ -59,6 +59,6 @@
     project-name: policy-docker
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/docker
     branch: master
index dfad61b..7a49954 100644 (file)
@@ -10,7 +10,7 @@
           mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -86,6 +86,6 @@
     project-name: policy-drools-applications
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/drools-applications
     branch: master
index 4b630c9..76ee7af 100644 (file)
@@ -10,7 +10,7 @@
           mvn-params: "-P docker"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -77,6 +77,6 @@
     project-name: policy-drools-pdp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/drools-pdp
     branch: master
index 2c50abb..f6843f6 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -75,6 +75,6 @@
     project-name: policy-gui
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/gui
     branch: master
diff --git a/jjb/policy/policy-k8s-csit.yaml b/jjb/policy/policy-k8s-csit.yaml
new file mode 100644 (file)
index 0000000..e02b6c2
--- /dev/null
@@ -0,0 +1,101 @@
+- project:
+      name: policy-xacml-pdp-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-xacml-pdp'
+      recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'xacml-pdp'
+      trigger_jobs:
+          - 'policy-xacml-pdp-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-drools-pdp-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-drools-pdp'
+      recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'drools-pdp'
+      trigger_jobs:
+          - 'policy-drools-pdp-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-apex-pdp-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-apex-pdp'
+      recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'apex-pdp'
+      trigger_jobs:
+          - 'policy-apex-pdp-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-pap-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-pap'
+      recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'pap'
+      trigger_jobs:
+          - 'policy-pap-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-api-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-api'
+      recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'api'
+      trigger_jobs:
+          - 'policy-api-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
+
+- project:
+      name: policy-clamp-project-k8s-csit
+      jobs:
+          - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+          - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+      project-name: 'policy-clamp'
+      recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
+      project: 'policy/docker'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'clamp'
+      trigger_jobs:
+          - 'policy-clamp-{stream}-merge-java'
+          - 'policy-docker-{stream}-merge-java'
index e3cbf3a..9831f14 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-models
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/models
     branch: master
index 257f6ef..092b6ab 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-pap
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/pap
     branch: master
index 12929be..3df4a95 100644 (file)
@@ -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
           mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-gerrit-release-jobs':
@@ -49,6 +49,6 @@
     project-name: policy-parent
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/parent
     branch: master
index 288afe6..0d2e581 100644 (file)
@@ -10,7 +10,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
@@ -76,6 +76,6 @@
     project-name: policy-xacml-pdp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/xacml-pdp
     branch: master
diff --git a/jjb/portal-ng/portal-ng-history.yaml b/jjb/portal-ng/portal-ng-history.yaml
new file mode 100644 (file)
index 0000000..b711bb4
--- /dev/null
@@ -0,0 +1,15 @@
+---
+- project:
+    name: portal-ng-history-project-view
+    project-name: portal-ng-history
+    views:
+      - project-view
+
+- project:
+    name: portal-ng-history-info
+    project: portal-ng/history
+    project-name: portal-ng-history
+    build-node: centos8-builder-2c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file
diff --git a/jjb/portal-ng/portal-ng-ui.yaml b/jjb/portal-ng/portal-ng-ui.yaml
new file mode 100644 (file)
index 0000000..784800e
--- /dev/null
@@ -0,0 +1,15 @@
+---
+- project:
+    name: portal-ng-ui-project-view
+    project-name: portal-ng-ui
+    views:
+      - project-view
+
+- project:
+    name: portal-ng-ui-info
+    project: portal-ng/ui
+    project-name: portal-ng-ui
+    build-node: centos8-builder-2c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file
diff --git a/jjb/portal-ng/portal-ng.yaml b/jjb/portal-ng/portal-ng.yaml
new file mode 100644 (file)
index 0000000..8bc5d13
--- /dev/null
@@ -0,0 +1,15 @@
+---
+- project:
+    name: portal-ng-project-view
+    project-name: portal-ng
+    views:
+      - project-view
+
+- project:
+    name: portal-ng-info
+    project: portal-ng
+    project-name: portal-ng
+    build-node: centos7-builder-2c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file
index 94ba547..9bd1971 100644 (file)
@@ -9,6 +9,6 @@
     name: relman-info
     project: relman
     project-name: relman
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
index eb0d11a..2715743 100644 (file)
@@ -16,7 +16,7 @@
     default-version: latest
     tox-dir: "docs/"
     doc-dir: "_build/html"
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     # the jjb is very short and filtering docs falsy raises side effects in
     # ONAP doc
     gerrit_trigger_file_paths:
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
deleted file mode 100644 (file)
index 0a894db..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
----
-
-- project:
-    name: sdc-sdc-docker-base
-    project-name: 'sdc-sdc-docker-base'
-    jobs:
-      - '{project-name}-{stream}-verify-java':
-          build-node: 'ubuntu1804-docker-v1-8c-8g'
-          docker-pom: 'pom.xml'
-      - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1804-docker-8c-8g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'default'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P default'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'sdc/sdc-docker-base'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'sdc-sdc-docker-base-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn36'
-
-- project:
-    name: sdc-sdc-docker-base-info
-    project-name: sdc-sdc-docker-base
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/sdc-docker-base
-    branch: master
index 26ca8fe..9877904 100644 (file)
@@ -27,6 +27,7 @@
           maven-versions-plugin: true
           mvn-goals: 'clean deploy'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-goals: 'clean install docker:build docker:push'
index 409b1de..68a03fc 100644 (file)
@@ -18,6 +18,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: 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'
index 6a754e5..2a330ed 100644 (file)
@@ -55,6 +55,7 @@
           mvn-version: 'mvn36'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
index 7b40832..65f8d3e 100644 (file)
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     project: 'sdnc/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
@@ -74,7 +73,7 @@
     mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     maven-version: "mvn38"
 
 #
     java-version: openjdk17
     mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
 
 - project:
     name: sdnc-apps-info
index c427e82..582fee0 100644 (file)
@@ -15,8 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
       - 'kohn':
           branch: 'kohn'
     mvn-settings: 'sdnc-oam-settings'
index d44904c..48cec0d 100644 (file)
@@ -8,21 +8,20 @@
           cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     project: 'sdnc/northbound'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version: "mvn38"
     mvn-settings: 'sdnc-northbound-settings'
 
@@ -55,7 +54,7 @@
     mvn-goals: 'clean install'
     java-version: openjdk17
     mvn-version: "mvn38"
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: sdnc-northbound-clm
@@ -71,6 +70,7 @@
     mvn-settings: 'sdnc-northbound-settings'
     java-version: openjdk17
     mvn-version: 'mvn38'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
 
 - project:
     name: sdnc-northbound-info
index da7a4cc..0fe22c5 100644 (file)
@@ -9,11 +9,11 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
     project: 'sdnc/oam'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version: "mvn38"
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
@@ -73,6 +72,7 @@
     mvn-settings: 'sdnc-oam-settings'
     java-version: openjdk17
     mvn-version: 'mvn38'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
 
 - project:
     name: sdnc-oam-info
index ea3db29..84ace63 100644 (file)
@@ -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
 
       - '{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'
     mvn-settings: 'so-adapters-so-cnf-adapter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: so-adapters-so-cnf-adapter-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'so/adapters/so-cnf-adapter'
+    project-name: 'so-adapters-so-cnf-adapter'
+    build-node: ubuntu1804-docker-v1-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'so-adapters-so-cnf-adapter-settings'
index a3f64f8..37ffeac 100644 (file)
@@ -9,7 +9,7 @@
     name: so-adapters-so-etsi-sol003-adapter-info
     project: so/adapters/so-etsi-sol003-adapter
     project-name: so-adapters-so-etsi-sol003-adapter
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
       - '{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'
index cb16d5c..db9f91d 100644 (file)
@@ -9,7 +9,7 @@
     name: so-adapters-so-etsi-sol005-adapter-info
     project: so/adapters/so-etsi-sol005-adapter
     project-name: so-adapters-so-etsi-sol005-adapter
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
       - '{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'
     mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
+- project:
+    name: so-adapters-so-etsi-sol005-adapter-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'so/adapters/so-etsi-sol005-adapter'
+    project-name: 'so-adapters-so-etsi-sol005-adapter'
+    build-node: ubuntu1804-docker-v1-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
index 6b14d6a..7a45cd9 100644 (file)
@@ -9,7 +9,7 @@
     name: so-adapters-so-nssmf-adapter-info
     project: so/adapters/so-nssmf-adapter
     project-name: so-adapters-so-nssmf-adapter
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
       - '{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'
index 5a37cf6..2f5ba19 100644 (file)
@@ -9,7 +9,7 @@
     name: so-adapters-so-oof-adapter-info
     project: so/adapters/so-oof-adapter
     project-name: so-adapters-so-oof-adapter
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
       - '{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'
     mvn-settings: 'so-adapters-so-oof-adapter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: so-adapters-so-oof-adapter-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'so/adapters/so-oof-adapter'
+    project-name: 'so-adapters-so-oof-adapter'
+    build-node: ubuntu1804-docker-v1-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'so-adapters-so-oof-adapter-settings'
index 88896f9..4eba714 100644 (file)
@@ -19,4 +19,6 @@
           trigger_jobs:
       - 'macroflow':
           trigger_jobs:
+      - 'integration-cnfm-testing':
+          trigger_jobs:
     robot-options: ''
index 94cb8a2..2f5c9b0 100644 (file)
@@ -6,8 +6,9 @@
       - '{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
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -62,6 +63,6 @@
     java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: so/libs
     branch: master
index 0c268a5..f33d945 100644 (file)
@@ -9,7 +9,7 @@
     name: so-so-admin-cockpit-info
     project: so/so-admin-cockpit
     project-name: so-so-admin-cockpit
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
       - '{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'
index 3d5a2f5..1ce164f 100644 (file)
@@ -9,7 +9,7 @@
     name: so-so-etsi-nfvo-info
     project: so/so-etsi-nfvo
     project-name: so-so-etsi-nfvo
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
       - '{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'
index cae9480..3ded1b5 100644 (file)
       - '{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'
     java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: so
     stream:
       - 'master':
index b1b3f54..269b5cb 100644 (file)
@@ -4,7 +4,7 @@
     project-name: testsuite-pythonsdk-tests
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: testsuite/pythonsdk-tests
     branch: master
 
index 7a4ad4d..ea463b6 100644 (file)
@@ -9,6 +9,6 @@
     name: testsuite-robot-utils-info
     project: testsuite/robot-utils
     project-name: testsuite-robot-utils
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
index 65c818c..7542c2b 100644 (file)
@@ -9,7 +9,7 @@
     name: testsuite-cds-mock-odl-info
     project: testsuite/cds-mock-odl
     project-name: testsuite-cds-mock-odl
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index c6bc7a3..62f712f 100644 (file)
@@ -9,7 +9,7 @@
     name: testsuite-cds-mock-server-info
     project: testsuite/cds-mock-server
     project-name: testsuite-cds-mock-server
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 9fad20f..4c0ece3 100644 (file)
@@ -9,7 +9,7 @@
     name: testsuite-cds-mock-ssh-info
     project: testsuite/cds-mock-ssh
     project-name: testsuite-cds-mock-ssh
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 2fef96a..77b4606 100644 (file)
@@ -3,7 +3,7 @@
     name: testsuite-cds-info
     project: testsuite/cds
     project-name: testsuite-cds
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 
index 40b281a..14ce6e4 100644 (file)
@@ -4,7 +4,7 @@
     project-name: testsuite-oom
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: testsuite/oom
     branch: master
 
index bc62ee4..db3e730 100644 (file)
@@ -34,7 +34,7 @@
     project-name: testsuite
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: testsuite
     branch: master
 
index 03a0e68..0e86992 100644 (file)
@@ -16,7 +16,7 @@
       - 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
@@ -69,6 +69,6 @@
     project-name: usecase-ui-intent-analysis
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: usecase-ui/intent-analysis
     branch: master
index 354ca72..cb2c810 100644 (file)
@@ -16,7 +16,7 @@
       - 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
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
@@ -62,7 +62,7 @@
     project-name: usecase-ui-nlp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: usecase-ui/nlp
     branch: master
 
index 455a402..3ff14dd 100644 (file)
@@ -16,7 +16,7 @@
       - 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
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
@@ -62,6 +62,6 @@
     project-name: usecase-ui-server
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: usecase-ui/server
     branch: master
index 60453a4..4f39952 100644 (file)
@@ -21,7 +21,7 @@
       - 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
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
@@ -50,6 +50,6 @@
     project-name: usecase-ui
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: usecase-ui
     branch: master
index e797c3f..4fc3df1 100644 (file)
@@ -22,7 +22,7 @@
       - '{project-name}-{stream}-{subproject}-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}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
@@ -70,6 +70,6 @@
     project-name: vfc-gvnfm-vnflcm
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: vfc/gvnfm/vnflcm
     branch: master
index 1904813..5df66c4 100644 (file)
@@ -16,7 +16,7 @@
       - '{project-name}-{stream}-{subproject}-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}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
@@ -64,6 +64,6 @@
     project-name: vfc-gvnfm-vnfmgr
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: vfc/gvnfm/vnfmgr
     branch: master
index 798f9fc..54509ea 100644 (file)
@@ -17,7 +17,7 @@
       - '{project-name}-{stream}-{subproject}-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}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
@@ -65,6 +65,6 @@
     project-name: vfc-gvnfm-vnfres
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: vfc/gvnfm/vnfres
     branch: master
index 679cc45..258ae31 100644 (file)
@@ -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}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
@@ -30,6 +30,6 @@
     project-name: vfc-nfvo-db
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: vfc/nfvo/db
     branch: master
index 00d2d23..5d975c4 100644 (file)
@@ -17,7 +17,7 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-pom: 'huawei/pom.xml'
           mvn-params: '-f huawei/pom.xml'
@@ -65,6 +65,6 @@
     java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: vfc/nfvo/driver/vnfm/svnfm
     branch: master
index 2129883..e779697 100644 (file)
@@ -17,7 +17,7 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-pom: 'gvnfmadapter/pom.xml'
           mvn-params: '-f gvnfmadapter/pom.xml'
@@ -67,6 +67,6 @@
     project-name: vfc-nfvo-driver-vnfm-gvnfm
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: vfc/nfvo/driver/vnfm/gvnfm
     branch: master
index add2502..24f98c1 100644 (file)
@@ -12,7 +12,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}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
@@ -59,6 +59,6 @@
     project-name: vfc-nfvo-lcm
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: vfc/nfvo/lcm
     branch: master
index f38f4d8..e86a691 100644 (file)
@@ -10,7 +10,7 @@
     project: 'vnfrqts/epics'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-epics'
     branch: 'master'
     mvn-settings: 'vnfrqts-epics-settings'
index dbd30a7..6517277 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfrqts/guidelines'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-guidelines'
     branch: 'master'
     mvn-settings: 'vnfrqts-guidelines-settings'
index e026fb4..a8fd39c 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfrqts/requirements'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-requirements'
     branch: 'master'
     mvn-settings: 'vnfrqts-requirements-settings'
index a06e7ed..13dcfe8 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfrqts/testcases'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-testcases'
     branch: 'master'
     mvn-settings: 'vnfrqts-testcases-settings'
index 5070867..8d964c6 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfrqts/usecases'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: 'vnfrqts-usecases'
     branch: 'master'
     mvn-settings: 'vnfrqts-usecases-settings'
index abeee9a..77ef5e7 100644 (file)
@@ -68,7 +68,7 @@
     name: vnfsdk-dovetail-integration-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
index 2e2cfad..1b2dedd 100644 (file)
@@ -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
 
     project: 'vnfsdk/functest'
@@ -23,7 +23,7 @@
     name: vnfsdk-functest-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/functest'
     project-name: 'vnfsdk-functest'
     branch: 'master'
index e2e365c..c1f2408 100644 (file)
@@ -15,7 +15,7 @@
     name: vnfsdk-lctest-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/lctest'
     project-name: 'vnfsdk-lctest'
     branch: 'master'
index 90763d2..5ef1b67 100644 (file)
@@ -4,7 +4,7 @@
     project: 'vnfsdk/model'
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project-name: vnfsdk-model
     branch: master
     mvn-settings: vnfsdk-model-settings
index 6d22310..c39e25f 100644 (file)
@@ -37,7 +37,7 @@
     name: vnfsdk-pkgtools-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/pkgtools'
     project-name: 'vnfsdk-pkgtools'
     branch: 'master'
index 615b4c3..b10c146 100644 (file)
@@ -7,10 +7,10 @@
       - '{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
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-goals: 'clean package -Pdocker'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -49,7 +49,7 @@
     name: vnfsdk-refrepo-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
@@ -79,7 +79,7 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
index 8f23c6e..54cee4a 100644 (file)
@@ -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
     - '{project-name}-gerrit-release-jobs':
         build-node: centos7-docker-8c-8g
@@ -43,7 +43,7 @@
     name: vnfsdk-validation-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
@@ -88,7 +88,7 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
index b0516ce..a57ee42 100644 (file)
@@ -7,4 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
index a0870ad..f30f0d4 100644 (file)
@@ -7,4 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
index 2a6b271..3c24427 100644 (file)
@@ -7,4 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
index bea93c3..0de82d8 100644 (file)
@@ -7,4 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
index 7173e98..c5ce8a8 100644 (file)
@@ -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}}'
 
     - 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'
index cdf752a..ac824ce 100644 (file)
@@ -42,9 +42,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"
     },
     {
@@ -53,6 +51,8 @@
     },
     {
       "type": "ansible",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "playbook_file": "provision/helm.yaml",
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
index 6554fb6..c25a564 100644 (file)
@@ -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",
index 6bf7b17..657f109 100644 (file)
@@ -39,9 +39,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"
     },
     {
@@ -50,6 +48,8 @@
     },
     {
       "type": "ansible",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "playbook_file": "provision/redis.yaml",
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",