Merge "Add HOWTOs link to ONAP Wiki on Coverity job and view pages"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Fri, 17 Apr 2020 15:12:19 +0000 (15:12 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 17 Apr 2020 15:12:19 +0000 (15:12 +0000)
378 files changed:
Sandbox_Setup.md
global-jjb
jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg [new file with mode: 0644]
jenkins-config/global-vars-production.sh
jenkins-config/global-vars-sandbox.sh
jjb/aaf/aaf-authz.yaml
jjb/aaf/aaf-cadi.yaml
jjb/aaf/aaf-certservice-csit.yaml [new file with mode: 0644]
jjb/aaf/aaf-certservice.yaml [new file with mode: 0644]
jjb/aaf/aaf-csit.yaml [deleted file]
jjb/aaf/aaf-luaplugin.yaml
jjb/aaf/aaf-sms-csit.yaml [deleted file]
jjb/aaf/aaf-sms.yaml
jjb/aaf/aaf-sshsm.yaml
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-cacher.yaml
jjb/aai/aai-chameleon.yaml [deleted file]
jjb/aai/aai-champ.yaml [deleted file]
jjb/aai/aai-csit.yaml [deleted file]
jjb/aai/aai-data-router.yaml
jjb/aai/aai-esr-gui.yaml
jjb/aai/aai-esr-server.yaml
jjb/aai/aai-event-client.yaml
jjb/aai/aai-gallifrey.yaml [deleted file]
jjb/aai/aai-gizmo.yaml [deleted file]
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-oom.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-rest-client.yaml
jjb/aai/aai-router-core-service.yaml
jjb/aai/aai-schema-service.yaml
jjb/aai/aai-search-data-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-spike.yaml [deleted file]
jjb/aai/aai-traversal.yaml
jjb/aai/aai-validation.yaml
jjb/appc/appc-cdt.yaml
jjb/appc/appc-csit.yaml
jjb/appc/appc-deployment.yaml
jjb/appc/appc-master.yaml
jjb/appc/appc-parent.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/ccsdk-csit.yaml
jjb/ccsdk/cds.yaml
jjb/ccsdk/dashboard.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/platform-plugins.yaml
jjb/ccsdk/sli-adaptors.yaml
jjb/ccsdk/sli-core.yaml
jjb/ccsdk/sli-northbound.yaml
jjb/ccsdk/sli-plugins.yaml
jjb/ccsdk/utils.yaml
jjb/ci-management/ci-management-coverity.yaml
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/ci-management/ci-management-views.yaml
jjb/clamp/clamp-csit.yaml
jjb/clamp/clamp.yaml
jjb/clamp/dashboard/clamp-dashboard.yaml [new file with mode: 0644]
jjb/clamp/dashboard/info-clamp-dashboard.yaml [new file with mode: 0644]
jjb/clamp/ui/info-clamp-ui.yaml [new file with mode: 0644]
jjb/cli/cli.yaml
jjb/dcaegen2/dcaegen2-analytics-flink.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-analytics-tca.yaml
jjb/dcaegen2/dcaegen2-analytics.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
jjb/dcaegen2/dcaegen2-collectors.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-deployments.yaml
jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml [deleted file]
jjb/dcaegen2/dcaegen2-platform-cli.yaml [deleted file]
jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-plugins.yaml
jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
jjb/dcaegen2/dcaegen2-platform.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
jjb/dcaegen2/dcaegen2-services-java.yaml [deleted file]
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml [moved from jjb/cli/cli-csit.yaml with 58% similarity]
jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
jjb/dcaegen2/dcaegen2-services-prh.yaml
jjb/dcaegen2/dcaegen2-services-sdk.yaml
jjb/dcaegen2/dcaegen2-services-son-handler.yaml
jjb/dcaegen2/dcaegen2-services.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-utils.yaml
jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
jjb/dcaegen2/dcaegen2.yaml
jjb/demo/demo.yaml
jjb/dmaap/dmaap-buscontroller-csit.yaml
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-csit.yaml
jjb/dmaap/dmaap-datarouter-csit.yaml
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-dbcapi.yaml
jjb/dmaap/dmaap-kafka-docker.yaml
jjb/dmaap/dmaap-kafka.yaml
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-docker.yaml
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
jjb/dmaap/dmaap-zookeeper.yaml
jjb/doc/doc-templates-rtd.yaml
jjb/doc/doc.yaml
jjb/externalapi/externalapi-nbi-csit.yaml
jjb/externalapi/externalapi-nbi.yaml
jjb/global-defaults.yaml
jjb/global-macros.yaml
jjb/global-templates-c.yaml
jjb/global-templates-docker.yaml
jjb/global-templates-golang.yaml
jjb/global-templates-helm.yaml
jjb/global-templates-java.yaml
jjb/global-templates-script.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-csit.yaml [deleted file]
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/include-docker-blessing.sh [deleted file]
jjb/integration/docker/info-integration-docker.yaml [new file with mode: 0644]
jjb/integration/integration-csit.yaml
jjb/integration/integration-devtool.yaml [deleted file]
jjb/integration/integration-docker-compose.yaml [new file with mode: 0644]
jjb/integration/integration-docker.yaml
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates-csit.yaml
jjb/integration/integration-templates-docker.yaml
jjb/integration/integration-templates.yaml [new file with mode: 0644]
jjb/integration/integration.yaml
jjb/integration/netconf-pnp-simulator-verify.sh [new file with mode: 0644]
jjb/integration/simulators/integration-dc-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-pnf-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-ran-simulator.yaml [new file with mode: 0644]
jjb/integration/usecases/integration-usecases-bbs.yaml [new file with mode: 0644]
jjb/integration/usecases/integration-usecases-mdons.yaml [new file with mode: 0644]
jjb/integration/vagrantfile-verify.sh [new file with mode: 0644]
jjb/integration/xtesting/info-integration-xtesting.yaml [new file with mode: 0644]
jjb/lab/lab-templates.yaml
jjb/lf-infra-releasedockerhub.yaml [new file with mode: 0644]
jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
jjb/logging-analytics/logging-analytics.yaml
jjb/modeling/build-modeling-etsicatalog-docker-image.sh [moved from jjb/modeling/build-modeling-genericparser-docker-image.sh with 100% similarity]
jjb/modeling/modeling-etsicatalog-csit.yaml [moved from jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml with 55% similarity]
jjb/modeling/modeling-etsicatalog.yaml [new file with mode: 0644]
jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml [deleted file]
jjb/modeling/modeling-toscaparsers-genericparser.yaml [deleted file]
jjb/modeling/modeling-toscaparsers-nfvparser.yaml
jjb/msb/msb-apigateway.yaml
jjb/msb/msb-csit.yaml [deleted file]
jjb/msb/msb-discovery.yaml
jjb/msb/msb-java-sdk.yaml
jjb/msb/msb-swagger-sdk.yaml
jjb/multicloud/build-multicloud-openstack-docker-image.sh
jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh [deleted file]
jjb/multicloud/kud-deployment.sh
jjb/multicloud/multicloud-azure-csit.yaml [deleted file]
jjb/multicloud/multicloud-azure-java.yaml
jjb/multicloud/multicloud-azure-python.yaml
jjb/multicloud/multicloud-csit.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-framework-python.yaml
jjb/multicloud/multicloud-framework.yaml [new file with mode: 0644]
jjb/multicloud/multicloud-k8s-csit.yaml [deleted file]
jjb/multicloud/multicloud-k8s-kud-deployment.yaml [deleted file]
jjb/multicloud/multicloud-k8s.yaml
jjb/multicloud/multicloud-openstack-fcaps-csit.yaml
jjb/multicloud/multicloud-openstack-lenovo-csit.yaml
jjb/multicloud/multicloud-openstack-ocata-csit.yaml [deleted file]
jjb/multicloud/multicloud-openstack-pike-csit.yaml [deleted file]
jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
jjb/multicloud/multicloud-openstack-vmware-csit.yaml
jjb/multicloud/multicloud-openstack-vmware-java.yaml
jjb/multicloud/multicloud-openstack-vmware-python.yaml
jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml [deleted file]
jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml [deleted file]
jjb/multicloud/multicloud-openstack-windriver-csit.yaml [deleted file]
jjb/multicloud/multicloud-openstack.yaml
jjb/music/music-csit.yaml [deleted file]
jjb/music/music-distributed-kv-store.yaml
jjb/music/music-jar.yaml
jjb/music/music-mdbc.yaml
jjb/music/music-prom.yaml
jjb/music/music.yaml
jjb/oom/offline-installer.yaml
jjb/oom/oom-helm.yaml
jjb/oom/oom-oneclick-config.yaml
jjb/oom/oom-registrator.yaml
jjb/oparent/oparent.yaml
jjb/openci/openci-onap-daily-jobs.yaml
jjb/optf/build-optf-fgps-docker-image.sh
jjb/optf/optf-cmso-csit.yaml
jjb/optf/optf-cmso.yaml
jjb/optf/optf-fgps-csit.yaml [deleted file]
jjb/optf/optf-fgps.yaml
jjb/optf/optf-has-csit.yaml
jjb/optf/optf-has.yaml
jjb/optf/optf-osdf-csit.yaml
jjb/optf/optf-osdf.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-common.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-engine.yaml
jjb/policy/policy-gui.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-sdk/portal-sdk.yaml
jjb/portal/portal-docker.yaml
jjb/portal/portal.yaml
jjb/rtdv3/rtdv3.yaml [new file with mode: 0644]
jjb/sdc/sdc-csit.yaml
jjb/sdc/sdc-dcae-d-ci.yaml
jjb/sdc/sdc-dcae-d-csit.yaml [new file with mode: 0644]
jjb/sdc/sdc-dcae-d-dt-be-main.yaml
jjb/sdc/sdc-dcae-d-dt-be-property.yaml
jjb/sdc/sdc-dcae-d-dt.yaml
jjb/sdc/sdc-dcae-d-fe.yaml
jjb/sdc/sdc-dcae-d-tosca-lab.yaml
jjb/sdc/sdc-jtosca.yaml [deleted file]
jjb/sdc/sdc-microservices.yaml [new file with mode: 0644]
jjb/sdc/sdc-onap-ui-angular.yaml
jjb/sdc/sdc-onap-ui-common.yaml
jjb/sdc/sdc-onap-ui-react.yaml
jjb/sdc/sdc-sdc-be-common.yaml
jjb/sdc/sdc-sdc-distribution-client.yaml
jjb/sdc/sdc-sdc-docker-base.yaml
jjb/sdc/sdc-sdc-pubsub.yaml
jjb/sdc/sdc-sdc-titan-cassandra.yaml [deleted file]
jjb/sdc/sdc-sdc-tosca.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/sdnc/sdnc-oom.yaml [new file with mode: 0644]
jjb/so/so-csit.yaml
jjb/so/so-libs.yaml
jjb/so/so.yaml
jjb/testsuite/testsuite-heatbridge.yaml
jjb/testsuite/testsuite-oom.yaml [new file with mode: 0644]
jjb/testsuite/testsuite-python-testing-utils.yaml
jjb/testsuite/testsuite.yaml
jjb/usecases/5G-bulkpm.yaml
jjb/usecases/usecases-csit.yaml [new file with mode: 0644]
jjb/usecaseui/usecase-ui-server.yaml
jjb/usecaseui/usecase-ui.yaml
jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
jjb/vfc/vfc-gvnfm-vnfres-java.yaml
jjb/vfc/vfc-gvnfm-vnfres-python.yaml
jjb/vfc/vfc-nfvo-catalog-csit.yaml
jjb/vfc/vfc-nfvo-catalog.yaml
jjb/vfc/vfc-nfvo-db.yaml
jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
jjb/vfc/vfc-nfvo-driver-ems-java.yaml
jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
jjb/vfc/vfc-nfvo-driver-sfc.yaml
jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
jjb/vfc/vfc-nfvo-lcm-csit.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
jjb/vfc/vfc-nfvo-multivimproxy.yaml
jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
jjb/vfc/vfc-nfvo-resmanagement.yaml
jjb/vfc/vfc-nfvo-wfengine-csit.yaml [deleted file]
jjb/vfc/vfc-nfvo-wfengine-java.yaml
jjb/vid/vid-csit.yaml
jjb/vid/vid.yaml
jjb/vnfrqts/build-and-upload.yaml
jjb/vnfrqts/pre-build-needs.sh
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-csit.yaml [deleted file]
jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
jjb/vnfsdk/vnfsdk-refrepo-csit.yaml [deleted file]
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh [new file with mode: 0644]
jjb/vnfsdk/vnfsdk-ves-agent.yaml
jjb/vvp/pre-build-csv.sh
jjb/vvp/vvp-documentation.yaml
jjb/vvp/vvp-em.yaml [new file with mode: 0644]
jjb/vvp/vvp-oom.yaml [new file with mode: 0644]
jjb/vvp/vvp-regression.yaml [new file with mode: 0644]
jjb/vvp/vvp-test-engine.yaml [new file with mode: 0644]
jjb/vvp/vvp-validation-scripts.yaml
packer/common-packer
packer/provision/helm.yaml
packer/provision/local-builder.yaml
packer/provision/local-docker.yaml
packer/provision/redis.yaml
packer/vars/ubuntu-18.04-arm64.json [new file with mode: 0644]
shell/docker-compose-logs.sh [new file with mode: 0644]
shell/docker-ts-tag-override.sh [new file with mode: 0755]
shell/maven-coverity.sh
shell/pypi-dist-build.sh
shell/pypi-publish.sh
shell/run_releasedockerhub.sh [new file with mode: 0644]

index abdc7c7..1ec8470 100644 (file)
@@ -6,7 +6,7 @@ that can be used before pushing job templates to the production
 
 It is configured similar to the ONAP [ci-management] production instance;
 however, it cannot publish artifacts or vote in Gerrit. Be aware that this is a
-test environment, and as such there a limited allotment of minions to test on
+test environment, and as such there is a limited allotment of minions to test on
 before pushing code to the ONAP repos.
 Keep the following points in mind prior to beginning work on ONAP Jenkins Sandbox
 environment:
@@ -19,11 +19,12 @@ environment:
   these VMs directly.
 
 Before you proceed further, ensure you have a Linux Foundation ID (LFID), which is
-required to access Gerrit & Jenkins. Also, to get an access to Sandbox environment
-please send email to helpdesk@onap.org (LF helpdesk team)
+required to access Gerrit & Jenkins. Also, to extend your permissions for uploading
+Jenkins configurations to Sandbox environment, you must raise a ticket to
+[Linux Foundation Help Center](https://support.linuxfoundation.org)
 
 To download **ci-management**, execute the following command to clone the
-**ci-managment** repository.
+**ci-management** repository.
 
 `git clone https://gerrit.onap.org/r/ci-management && (cd ci-management && curl -Lo \
 $(git rev-parse --git-dir)/hooks/commit-msg https://gerrit.onap.org/r/tools/hooks/commit-msg; \
@@ -48,28 +49,28 @@ jenkins-jobs --version
 jenkins-jobs test --recursive jjb/
 ```
 
-### Make a copy of the example JJB config file (in the builder/ directory)
+### Make a copy of the example JJB config file (in the ci-management/ directory)
 
 Backup the jenkins.ini.example to jenkins.ini
 
 `cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini`
 
 After copying the jenkins.ini.example, modify `jenkins.ini` with your
-**Jenkins LFID username**, **API token** and **ONAP jenkins sandbox URL**
+**Jenkins LFID username** and **API token**
 
 ```
 [job_builder]
 ignore_cache=True
 keep_descriptions=False
-include_path=.:scripts:~/git/
+include_path=.
 recursive=True
+retain_anchors=True
 
 [jenkins]
 user=jwagantall <Provide your Jenkins Sandbox username>
 password= <Refer below steps to get API token>
 url=https://jenkins.onap.org/sandbox
-This is deprecated, use job_builder section instead
-ignore_cache=True
+query_plugins_info=False
 ```
 ### How to retrieve API token?
 Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user
@@ -77,7 +78,7 @@ page by clicking on your username. Click **Configure** and then click **Add new
 After that specify a token name (optional) and click on **Generate** to generate and show
 new token. Please note down your token and store it securely.
 
-To work on existing jobs or create new jobs, navigate to the `/jjb` directory where you
+To work on existing jobs or create new jobs, navigate to the `ci-management/jjb/` directory where you
 will find all job templates for the project.  Follow the below commands to test,
 update or delete jobs in your sandbox environment.
 
@@ -105,7 +106,7 @@ The output directory will contain files with the XML configurations.
 
 ## To Update a job:
 
-Ensure you’ve configured your `jenkins.ini` and verified it by
+Ensure you’ve configured your `jenkins_jobs.ini` and verified it by
 outputting valid XML descriptions of Jenkins jobs. Upon successful
 verification, execute the following command to update the job to the
 Jenkins sandbox.
@@ -114,6 +115,9 @@ Jenkins sandbox.
 
 **Example:** `jenkins-jobs update jjb/ sdc-master-verify-java`
 
+Note that there will be some 403 errors along the way for failed view creation attempts even
+when the job creation succeeds.
+
 ## Trigger jobs from Jenkins Sandbox:
 
 Once you push the Jenkins job configuration to the ONAP Sandbox environment,
index 12853a4..2100921 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 12853a424496b5d87c355f32fa27604099a0edbb
+Subproject commit 21009213aa6204bfb40eedc1b11f89a259abd917
index 1bd5189..a5b4bd9 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2
index 1fea53c..209cb0e 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190610-221458.344
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
index 33e096f..edbfd34 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190610-221311.883
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324
 LABELS=centos7-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
index b8b74a8..791a9b6 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS 7 - redis -  - 100680606-6010
+IMAGE_NAME=CentOS 7 - redis -  - 70180101-1009
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v2-highcpu-4
index b3c72a2..37a375a 100644 (file)
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200220-113128.675
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg
deleted file mode 100644 (file)
index f47c417..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20190410-005349.357
-LABELS=ubuntu1604-docker-arm64-4c-2g
-HARDWARE_ID=lf-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
deleted file mode 100644 (file)
index 29b2cd0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721
-LABELS=ubuntu1604-builder-2c-1g
-HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
deleted file mode 100644 (file)
index 8780f95..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721
-LABELS=ubuntu1604-builder-4c-2g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
deleted file mode 100644 (file)
index 48112d5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
-LABELS=ubuntu1604-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
deleted file mode 100644 (file)
index a01f336..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721
-LABELS=ubuntu1604-builder-8c-8g
-HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
deleted file mode 100644 (file)
index 637bf61..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575
-LABELS=ubuntu1604-docker-8c-8g
-HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
deleted file mode 100644 (file)
index c1d860e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575
-LABELS=ubuntu1604-docker-8c-8g
-HARDWARE_ID=v1-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
deleted file mode 100644 (file)
index 81f53c8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm -  - 20190607-124834.118
-LABELS=ubuntu1604-helm-2c-1g
-HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg
deleted file mode 100644 (file)
index ce1244f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - memcached -  - 170580505-5004
-LABELS=ubuntu1604-memcached-4c-4g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
new file mode 100644 (file)
index 0000000..7b9af8f
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200219-191621.319
+LABELS=ubuntu1804-builder-4c-4g
+HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
new file mode 100644 (file)
index 0000000..c4d05ac
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229
+LABELS=ubuntu1804-docker-8c-8g
+HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
new file mode 100644 (file)
index 0000000..5e19001
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+LABELS=ubuntu1804-docker-arm64-4c-2g
+HARDWARE_ID=lf-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
new file mode 100644 (file)
index 0000000..5ece275
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+LABELS=ubuntu1804-docker-arm64-4c-4g
+HARDWARE_ID=lf-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
new file mode 100644 (file)
index 0000000..da8a241
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229
+LABELS=ubuntu1804-docker-v1-8c-8g
+HARDWARE_ID=v1-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
new file mode 100644 (file)
index 0000000..e147067
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20200311-205153.422
+LABELS=ubuntu1804-helm-2c-1g
+HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
new file mode 100644 (file)
index 0000000..6d2f06e
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120380303-3010
+LABELS=ubuntu1804-memcached-4c-4g
+HARDWARE_ID=v2-highcpu-4
index ea6767c..d450c7b 100644 (file)
@@ -1,3 +1,5 @@
+CONTAINER_PULL_REGISTRY=nexus3.onap.org:10003
+CONTAINER_PUSH_REGISTRY=nexus3.onap.org:10002
 DOCKER_REGISTRY=nexus3.onap.org
 DOCKERHUB_REGISTRY=docker.io
 GERRIT_URL=https://gerrit.onap.org/r
@@ -11,7 +13,10 @@ LOGS_SERVER=https://logs.onap.org
 NEXUS_URL=https://nexus.onap.org
 NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
+RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
+RELEASE_USERNAME=onap-release
 SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-release-2018
 SILO=production
 SONAR_URL=https://sonar.onap.org
+MASTER_RTD_PROJECT=doc
index 9fad0a1..412f808 100644 (file)
@@ -1,3 +1,5 @@
+CONTAINER_PULL_REGISTRY=nexus3.onap.org:10003
+CONTAINER_PUSH_REGISTRY=nexus3.onap.org:10002
 DOCKER_REGISTRY=nexus3.onap.org
 DOCKERHUB_REGISTRY=docker.io
 GERRIT_URL=https://gerrit.onap.org/r
@@ -11,7 +13,10 @@ LOGS_SERVER=https://logs.onap.org
 NEXUS_URL=https://nexus.onap.org
 NEXUSPROXY=https://nexus.onap.org
 REGISTRY_PORTS=10001 10002 10003 10004
+RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
+RELEASE_USERNAME=onap-release
 SIGUL_BRIDGE_IP=10.30.104.3
 SIGUL_KEY=onap-test
 SILO=sandbox
 SONAR_URL=https://sonar.onap.org
+MASTER_RTD_PROJECT=doc-test
index 11e33c5..341547a 100644 (file)
@@ -5,6 +5,7 @@
     views:
       - project-view
 
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-authz
     project-name: 'aaf-authz'
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean install'
-          settings: '{mvn-settings}'
-          script:
-            !include-raw-escape: 'build-aaf-docker-image.sh'
-          build-node: 'ubuntu1604-docker-8c-8g'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker'
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+# LF said on 2019-08-01 that this was deprecated
+#      - '{project-name}-{stream}-docker-java-shell-daily':
+#          mvn-goals: 'clean install'
+#          settings: '{mvn-settings}'
+#          script:
+#            !include-raw-escape: 'build-aaf-docker-image.sh'
+#          build-node: ubuntu1804-docker-8c-8g'
     project: 'aaf/authz'
     stream:
       - 'master':
@@ -39,7 +48,7 @@
 #          settings: '{mvn-settings}'
 #          script:
 #            !include-raw-escape: 'build-aaf-docker-image.sh'
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: ubuntu1804-docker-arm64-4c-2g'
 #    project: 'aaf/authz'
 #    stream:
 #      - 'master':
     name: aaf-authz-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aaf/authz'
     project-name: 'aaf-authz'
     branch: 'master'
@@ -76,5 +90,6 @@
     project-name: aaf-authz
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/authz
     branch: master
index 7d61e58..64b3bc3 100644 (file)
@@ -1,4 +1,5 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-cadi
     project-name: 'aaf-cadi'
     name: aaf-cadi-shiro-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aaf/cadi'
     project-name: 'aaf-cadi-shiro'
     branch: 'master'
@@ -38,7 +44,7 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/fproxy/pom.xml'
           mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/cadi'
     docker-image-name: 'onap/fproxy'
     stream:
     name: aaf-cadi-fproxy-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aaf/cadi'
     project-name: 'aaf-cadi-fproxy'
     branch: 'master'
@@ -69,7 +80,7 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/rproxy/pom.xml'
           mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/cadi'
     docker-image-name: 'onap/rproxy'
     stream:
     name: aaf-cadi-rproxy-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aaf/cadi'
     project-name: 'aaf-cadi-rproxy'
     branch: 'master'
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/tproxy-config/pom.xml'
           mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/cadi'
     docker-image-name: 'onap/tproxy-config'
     stream:
     project-name: aaf-cadi
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/cadi
     branch: master
diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml
new file mode 100644 (file)
index 0000000..9f3b179
--- /dev/null
@@ -0,0 +1,15 @@
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
+- project:
+      name: aaf-certservice-csit
+      jobs:
+          - "{project-name}-{stream}-verify-csit-{functionality}"
+          - "{project-name}-{stream}-csit-{functionality}"
+      project-name: "aaf"
+      stream:
+          - "master":
+                branch: "master"
+      functionality:
+          - "certservice":
+                trigger_jobs:
+                    - "aaf-certservice-{stream}-merge-java"
+      robot-options: ""
diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
new file mode 100644 (file)
index 0000000..69a24a8
--- /dev/null
@@ -0,0 +1,64 @@
+---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
+- project:
+    name: aaf-certservice
+    project-name: 'aaf-certservice'
+    stream:
+        -   'master':
+                branch: 'master'
+                java-version: openjdk11
+    project: 'aaf/certservice'
+    mvn-settings: 'aaf-certservice-settings'
+    files: '**'
+    maven-deploy-properties: |
+        deployAtEnd=true
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - '{project-name}-{stream}-verify-java':
+         mvn-goals: 'clean install'
+      - '{project-name}-{stream}-merge-java':
+         mvn-goals: 'clean deploy'
+      -  '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-stage:
+         sign-artifacts: true
+         build-node: centos7-docker-8c-8g
+         maven-versions-plugin: true
+         mvn-goals: 'clean deploy -P docker'
+      - gerrit-maven-docker-stage:
+            build-node: ubuntu1804-docker-8c-8g
+            container-public-registry: 'nexus3.onap.org:10001'
+            container-staging-registry: 'nexus3.onap.org:10003'
+            mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+
+- project:
+    name: aaf-certservice-sonar
+    subproject: 'aaf-certservice-ws'
+    path: 'certService'
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'aaf/certservice'
+    project-name: 'aaf-certservice'
+    branch: 'master'
+    mvn-settings: 'aaf-certservice-settings'
+    mvn-pom: 'certService/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aaf-certservice-info
+    project-name: aaf-certservice
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: aaf/certservice
+    branch: master
diff --git a/jjb/aaf/aaf-csit.yaml b/jjb/aaf/aaf-csit.yaml
deleted file mode 100644 (file)
index 42aefcf..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: aaf-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'aaf'
-    stream: 'master'
-    functionality:
-      - 'aafapi':
-          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
-    robot-options: ''
-    branch: 'master'
index 8733823..8d65de8 100644 (file)
@@ -1,4 +1,5 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-luaplugin-clm
     project-name: 'aaf-luaplugin'
@@ -14,5 +15,6 @@
     project-name: aaf-luaplugin
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/luaplugin
     branch: master
diff --git a/jjb/aaf/aaf-sms-csit.yaml b/jjb/aaf/aaf-sms-csit.yaml
deleted file mode 100644 (file)
index 4e7f3ab..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-  - project:
-      name: aaf-sms-csit
-      jobs:
-        - '{project-name}-{stream}-verify-csit-{functionality}'
-        - '{project-name}-{stream}-csit-{functionality}'
-      project-name: 'aaf'
-      stream: 'master'
-      functionality:
-        - 'sms-test-plan':
-            trigger_jobs: 'aaf-sms-master-docker-golang-shell-daily'
-      robot-options: ''
-      branch: 'master'
index 999fc03..62ed2fd 100644 (file)
@@ -1,4 +1,5 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-sms
     project-name: 'aaf-sms'
@@ -6,6 +7,8 @@
     path: 'sms-service/src'
     golangver: 'golang111'
     jobs:
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
       - gerrit-maven-stage:
     mvn-settings: 'aaf-sms-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aaf-sms-info
     project-name: aaf-sms
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/sms
     branch: master
index 31e7006..b3a45fb 100644 (file)
@@ -1,4 +1,5 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-sshsm
     project-name: 'aaf-sshsm'
     mvn-settings: 'aaf-sshsm-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aaf-sshsm-info
     project-name: aaf-sshsm
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/sshsm
     branch: master
index 20ddbae..4a68af1 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/aai-common'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+          mvn-params: '-P spring-boot-2-1'
+      - 'frankfurt':
+          branch: 'frankfurt'
+          mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-aai-common-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     branch: 'master'
+    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
+    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
 
     project-name: aai-aai-common
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/aai-common
     branch: master
+
+- project:
+    name: 'aai-aai-common-docker'
+    jobs:
+      - '{project-name}-{stream}-verify-docker'
+      - '{project-name}-{stream}-merge-docker'
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+    project-name: 'aai-aai-common'
+    project: 'aai/aai-common'
+    stream:
+      - 'master':
+          branch: 'master'
+          distro: 'alpine'
+          mvn-params: '-P spring-boot-2-1'
+    docker_name: 'onap/aai-common-{distro}'
+    docker_build_args: '-f ./Dockerfile.{distro}'
+    docker_root: '$WORKSPACE/Dockerfiles/aai-common/'
+    mvn-settings: 'aai-aai-common-settings'
+    mvn-version: 'mvn35'
+    files: 'Dockerfiles/aai-common/**'
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: 'aai-aai-common-whitesource'
+    project-name: 'aai-aai-common'
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-params: '-P spring-boot-2-1'
+    mvn-settings: 'aai-aai-common-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/aai-common'
+    branch: master
index 86e587d..13799a5 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          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'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/babel'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-babel-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/babel'
     project-name: 'aai-babel'
     branch: 'master'
@@ -48,8 +59,8 @@
     project: 'aai/babel'
     project-name: 'aai-babel'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-babel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -59,5 +70,6 @@
     project-name: aai-babel
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/babel
     branch: master
index 3dc5d77..ec4b2bd 100644 (file)
@@ -5,30 +5,40 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/cacher'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-cacher-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/cacher'
     project-name: 'aai-cacher'
     branch: 'master'
@@ -45,8 +55,8 @@
     project: 'aai/cacher'
     project-name: 'aai-cacher'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
 
@@ -56,5 +66,6 @@
     project-name: aai-cacher
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/cacher
     branch: master
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
deleted file mode 100644 (file)
index a0bd8f3..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
----
-- project:
-    name: aai-chameleon-project-view
-    project-name: aai-chameleon
-    views:
-      - project-view
-
-- project:
-    name: aai-chameleon
-    project-name: 'aai-chameleon'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'clean package dockerfile:build dockerfile:push'
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'aai/chameleon'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-chameleon-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: aai-chameleon-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/chameleon'
-    project-name: 'aai-chameleon'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'aai-chameleon-settings'
-
-- project:
-    name: aai-chameleon-info
-    project-name: aai-chameleon
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/chameleon
-    branch: master
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
deleted file mode 100644 (file)
index e583e85..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- project:
-    name: aai-champ-project-view
-    project-name: aai-champ
-    views:
-      - project-view
-
-- project:
-    name: aai-champ
-    project-name: 'aai-champ'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'champ-service/pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'aai/champ'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'aai-champ-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: aai-champ-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aai/champ'
-    project-name: 'aai-champ'
-    branch: 'master'
-    mvn-settings: 'aai-champ-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-champ-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/champ'
-    project-name: 'aai-champ'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'aai-champ-settings'
-
-- project:
-    name: aai-champ-info
-    project-name: aai-champ
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/champ
-    branch: master
diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
deleted file mode 100644 (file)
index 4e9c16c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- project:
-    name: aai-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'aai'
-    stream:
-      - 'master':
-          branch: master
-    functionality:
-      - 'resources':
-          trigger_jobs: 'aai-resources-{stream}-aai-docker-java-daily'
-      - 'traversal':
-          trigger_jobs: 'aai-traversal-{stream}-aai-docker-java-daily'
-      - 'esr-server':
-          trigger_jobs: 'aai-esr-server-{stream}-docker-java-daily'
-    robot-options: ''
-
index fa6dea7..823dab7 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -B -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/data-router'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-data-router-settings'
     name: aai-data-router-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/data-router'
     project-name: 'aai-data-router'
     branch: 'master'
@@ -47,8 +58,8 @@
     project: 'aai/data-router'
     project-name: 'aai-data-router'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-data-router-settings'
 
 - project:
@@ -56,5 +67,6 @@
     project-name: aai-data-router
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/data-router
     branch: master
index a2920fe..ae853d5 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-f distribution/pom.xml -P docker docker:build -B -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/esr-gui'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-esr-gui-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-esr-gui-clm
@@ -36,8 +43,8 @@
     project: 'aai/esr-gui'
     project-name: 'aai-esr-gui'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-esr-gui-settings'
 
 - project:
@@ -45,5 +52,6 @@
     project-name: aai-esr-gui
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/esr-gui
     branch: master
index 5cee139..1c8b961 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-f standalone/pom.xml -P docker docker:build -B -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/esr-server'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-esr-server-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-esr-server-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/esr-server'
     project-name: 'aai-esr-server'
     branch: 'master'
@@ -49,8 +61,8 @@
     project: 'aai/esr-server'
     project-name: 'aai-esr-server'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-esr-server-settings'
 
 - project:
@@ -58,5 +70,6 @@
     project-name: aai-esr-server
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/esr-server
     branch: master
index 5b8efe5..08ccd0e 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/event-client'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-event-client-settings'
     name: aai-event-client-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/event-client'
     project-name: 'aai-event-client'
     branch: 'master'
@@ -43,8 +53,8 @@
     project: 'aai/event-client'
     project-name: 'aai-event-client'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-event-client-settings'
 
 - project:
@@ -52,5 +62,6 @@
     project-name: aai-event-client
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/event-client
     branch: master
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
deleted file mode 100644 (file)
index ef82b0c..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
-    name: aai-gallifrey
-    project-name: 'aai-gallifrey'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'clean package dockerfile:build dockerfile:push'
-          build-node: 'ubuntu1604-docker-8c-8g'
-    project: 'aai/gallifrey'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gallifrey-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: aai-gallifrey-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/gallifrey'
-    project-name: 'aai-gallifrey'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'aai-gallifrey-settings'
-
-- project:
-    name: aai-gallifrey-info
-    project-name: aai-gallifrey
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/gallifrey
-    branch: master
diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
deleted file mode 100644 (file)
index 2f2c881..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- project:
-    name: aai-gizmo-project-view
-    project-name: aai-gizmo
-    views:
-      - project-view
-
-- project:
-    name: aai-gizmo
-    project-name: 'aai-gizmo'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'aai/gizmo'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gizmo-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: aai-gizmo-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aai/gizmo'
-    project-name: 'aai-gizmo'
-    branch: 'master'
-    mvn-settings: 'aai-gizmo-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-gizmo-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/gizmo'
-    project-name: 'aai-gizmo'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'aai-gizmo-settings'
-
-- project:
-    name: aai-gizmo-info
-    project-name: aai-gizmo
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/gizmo
-    branch: master
index e44d769..1278ed6 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/graphadmin'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-graphadmin-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
     branch: 'master'
@@ -51,8 +61,8 @@
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
 
@@ -61,5 +71,6 @@
     project-name: aai-graphadmin
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/graphadmin
     branch: master
index 278b1ee..a6a182a 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
-
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/graphgraph'
     stream:
       - 'master':
@@ -31,5 +35,7 @@
     project-name: aai-graphgraph
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/graphgraph
     branch: master
+
index b4383aa..c1cdbe4 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/logging-service'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
     name: aai-logging-service-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/logging-service'
     project-name: 'aai-logging-service'
     branch: 'master'
@@ -43,8 +53,8 @@
     project: 'aai/logging-service'
     project-name: 'aai-logging-service'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
 
 - project:
@@ -52,5 +62,6 @@
     project-name: aai-logging-service
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/logging-service
     branch: master
index e525772..84e2a3e 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -B -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/model-loader'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-model-loader-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     branch: 'master'
@@ -48,8 +59,8 @@
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
 
 - project:
     project-name: aai-model-loader
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/model-loader
     branch: master
+
+- project:
+    name: 'aai-model-loader-whitesource'
+    project-name: 'aai-model-loader'
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-model-loader-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/model-loader'
+    branch: master
index 816ecff..9b92ea1 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
+
     mvn-settings: 'aai-oom-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-helm-2c-1g
+    build-node: ubuntu1804-helm-2c-1g
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
         #!/bin/bash
index d5d5c2a..fee95b4 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'aai-resources/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/resources'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-resources-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/resources'
     project-name: 'aai-resources'
     branch: 'master'
@@ -51,8 +61,8 @@
     project: 'aai/resources'
     project-name: 'aai-resources'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
 
     project-name: aai-resources
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/resources
     branch: master
+
+- project:
+    name: 'aai-resources-whitesource'
+    project-name: 'aai-resources'
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-resources-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/resources'
+    branch: master
index 3136efe..c641d98 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/rest-client'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
     name: aai-rest-client-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/rest-client'
     project-name: 'aai-rest-client'
     branch: 'master'
@@ -43,8 +53,8 @@
     project: 'aai/rest-client'
     project-name: 'aai-rest-client'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
 
 - project:
@@ -52,5 +62,6 @@
     project-name: aai-rest-client
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/rest-client
     branch: master
index 2816f3f..316c5dd 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/router-core'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-router-core-settings'
     name: aai-router-core-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/router-core'
     project-name: 'aai-router-core'
     branch: 'master'
@@ -43,8 +53,8 @@
     project: 'aai/router-core'
     project-name: 'aai-router-core'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-router-core-settings'
 
 - project:
@@ -52,5 +62,6 @@
     project-name: aai-router-core
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/router-core
     branch: master
index 6868acf..24c640e 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'aai-schema-service/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/schema-service'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-schema-service-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
     branch: 'master'
@@ -49,8 +61,8 @@
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn35'
 
@@ -59,5 +71,6 @@
     project-name: aai-schema-service
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/schema-service
     branch: master
index e5ae2e6..1d68ea5 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'search-data-service-app/pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/search-data-service'
     docker-image-name: 'onap/search-data-service'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
     name: aai-search-data-service-searchguard
     project-name: 'aai-search-data-service-searchguard'
     jobs:
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'elasticsearch-sg/pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     project: 'aai/search-data-service'
     docker-image-name: 'onap/elasticsearch-sg'
     stream:
     name: aai-search-data-service-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/search-data-service'
     project-name: 'aai-search-data-service'
     branch: 'master'
@@ -65,8 +77,8 @@
     project: 'aai/search-data-service'
     project-name: 'aai-search-data-service'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
 
 - project:
     project-name: aai-search-data-service
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/search-data-service
     branch: master
+
+- project:
+    name: 'aai-search-data-service-whitesource'
+    project-name: 'aai-search-data-service'
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-search-data-service-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/search-data-service'
+    branch: master
index be35736..49c9941 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'sparkybe-onap-application/pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          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'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/sparky-be'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
     name: aai-sparky-be-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/sparky-be'
     project-name: 'aai-sparky-be'
     branch: 'master'
@@ -47,8 +58,8 @@
     project: 'aai/sparky-be'
     project-name: 'aai-sparky-be'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
 
 - project:
     project-name: aai-sparky-be
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/sparky-be
     branch: master
+
+- project:
+    name: 'aai-sparky-be-whitesource'
+    project-name: 'aai-sparky-be'
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-sparky-be-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/sparky-be'
+    branch: master
index c75d5bf..4ac85e0 100644 (file)
@@ -6,11 +6,15 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          build-node: ubuntu1804-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/sparky-fe'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-fe-settings'
     project-name: aai-sparky-fe
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/sparky-fe
     branch: master
+
+- project:
+    name: aai-sparky-fe-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-builder-4c-4g
+    project: 'aai/sparky-fe'
+    project-name: 'aai-sparky-fe'
+    branch: 'master'
+    mvn-settings: 'aai-sparky-be-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
deleted file mode 100644 (file)
index 663240d..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- project:
-    name: aai-spike-project-view
-    project-name: aai-spike
-    views:
-      - project-view
-
-- project:
-    name: aai-spike
-    project-name: 'aai-spike'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'aai/spike'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-spike-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: aai-spike-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aai/spike'
-    project-name: 'aai-spike'
-    branch: 'master'
-    mvn-settings: 'aai-spike-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-spike-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/spike'
-    project-name: 'aai-spike'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'aai-spike-settings'
-
-- project:
-    name: aai-spike-info
-    project-name: aai-spike
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/spike
-    branch: master
index 8c64aa0..b6178bb 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'aai-traversal/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/traversal'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-traversal-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/traversal'
     project-name: 'aai-traversal'
     branch: 'master'
@@ -51,8 +61,8 @@
     project: 'aai/traversal'
     project-name: 'aai-traversal'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
 
@@ -61,5 +71,6 @@
     project-name: aai-traversal
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/traversal
     branch: master
index c740de7..2fab17b 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          mvn-params: 'docker:build -B -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/validation'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-validation-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: aai-validation-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/validation'
     project-name: 'aai-validation'
     branch: 'master'
@@ -48,8 +59,8 @@
     project: 'aai/validation'
     project-name: 'aai-validation'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'aai-validation-settings'
 
 
@@ -58,5 +69,6 @@
     project-name: aai-validation
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/validation
     branch: master
index d66a902..8a3f8e8 100644 (file)
@@ -9,17 +9,17 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'appc/cdt'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: appc-cdt-clm
@@ -37,5 +37,6 @@
     project-name: appc-cdt
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc/cdt
     branch: master
index 7e8dfa3..11bc579 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'appc'
+    recipients: 'tc012c@att.com'
     stream:
       - 'master':
           branch: 'master'
index 220e3cf..4fdbb66 100644 (file)
@@ -6,43 +6,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-docker-image-blessing'
 
     project: 'appc/deployment'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'appc-deployment-settings'
+    maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: appc-deployment-arm64
-#    project-name: 'appc-deployment-arm64'
-#    jobs:
-#      - '{project-name}-docker-image-blessing'
-#
-#    project: 'appc/deployment'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'appc-deployment-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    docker-pom: 'pom.xml'
-#    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
-#
 - project:
     name: appc-deployment-docker
     project-name: 'appc-deployment'
           mvn-params: '-Dmaven.test.skip=true'
       - 'docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-versions-plugin: true
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'appc/deployment'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'appc-deployment-settings'
+    maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 #- project:
 #    name: appc-deployment-arm64-docker
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: appc-deployment-info
     project-name: appc-deployment
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc/deployment
     branch: master
index 71e3700..2c226c7 100644 (file)
@@ -4,37 +4,50 @@
     project-name: 'appc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - '{project-name}-{stream}-merge-java':
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily':
-          build-node: ubuntu1604-builder-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
 
     project: 'appc'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'appc-settings'
+    maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: appc-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'appc'
     project-name: 'appc'
     branch: 'master'
     mvn-settings: 'appc-settings'
+    maven-version: "mvn35"
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx4096m'
 
       - gerrit-maven-clm:
           mvn-params: '-DskipTests'
           build-timeout: 60
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
     nexus-iq-namespace: 'onap-'
     project: 'appc'
     project-name: 'appc'
     branch: 'master'
     mvn-settings: 'appc-settings'
+    maven-version: "mvn35"
 
 - project:
     name: appc-info
     project-name: appc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc
     branch: master
index efb25d0..2ada1b0 100644 (file)
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'appc/parent'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'appc-parent-settings'
-    build-node: ubuntu1604-builder-2c-1g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: appc-parent-info
     project-name: appc-parent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc/parent
     branch: master
index 6995850..c6c3f56 100644 (file)
@@ -9,19 +9,29 @@
     name: ccsdk-apps
     project-name: 'ccsdk-apps'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          sign-artifacts: true
+          cron: ''
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+          cron: '@daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
     project: 'ccsdk/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-apps-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-apps-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-apps-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-apps-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: ccsdk-apps-docker
-    project-name: 'ccsdk-apps'
-    jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'ccsdk/apps'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'ccsdk-apps-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: queue-docker-4c-4g
-#
 #- project:
 #    name: ccsdk-apps-arm64-docker
 #    project-name: 'ccsdk-apps-arm64'
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: ccsdk-apps-info
     project-name: ccsdk-apps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/apps
+    branch: master
+
+- project:
+    name: ccsdk-apps-whitesource
+    project-name: ccsdk-apps
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-apps-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/apps
     branch: master
index 40d7500..fcb1289 100644 (file)
@@ -5,11 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'ccsdk'
+    recipients: 'dtimoney@att.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
index 4217854..beb0c17 100644 (file)
@@ -3,19 +3,33 @@
     name: ccsdk-cds
     project-name: 'ccsdk-cds'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          sign-artifacts: true
+          maven-versions-plugin: true
+          cron: ''
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+          maven-versions-plugin: true
+          cron: '@daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
     project: 'ccsdk/cds'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-cds-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-cds-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-cds-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-cds-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: ccsdk-cds-docker
-    project-name: 'ccsdk-cds'
-    jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'ccsdk/cds'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'ccsdk-cds-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: queue-docker-4c-4g
 
 - project:
     name: ccsdk-cds-info
     project-name: ccsdk-cds
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/cds
+    branch: master
+
+- project:
+    name: ccsdk-cds-whitesource
+    project-name: ccsdk-cds
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-cds-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/cds
     branch: master
index c3f6d0e..353ee2d 100644 (file)
@@ -3,18 +3,27 @@
     name: ccsdk-dashboard
     project-name: 'ccsdk-dashboard'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          cron: ''
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+          maven-versions-plugin: true
+          cron: '@daily'
 
     project: 'ccsdk/dashboard'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-dashboard-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-dashboard-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'ccsdk/dashboard'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-dashboard-settings'
     build-node: centos7-redis-4c-4g
 
 - project:
-    name: ccsdk-dashboard-docker
-    project-name: 'ccsdk-dashboard'
+    name: ccsdk-dashboard-info
+    project-name: ccsdk-dashboard
     jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'ccsdk/dashboard'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/dashboard
+    branch: master
+
+- project:
+    name: ccsdk-dashboard-whitesource
+    project-name: ccsdk-dashboard
+    jobs:
+      - gerrit-whitesource-scan
     mvn-settings: 'ccsdk-dashboard-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: queue-docker-4c-4g
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/dashboard
+    branch: master
index 31751b4..be94c4f 100644 (file)
@@ -3,43 +3,40 @@
     name: ccsdk-distribution
     project-name: 'ccsdk-distribution'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
-    sign-artifacts: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          cron: ''
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+          maven-versions-plugin: true
+          cron: '@daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
-- project:
-    name: ccsdk-distribution-docker
-    project-name: 'ccsdk-distribution'
-    jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'ccsdk/distribution'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'ccsdk-distribution-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: queue-docker-4c-4g
 
 #- project:
 #    name: ccsdk-distribution-arm64-docker
@@ -56,7 +53,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: ccsdk-distribution-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-distribution-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 
 - project:
     project-name: ccsdk-distribution
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/distribution
+    branch: master
+
+- project:
+    name: ccsdk-distribution-whitesource
+    project-name: ccsdk-distribution
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-whitesource-scan:
+          java-opts: '-Xmx2048m'
+    mvn-settings: 'ccsdk-distribution-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/distribution
     branch: master
index a9ef4b4..17dd0b4 100644 (file)
@@ -3,19 +3,22 @@
     name: ccsdk-features
     project-name: 'ccsdk-features'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          sign-artifacts: true
+          cron: ''
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
     project: 'ccsdk/features'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-features-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-features-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/features'
     project-name: 'ccsdk-features'
     branch: 'master'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-features-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-features-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: ccsdk-features-info
     project-name: ccsdk-features
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/features
+    branch: master
+
+- project:
+    name: ccsdk-features-whitesource
+    build-node: ubuntu1804-builder-4c-4g
+    project-name: ccsdk-features
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-features-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     project: ccsdk/features
     branch: master
index bdfa9a3..0d3a3ee 100644 (file)
@@ -3,19 +3,24 @@
     name: ccsdk-parent
     project-name: 'ccsdk-parent'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          sign-artifacts: true
+          cron: ''
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     project: 'ccsdk/parent'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-parent-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -24,6 +29,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-parent-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-parent-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
     project-name: ccsdk-parent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/parent
+    branch: master
+
+- project:
+    name: ccsdk-parent-whitesource
+    project-name: ccsdk-parent
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-parent-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/parent
     branch: master
index a375204..6a943f0 100644 (file)
@@ -3,19 +3,20 @@
     name: ccsdk-platform-plugins
     project-name: 'ccsdk-platform-plugins'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          sign-artifacts: true
+          cron: ''
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
     project: 'ccsdk/platform/plugins'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-platform-plugins-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-platform-plugins-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'ccsdk/platform/plugins'
@@ -49,8 +57,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-platform-plugins-settings'
     build-node: centos7-redis-4c-4g
 
     project-name: ccsdk-platform-plugins
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/platform/plugins
+    branch: master
+
+- project:
+    name: ccsdk-platform-plugins-whitesource
+    project-name: ccsdk-platform-plugins
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-platform-plugins-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/platform/plugins
     branch: master
index cbc35ea..ad92332 100644 (file)
@@ -3,19 +3,25 @@
     name: ccsdk-sli-adaptors
     project-name: 'ccsdk-sli-adaptors'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          sign-artifacts: true
+          cron: ''
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-site-id: ecomp-site
+          javadoc-path: org.onap.$PROJECT/$STREAM
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
     project: 'ccsdk/sli/adaptors'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-sli-adaptors-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/sli/adaptors'
     project-name: 'ccsdk-sli-adaptors'
     branch: 'master'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-adaptors-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
     project-name: ccsdk-sli-adaptors
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/sli/adaptors
+    branch: master
+
+- project:
+    name: ccsdk-sli-adaptors-whitesource
+    build-node: ubuntu1804-builder-4c-4g
+    project-name: ccsdk-sli-adaptors
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-sli-adaptors-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/sli/adaptors
     branch: master
index 3f17f54..0fc6d6c 100644 (file)
@@ -3,19 +3,25 @@
     name: ccsdk-sli-core
     project-name: 'ccsdk-sli-core'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          sign-artifacts: true
+          cron: ''
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-site-id: ecomp-site
+          javadoc-path: org.onap.$PROJECT/$STREAM
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
     project: 'ccsdk/sli/core'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-core-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-sli-core-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/sli/core'
     project-name: 'ccsdk-sli-core'
     branch: 'master'
     mvn-settings: 'ccsdk-sli-core-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-core-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-core-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
     project-name: ccsdk-sli-core
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/sli/core
+    branch: master
+
+- project:
+    name: ccsdk-sli-core-whitesource
+    project-name: ccsdk-sli-core
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-sli-core-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/sli/core
     branch: master
index 73b9a12..d130cb1 100644 (file)
@@ -3,19 +3,25 @@
     name: ccsdk-sli-northbound
     project-name: 'ccsdk-sli-northbound'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          cron: ''
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-site-id: ecomp-site
+          javadoc-path: org.onap.$PROJECT/$STREAM
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     sign-artifacts: true
     project: 'ccsdk/sli/northbound'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-sli-northbound-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/sli/northbound'
     project-name: 'ccsdk-sli-northbound'
     branch: 'master'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-northbound-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-northbound-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
     project-name: ccsdk-sli-northbound
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/sli/northbound
+    branch: master
+
+- project:
+    name: ccsdk-sli-northbound-whitesource
+    project-name: ccsdk-sli-northbound
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-sli-northbound-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/sli/northbound
     branch: master
index 81efcaf..4f99ad8 100644 (file)
@@ -3,19 +3,25 @@
     name: ccsdk-sli-plugins
     project-name: 'ccsdk-sli-plugins'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          sign-artifacts: true
+          cron: ''
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-site-id: ecomp-site
+          javadoc-path: org.onap.$PROJECT/$STREAM
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
     project: 'ccsdk/sli/plugins'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-sli-plugins-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/sli/plugins'
     project-name: 'ccsdk-sli-plugins'
     branch: 'master'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-plugins-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-plugins-settings'
+    maven-version: "mvn35"
 
 
 - project:
     project-name: ccsdk-sli-plugins
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/sli/plugins
+    branch: master
+
+- project:
+    name: ccsdk-sli-plugins-whitesource
+    project-name: ccsdk-sli-plugins
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-sli-plugins-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/sli/plugins
     branch: master
index 3d0651c..3486a30 100644 (file)
@@ -3,19 +3,20 @@
     name: ccsdk-utils
     project-name: 'ccsdk-utils'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          sign-artifacts: true
+          cron: ''
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
-    sign-artifacts: true
     project: 'ccsdk/utils'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-utils-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -24,6 +25,8 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-utils-clm
@@ -35,8 +38,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'ccsdk-utils-settings'
 
 
     project-name: ccsdk-utils
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ccsdk/utils
+    branch: master
+
+- project:
+    name: ccsdk-utils-whitesource
+    project-name: ccsdk-utils
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-utils-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
     project: ccsdk/utils
     branch: master
index bf0fd15..c9a8f5e 100644 (file)
     node: '{build-node}'
     branch: master
     build-days-to-keep: 7
-    build-timeout: 60
+    build-timeout: 240
     cron: '@daily'
     disabled: false
+    dry-run: false
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
     coverity-project-name: ''
     coverity-token: ''
     coverity-user-email: ''
+    coverity-search-paths: ''
+    coverity-search-exclude-regexs: ''
+    max-git-repo-age-hours: 0
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
     submodule-disable: false
     archive-artifacts: >
-      **/*.log
-      **/hs_err_*.log
-      **/target/**/feature.xml
-      **/target/failsafe-reports/failsafe-summary.xml
-      **/target/surefire-reports/*-output.txt
-      **/cov-int/build-log.txt
-      **/cov-int/build-timings.txt
+      cov-int/BUILD.metrics.xml
+      cov-int/build-log.txt
+      cov-int/build-timings.txt
+      cov-int/cov-import-scm-timings.txt
+      cov-int/coverity-scan-analysed-files.txt
+      cov-int/scm-untracked-files.txt
+      cov-int/failed_jsp/*
+      cov-int/java-security-da-input.dat
+      cov-int/java-security-da-whitelist.dat
+      cov-int/jsp-compilation-log.txt
+      cov-int/jsp-debug-log.txt
+      cov-int/security.log
 
     properties:
       - lf-infra-properties:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - string:
+          name: SEARCH_PATHS
+          default: '{coverity-search-paths}'
+          description: >
+            Additional directories to search for files to analyse by Coverity
+            Scan service (space separated).
+      - string:
+          name: SEARCH_EXCLUDE_REGEXS
+          default: '{coverity-search-exclude-regexs}'
+          description: >
+            File path patterns to exclude from analysis by Coverity Scan
+            service (e.g. 3rd-party or auto-generated sources, space
+            separated).
+      - string:
+          name: COVERITY_USER_EMAIL
+          default: '{coverity-user-email}'
+          description: >
+            E-mail address to receive analysis status report after submittion.
+            It must be a registered user on Coverity Scan service added as a
+            member to appropriate Coverity Scan project with "Maintainer/Owner"
+            role.
+      - bool:
+          name: DRY_RUN
+          default: '{dry-run}'
+          description: Do not submit results to Coverity Scan server at the end of the build.
+      - string:
+          name: 'MAX_GIT_REPO_AGE_HOURS'
+          default: '{max-git-repo-age-hours}'
+          description: >
+            If set to non-zero run the code scan only if there were no git
+            repository commits last MAX_GIT_REPO_AGE_HOURS hours.
+            It makes sense to set the value twice the 'cron' interval for the
+            job (e.g. if 'cron: @daily', then MAX_GIT_REPO_AGE_HOURS=48)
 
     triggers:
       - timed: '{obj:cron}'
           properties-content: |
             COVERITY_PROJECT_NAME={coverity-project-name}
             COVERITY_TOKEN={coverity-token}
-            COVERITY_USER_EMAIL={coverity-user-email}
       - shell: !include-raw-escape:
           - ../../global-jjb/shell/common-variables.sh
           - ../../shell/maven-coverity.sh
index 44b80be..79b4853 100644 (file)
@@ -14,8 +14,7 @@
 
     platforms:
       - centos-7
-      - ubuntu-16.04
-      - ubuntu-16.04-arm64
+      - ubuntu-18.04
     templates: builder
 
 - project:
@@ -33,8 +32,8 @@
 
     platforms:
       - centos-7
-      - ubuntu-16.04
-      - ubuntu-16.04-arm64
+      - ubuntu-18.04-arm64
+      - ubuntu-18.04
     templates: docker
 
 - project:
@@ -51,7 +50,7 @@
     build-timeout: 90
 
     platforms:
-      - ubuntu-16.04
+      - ubuntu-18.04
     templates: memcached
 
 - project:
@@ -83,6 +82,5 @@
     build-node: centos7-builder-2c-1g
 
     platforms:
-      - ubuntu-16.04
+      - ubuntu-18.04
     templates: helm
-
index 2ad55f0..dfab260 100644 (file)
@@ -81,7 +81,7 @@
       - csit-view
     view-name: CSIT
     view-description: 'List of CSIT jobs'
-    view-regex: '^.*-csit-.*'
+    view-regex: '^(?=.*-csit-.*)(?!.*-verify-csit.*).*'
 
 - project:
     name: CSIT-Verify
     view-name: Verify-Jobs
     view-description: 'List of Verify jobs'
     view-regex: '^.*-verify-.*'
+
+- project:
+    name: WhiteSource
+    views:
+      - common-view
+    view-name: WhiteSource
+    view-description: 'List of WhiteSource jobs'
+    view-regex: '.*-whitesource-.*'
index 3c25793..61f7bd8 100644 (file)
@@ -5,11 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'clamp'
+    recipients: 'gervais-martial.ngueko@intl.att.com'
     stream:
         - 'master':
               branch: 'master'
-        - 'dublin':
-              branch: 'dublin'
     functionality:
       - 'APIs':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
index b1322f6..b148414 100644 (file)
     project-name: 'clamp'
     jobs:
       - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
          mvn_properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-release-java-daily-checkstyle':
-         setVersion: 'DoSetVersion'
-         mvn_properties:
-          - docker.pull.registry=nexus3.onap.org:10001
-      - '{project-name}-{stream}-docker-java-properties-daily':
-         setVersion: 'DoSetVersion'
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-Dmaven.test.skip=true'
-         maven-properties: |
-          clamp.registry=$
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'clamp'
     stream:
         - 'master':
               branch: 'master'
-        - 'dublin':
-              branch: 'dublin'
+        - 'elalto':
+              branch: 'elalto'
     mvn-settings: 'clamp-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: clamp-sonar
     jobs:
       - gerrit-maven-sonar:
           mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'clamp'
     project-name: 'clamp'
     branch: 'master'
     mvn-settings: 'clamp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: clamp-clm
     project-name: 'clamp'
     branch: 'master'
     mvn-settings: 'clamp-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     build-timeout: 120
+    java-version: openjdk11
 
 - project:
     name: clamp-info
     project-name: clamp
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: clamp
     branch: master
diff --git a/jjb/clamp/dashboard/clamp-dashboard.yaml b/jjb/clamp/dashboard/clamp-dashboard.yaml
new file mode 100644 (file)
index 0000000..ce70c19
--- /dev/null
@@ -0,0 +1,72 @@
+---
+- project:
+    name: clamp-dashboard-project-view
+    project-name: clamp-dashboard
+    views:
+      - project-view
+
+- project:
+    name: clamp-dashboard
+    project-name: 'clamp-dashboard'
+    jobs:
+      - gerrit-maven-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+      - '{project-name}-{stream}-verify-java-checkstyle':
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+      - '{project-name}-{stream}-merge-properties-java':
+         mvn_properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'clamp/dashboard'
+    stream:
+        - 'master':
+              branch: 'master'
+    mvn-settings: 'clamp-settings'
+    java-version: openjdk11
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+#- project:
+#    name: clamp-dashboard-sonar
+#    jobs:
+#      - gerrit-maven-sonar:
+#          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+#    sonarcloud: true
+#    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+#    sonarcloud-api-token: '{sonarcloud_api_token}'
+#    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+#    sonar-mvn-goal: '{sonar_mvn_goal}'
+#    cron: '@daily'
+#    build-node: ubuntu1804-docker-8c-8g
+#    project: 'clamp/dashboard'
+#    project-name: 'clamp-dashboard'
+#    branch: 'master'
+#    mvn-settings: 'clamp-settings'
+#    mvn-goals: 'clean install'
+#    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+#    java-version: openjdk11
+#
+- project:
+    name: clamp-dashboard-clm
+    jobs:
+      - gerrit-maven-clm:
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    nexus-iq-namespace: 'onap-'
+    project: 'clamp/dashboard'
+    project-name: 'clamp-dashboard'
+    branch: 'master'
+    mvn-settings: 'clamp-settings'
+    build-node: ubuntu1804-docker-8c-8g
+    build-timeout: 120
+    java-version: openjdk11
diff --git a/jjb/clamp/dashboard/info-clamp-dashboard.yaml b/jjb/clamp/dashboard/info-clamp-dashboard.yaml
new file mode 100644 (file)
index 0000000..efff6fc
--- /dev/null
@@ -0,0 +1,9 @@
+---
+- project:
+    name: clamp-dashboard-info
+    project-name: clamp-dashboard
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: clamp/dashboard
+    branch: master
diff --git a/jjb/clamp/ui/info-clamp-ui.yaml b/jjb/clamp/ui/info-clamp-ui.yaml
new file mode 100644 (file)
index 0000000..c532356
--- /dev/null
@@ -0,0 +1,9 @@
+---
+- project:
+    name: clamp-ui-info
+    project-name: clamp-ui
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: clamp/ui
+    branch: master
index 418ca65..4d1f3de 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          sign-artifacts: true
+          build-node: centos7-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'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'deployment/docker/pom.xml'
           mvn-goals: 'docker:build'
           docker-image-name: 'onap/cli'
-          build-node: ubuntu1604-docker-8c-8g
-
+          build-node: ubuntu1804-docker-8c-8g
     project: 'cli'
     stream:
       - 'master':
@@ -25,7 +36,7 @@
     mvn-settings: 'cli-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: cli-arm64
 #    mvn-settings: 'cli-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: cli-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'cli'
     project-name: 'cli'
     branch: 'master'
     project-name: 'cli'
     branch: 'master'
     mvn-settings: 'cli-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: cli-info
     project-name: cli
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: cli
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
new file mode 100644 (file)
index 0000000..9d76d41
--- /dev/null
@@ -0,0 +1,9 @@
+---
+- project:
+    name: dcaegen2-analytics-flink-info
+    project-name: dcaegen2-analytics-flink
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: dcaegen2/analytics/flink
+    branch: master
index f5d60d8..4e65ab9 100644 (file)
@@ -13,7 +13,7 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-v1-8c-8g'
+    build-node: 'ubuntu1804-docker-v1-8c-8g'
     build-timeout: 300
     jobs:
       - '{project-name}-{stream}-verify-java'
     name: dcaegen2-analytics-pnda-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/analytics/pnda'
     project-name: 'dcaegen2-analytics-pnda'
     branch: 'master'
@@ -38,7 +43,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/analytics/pnda
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project-name: 'dcaegen2-analytics-pnda'
     branch: 'master'
     mvn-settings: 'dcaegen2-analytics-pnda-settings'
@@ -48,5 +53,6 @@
     project-name: dcaegen2-analytics-pnda
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/analytics/pnda
     branch: master
index 6d0d2dc..4c626e9 100644 (file)
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean install'
-      - '{project-name}-{stream}-docker-java-shell-daily':
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean deploy docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
-
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
 - project:
     name: dcaegen2-analytics-tca-gen2-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/analytics/tca-gen2'
     project-name: 'dcaegen2-analytics-tca-gen2'
     branch: 'master'
@@ -43,7 +53,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/analytics/tca-gen2
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-analytics-tca-gen2'
     branch: 'master'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
@@ -53,5 +63,6 @@
     project-name: dcaegen2-analytics-tca-gen2
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/analytics/tca-gen2
     branch: master
index d32d4b9..bcb4f91 100644 (file)
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/analytics/tca'
     mvn-settings: 'dcaegen2-analytics-tca-settings'
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     jobs:
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
           mvn-params: '-DskipTests=true'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-DskipTests=true'
 
 - project:
     name: dcaegen2-analytics-tca-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/analytics/tca'
     project-name: 'dcaegen2-analytics-tca'
     branch: 'master'
@@ -45,7 +54,7 @@
     project: 'dcaegen2/analytics/tca'
     project-name: 'dcaegen2-analytics-tca'
     branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-settings: 'dcaegen2-analytics-tca-settings'
 
 - project:
@@ -53,5 +62,6 @@
     project-name: dcaegen2-analytics-tca
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/analytics/tca
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml
new file mode 100644 (file)
index 0000000..80ac689
--- /dev/null
@@ -0,0 +1,9 @@
+---
+- project:
+    name: dcaegen2-analytics-info
+    project-name: dcaegen2-analytics
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: dcaegen2/analytics
+    branch: master
index 6740dae..47c31a6 100644 (file)
@@ -4,11 +4,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2-collectors-datafile'
+    recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'ManagementInterface-suite':
           trigger_jobs:
@@ -17,4 +16,4 @@
           trigger_jobs:
            - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'
index 7f06524..3231fae 100644 (file)
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
       - '{project-name}-{stream}-verify-java':
           mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
     name: dcaegen2-collectors-datafile-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/collectors/datafile'
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
@@ -42,7 +55,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/datafile
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
@@ -52,5 +65,6 @@
     project-name: dcaegen2-collectors-datafile
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/datafile
     branch: master
index 7108503..0a2921f 100644 (file)
@@ -4,11 +4,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2-collectors-hv-ves'
+    recipients: 'vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'testsuites':
           trigger_jobs:
index 3a574a5..d6f7b87 100644 (file)
@@ -6,8 +6,7 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+          java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
           mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
           mvn-goals: 'clean deploy'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean deploy -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
-          # No-op
-          script: '/bin/true'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: 'clean deploy -Ddocker.skip'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+
+- project:
+    name: dcaegen2-collectors-hv-ves-sonar
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/collectors/hv-ves'
+    project-name: 'dcaegen2-collectors-hv-ves'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
     name: dcaegen2-collectors-hv-ves-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/hv-ves
     project-name: 'dcaegen2-collectors-hv-ves'
     branch: 'master'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
 
+
 - project:
     name: dcaegen2-collectors-hv-ves-info
     project-name: dcaegen2-collectors-hv-ves
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/hv-ves
     branch: master
index 5720a64..31db44a 100644 (file)
@@ -4,6 +4,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2-collectors-restconf'
+    recipients: 'vv770d@att.com swarup.nayak1@huawei.com'
     stream:
       - 'master':
           branch: 'master'
index 1be5726..e06ca9e 100644 (file)
@@ -5,14 +5,22 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/collectors/restconf'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-collectors-restconf-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/collectors/restconf'
     project-name: 'dcaegen2-collectors-restconf'
     branch: 'master'
@@ -42,7 +55,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/restconf
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-restconf'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-restconf-settings'
@@ -52,5 +65,6 @@
     project-name: dcaegen2-collectors-restconf
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/restconf
     branch: master
index 79dab04..a586372 100644 (file)
@@ -6,13 +6,13 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/collectors/snmptrap'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-collectors-snmptrap-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/collectors/snmptrap'
     project-name: 'dcaegen2-collectors-snmptrap'
     branch: 'master'
@@ -42,7 +47,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/snmptrap
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-snmptrap'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
@@ -52,5 +57,6 @@
     project-name: dcaegen2-collectors-snmptrap
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/snmptrap
     branch: master
index d7bc964..eba5e39 100644 (file)
@@ -2,17 +2,26 @@
 - project:
     name: dcaegen2-collectors-ves
     project-name: 'dcaegen2-collectors-ves'
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/collectors/ves'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-collectors-ves-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/collectors/ves'
     project-name: 'dcaegen2-collectors-ves'
     branch: 'master'
@@ -42,7 +57,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/ves
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-ves'
     branch: 'master'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
@@ -52,5 +67,6 @@
     project-name: dcaegen2-collectors-ves
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/ves
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
new file mode 100644 (file)
index 0000000..b695e9e
--- /dev/null
@@ -0,0 +1,9 @@
+---
+- project:
+    name: dcaegen2-collectors-info
+    project-name: dcaegen2-collectors
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: dcaegen2/collectors
+    branch: master
index 5dee646..e1eda94 100644 (file)
@@ -6,13 +6,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/deployments'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-deployments-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
@@ -21,7 +20,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-v1-8c-8g'
+    build-node: 'ubuntu1804-docker-v1-8c-8g'
     build-timeout: 180
 
 - project:
@@ -29,7 +28,7 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: dcaegen2/deployments
     project-name: 'dcaegen2-deployments'
     branch: 'master'
@@ -40,5 +39,6 @@
     project-name: dcaegen2-deployments
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/deployments
     branch: master
index 285d4e0..8ea96a6 100644 (file)
@@ -6,13 +6,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/platform/blueprints'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
@@ -21,7 +20,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-blueprints-clm
@@ -29,7 +28,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/blueprints
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-blueprints'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-blueprints-settings'
@@ -39,5 +38,6 @@
     project-name: dcaegen2-platform-blueprints
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/blueprints
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
deleted file mode 100644 (file)
index 86759fe..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-cli-bp-gen
-    project: 'dcaegen2/platform/cli'
-    project-name: 'dcaegen2-platform-cli'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
-            version-properties: 'blueprint-generator/version.properties'
-    subproject:
-      - 'blueprint-gen':
-          pom: 'blueprint-generator/pom.xml'
-          pattern: 'blueprint-generator/**'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-cli-settings'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
deleted file mode 100644 (file)
index 2130223..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-cli
-    project-name: 'dcaegen2-platform-cli'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/cli'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-cli-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-cli-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/platform/cli'
-    project-name: 'dcaegen2-platform-cli'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-cli-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-cli-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/cli
-    build-node: ubuntu1604-docker-8c-8g
-    project-name: 'dcaegen2-platform-cli'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-cli-settings'
-
-- project:
-    name: dcaegen2-platform-cli-info
-    project-name: dcaegen2-platform-cli
-    jobs:
-      - gerrit-info-yaml-verify
-    project: dcaegen2/platform/cli
-    branch: master
index 8f753b4..2203fe7 100644 (file)
@@ -1,19 +1,12 @@
 ---
 - project:
     name: dcaegen2-platform-configbinding
-    project-name: 'dcaegen2-platform-configbinding'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/configbinding'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'dcaegen2-platform-configbinding-settings'
+    # git repo
+    project: dcaegen2/platform/configbinding
+    # jenkins job prefix
+    project-name: dcaegen2-platform-configbinding
+    # push credentials
+    mvn-settings: dcaegen2-platform-configbinding-settings
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: ubuntu1804-docker-8c-8g
+    # used by tox-install.sh to specify the interpreter used to install tox
+    python-version: python3
+    jobs:
+      # clm and tox
+      - '{project-name}-python-jobs'
+      # build docker image
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-release-verify
+      - gerrit-release-merge
+    stream:
+      - master:
+          branch: master
 
 - project:
     name: dcaegen2-platform-configbinding-sonar
-    jobs:
-      - gerrit-maven-sonar
+    project: dcaegen2/platform/configbinding
+    project-name: dcaegen2-platform-configbinding
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/platform/configbinding'
-    project-name: 'dcaegen2-platform-configbinding'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-configbinding-settings'
-    mvn-goals: 'clean install'
+    build-node: ubuntu1804-docker-8c-8g
+    # Sonar jobs use maven to push report
+    mvn-settings: dcaegen2-platform-configbinding-settings
+    mvn-goals: 'clean test'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-configbinding-clm
+    branch: master
+    # used by tox-install.sh to specify the interpreter used to install tox
+    python-version: python3
     jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/configbinding
-    build-node: ubuntu1604-docker-8c-8g
-    project-name: 'dcaegen2-platform-configbinding'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-configbinding-settings'
+      - gerrit-tox-sonar
 
 - project:
     name: dcaegen2-platform-configbinding-info
+    project: dcaegen2/platform/configbinding
     project-name: dcaegen2-platform-configbinding
+    branch: master
     jobs:
       - gerrit-info-yaml-verify
-    project: dcaegen2/platform/configbinding
-    branch: master
+    build-node: centos7-builder-2c-1g
index b6bb261..fdc6fa4 100644 (file)
@@ -6,13 +6,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/platform/deployment-handler'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
@@ -21,7 +20,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-deployment-handler-clm
@@ -29,7 +28,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/deployment-handler
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-deployment-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
@@ -39,5 +38,6 @@
     project-name: dcaegen2-platform-deployment-handler
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/deployment-handler
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
new file mode 100644 (file)
index 0000000..44c5bf7
--- /dev/null
@@ -0,0 +1,109 @@
+---
+- 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:
+          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-api-token: '{sonarcloud_api_token}'
+          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
+      - dcaegen2-platform-oti-event-handler:
+          src-dir: oti/event-handler
+          docker-name: onap/org.onap.dcaegen2.platform.oti.event-handler
+    stream:
+      - master:
+          branch: master
+    views:
+      - project-view:
+          project-name: dcaegen2-platform-adapter
+      - project-view:
+          project-name: dcaegen2-platform-mod
+      - project-view:
+          project-name: dcaegen2-platform-oti
+    jobs:
+      - dcaegen2-docker-python-jobs
index d33b745..f368dae 100644 (file)
@@ -5,19 +5,22 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dcaegen2/platform/inventory-api'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-inventory-api-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/platform/inventory-api'
     project-name: 'dcaegen2-platform-inventory-api'
     branch: 'master'
@@ -47,7 +55,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/inventory-api
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-inventory-api'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
@@ -57,5 +65,6 @@
     project-name: dcaegen2-platform-inventory-api
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/inventory-api
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
new file mode 100644 (file)
index 0000000..dc48e74
--- /dev/null
@@ -0,0 +1,30 @@
+---
+- project:
+    name: dcaegen2-platform-mod-bpgenerator
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          project-name: dcaegen2-platform-mod-bpgenerator
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          version-properties-file: 'mod/bpgenerator/version.properties'
+          mvn-pom: 'mod/bpgenerator/pom.xml'
+          mvn-params: '-f mod/bpgenerator/pom.xml'
+          pattern: 'mod/bpgenerator/**'
+    subproject:
+      - 'bpgenerator':
+          pom: 'mod/bpgenerator/pom.xml'
+          pattern: 'mod/bpgenerator/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
new file mode 100644 (file)
index 0000000..e84e83e
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: dcaegen2-platform-mod-designtool
+    project-name: dcaegen2-platform-mod
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - designtool:
+          pom: 'mod/designtool/pom.xml'
+          pattern: 'mod/designtool/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: dcaegen2-platform-settings
+    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'
+    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
new file mode 100644 (file)
index 0000000..dea3938
--- /dev/null
@@ -0,0 +1,53 @@
+---
+- project:
+    name: dcaegen2-platform-mod-genprocessor
+    project-name: dcaegen2-platform-mod
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - genprocessor:
+          pom: 'mod/genprocessor/pom.xml'
+          pattern: 'mod/genprocessor/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: dcaegen2-platform-settings
+    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-api-token: '{sonarcloud_api_token}'
+    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'
+    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
new file mode 100644 (file)
index 0000000..3e5a85c
--- /dev/null
@@ -0,0 +1,52 @@
+---
+- project:
+    name: dcaegen2-platform-mod-runtimeapi
+    project-name: dcaegen2-platform-mod
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - runtimeapi:
+          pom: 'mod/runtimeapi/pom.xml'
+          pattern: 'mod/runtimeapi/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod-runtimeapi-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    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
+    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'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
new file mode 100644 (file)
index 0000000..bf5c6c4
--- /dev/null
@@ -0,0 +1,85 @@
+---
+- project:
+    name: dcaegen2-platform-oti-event-proc
+    project-name: dcaegen2-platform-oti
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - eventproc:
+          pom: 'oti/event-proc/pom.xml'
+          pattern: 'oti/event-proc/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-oti-event-proc-release
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-oti-event-proc'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          version-properties-file: 'oti/event-proc/version.properties'
+          mvn-pom: 'oti/event-proc/pom.xml'
+          mvn-params: '-f oti/event-proc/pom.xml'
+          mvn-goals: 'clean deploy -Ddockerfile.skip -f oti/event-proc/pom.xml'
+          pattern: 'oti/event-proc/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package dockerfile:build dockerfile:push -f oti/event-proc/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'oti/event-proc/**'
+
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+    name: dcaegen2-platform-oti-event-proc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    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-oti-event-proc'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f oti/event-proc/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
+- project:
+    name: dcaegen2-platform-oti-event-proc-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-oti-event-proc-clm
+    mvn-params: '-f oti/event-proc/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+
index 3d7e40e..31d7d11 100644 (file)
     name: dcaegen2-platform-plugins-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'dcaegen2/platform/plugins'
     project-name: dcaegen2-platform-plugins
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/plugins
     branch: master
-
-#job added to retain dublin plugin build under ubuntu
-- project:
-    name: dcaegen2-platform-plugins-dublin
-    project-name: 'dcaegen2-platform-plugins'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/plugins'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'dcaegen2-platform-plugins-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
index cb19425..9ff0471 100644 (file)
@@ -6,13 +6,12 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/platform/policy-handler'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-policy-handler-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/platform/policy-handler'
     project-name: 'dcaegen2-platform-policy-handler'
     branch: 'master'
@@ -42,7 +46,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/policy-handler
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-policy-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-policy-handler-settings'
@@ -52,5 +56,6 @@
     project-name: dcaegen2-platform-policy-handler
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/policy-handler
     branch: master
index a91af7a..a456b4f 100644 (file)
@@ -5,17 +5,23 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dcaegen2/platform/servicechange-handler'
     stream:
       - 'master':
           branch: 'master'
+
     mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
@@ -24,7 +30,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-servicechange-handler-clm
@@ -32,7 +38,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/servicechange-handler
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-servicechange-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
@@ -42,5 +48,6 @@
     project-name: dcaegen2-platform-servicechange-handler
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/servicechange-handler
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
new file mode 100644 (file)
index 0000000..23d22ed
--- /dev/null
@@ -0,0 +1,19 @@
+---
+- project:
+    name: dcaegen2-platform-info
+    project-name: dcaegen2-platform
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: dcaegen2/platform
+    branch: master
+
+- project:
+    name: dcaegen2-platform-release
+    project-name: dcaegen2-platform
+    mvn-settings: dcaegen2-platform-settings
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+    build-node: centos7-docker-8c-8g
+    project: dcaegen2/platform
+    branch: master
index 94e7e2e..f70c722 100644 (file)
@@ -4,11 +4,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2-services-bbs-event-processor'
+    recipients: 'vv770d@att.com stavros.kanarakis@nokia.com piotr.wielebski@nokia.com kornel.janiak@nokia.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'bbs-testsuites':
           trigger_jobs:
index 2e49ee5..f3dd22f 100644 (file)
@@ -1,13 +1,10 @@
 ---
 - project:
-    name: dcaegen2-services-bbs-event-processor
+    name: dcaegen2-services-bbs-event-processor-verify
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
-            version-properties: 'components/bbs-event-processor/version.properties'
     subproject:
       - 'bbs-event-processor':
           pom: 'components/bbs-event-processor/pom.xml'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+          java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
+    maven-version: 'mvn35'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+    name: dcaegen2-services-bbs-event-processor-merge
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-bbs-event-processor'
+    jobs:
+      - gerrit-maven-merge:
+          mvn-params: '-f components/bbs-event-processor/pom.xml'
+          mvn-goals: 'clean install -Dmaven.deploy.skip=true'
+    branch: 'master'
+    java-version: openjdk11
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-version: 'mvn35'
+    maven-deploy-properties: |
+      deployAtEnd=false
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+
+- project:
+    name: dcaegen2-services-bbs-event-processor-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-bbs-event-processor'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          version-properties-file: 'components/bbs-event-processor/version.properties'
+          mvn-pom: 'components/bbs-event-processor/pom.xml'
+          mvn-params: '-f components/bbs-event-processor/pom.xml'
+          mvn-goals: 'clean deploy -Ddockerfile.skip -f components/bbs-event-processor/pom.xml'
+          pattern: 'components/bbs-event-processor/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package -Dmaven.deploy.skip=true dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/bbs-event-processor/**'
+
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-bbs-event-processor-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-bbs-event-processor'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-settings'
     mvn-params: '-f components/bbs-event-processor/pom.xml'
-    mvn-goals: 'clean install'
+    mvn-goals: 'clean install -Ddockerfile.skip'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
     name: dcaegen2-services-bbs-event-processor-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-bbs-event-processor-clm'
     mvn-params: '-f components/bbs-event-processor/pom.xml'
index 1c5ad80..017eb64 100644 (file)
@@ -6,8 +6,6 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
-            version-properties: 'components/datalake-handler/version.properties'
     subproject:
       - 'datalake-handler':
           pom: 'components/datalake-handler/pom.xml'
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+    name: dcaegen2-services-datalake-handler-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'components/datalake-handler/pom.xml'
+          mvn-params: '-f components/datalake-handler/pom.xml'
+          version-properties-file: 'components/datalake-handler/version.properties'
+          pattern: 'components/datalake-handler/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/datalake-handler/**'
+    stream:
+      - 'master':
+         branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+    name: dcaegen2-services-datalake-handler-admin-ui-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler-admin-ui'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'components/datalake-handler/pom.xml'
+          mvn-params: '-f components/datalake-handler/pom.xml'
+          version-properties-file: 'components/datalake-handler/version.properties'
+          pattern: 'components/datalake-handler/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/datalake-handler/**'
+    stream:
+      - 'master':
+         branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-datalake-handler-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-datalake-handler'
     branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
new file mode 100644 (file)
index 0000000..1c2dd59
--- /dev/null
@@ -0,0 +1,98 @@
+---
+- job-group:
+    # This job group contains all the jobs that should be deployed for
+    # a subproject of dcaegen2/services 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.services.something.name1
+    #      - subproject-name2:
+    #          src-dir: subproject-dir2
+    #          docker-name: onap/org.onap.dcaegen2.services.something.name2
+    #      - subproject-name3:
+    #          src-dir: subproject-dir3
+    #          docker-name: onap/org.onap.dcaegen2.services.something.name3
+    #    stream:
+    #      - master:
+    #          branch: master
+    #      - release1:
+    #          branch: release1.0
+    #    jobs:
+    #      - dcaegen2-docker-python-jobs
+
+    name: '{project-name}-docker-python-jobs'
+    id: dcaegen2-services-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}'
+    tox-envs: 'py3'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    python-version: python3
+    wss-product-name: '{project-name}'
+    docker-root: '{src-dir}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '{src-dir}/.*'
+    jobs:
+      - gerrit-tox-verify:
+          stream: master
+          branch: 'master'
+      - 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-whitesource-scan:
+          build-timeout: 120
+          submodule-timeout: 30
+          java-opts: '-Xmx2048m'
+          mvn-pom: '{src-dir}/pom.xml'
+      - gerrit-tox-sonar:
+          # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
+          sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar'
+          cron: '@daily'
+          stream: master
+          branch: master
+
+- project:
+    name: dcaegen2-services-docker-python-subprojects
+    project: dcaegen2/services
+    mvn-settings: dcaegen2-services-settings
+    build-node: ubuntu1804-docker-8c-8g
+    project-name:
+      - dcaegen2-services-pmsh:
+          src-dir: components/pm-subscription-handler
+          docker-name: onap/org.onap.dcaegen2.services.pmsh
+    stream:
+      - master:
+          branch: master
+    views:
+      - project-view:
+          project-name: dcaegen2-services-pmsh
+    jobs:
+      - dcaegen2-services-docker-python-jobs
index 3527ffd..7a23af1 100644 (file)
@@ -6,13 +6,13 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/services/heartbeat'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-services-heartbeat-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services/heartbeat'
     project-name: 'dcaegen2-services-heartbeat'
     branch: 'master'
@@ -42,7 +47,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/heartbeat
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-heartbeat'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-heartbeat-settings'
@@ -52,5 +57,6 @@
     project-name: dcaegen2-services-heartbeat
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/heartbeat
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-java.yaml b/jjb/dcaegen2/dcaegen2-services-java.yaml
deleted file mode 100644 (file)
index 525a9fa..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- project:
-    name: dcaegen2-services-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-docker-8c-8g
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
index e319e68..6e0fe73 100644 (file)
@@ -5,22 +5,26 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
+          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: 'dcaegen2/services/mapper'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
     name: dcaegen2-services-mapper-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/services/mapper'
     project-name: 'dcaegen2-services-mapper'
     branch: 'master'
@@ -43,7 +52,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/mapper
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-mapper'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-mapper-settings'
@@ -53,5 +62,6 @@
     project-name: dcaegen2-services-mapper
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/mapper
     branch: master
index 0d6687f..f486b95 100644 (file)
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-verify-java':
-        mvn-goals: 'clean install'
+        mvn-goals: 'clean install docker:build'
       - '{project-name}-{stream}-merge-java':
         mvn-goals: 'clean deploy'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
-          script: '/bin/true'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: 'clean install docker:build docker:push'
 
 - project:
     name: dcaegen2-services-pm-mapper-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services/pm-mapper'
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
@@ -45,7 +55,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/pm-mapper
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
@@ -55,5 +65,6 @@
     project-name: dcaegen2-services-pm-mapper
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/pm-mapper
     branch: master
similarity index 58%
rename from jjb/cli/cli-csit.yaml
rename to jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
index 48d1151..a6bc305 100644 (file)
@@ -1,15 +1,15 @@
----
 - project:
-    name: cli-csit
+    name: dcaegen2-services-pmsh-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'cli'
+    project-name: dcaegen2-services-pmsh
+    recipients: 'lego@est.tech'
     stream:
       - 'master':
           branch: 'master'
     functionality:
-      - 'sanity-check':
+      - 'testsuite':
           trigger_jobs:
+            - '{project-name}-docker-merge-master'
     robot-options: ''
-    branch: 'master'
index 1d4bcf2..a05d6ff 100644 (file)
@@ -4,12 +4,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2-pmmapper'
+    recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-
     functionality:
       - 'pmmapper':
           trigger_jobs:
index 8e3047f..c2672c1 100644 (file)
@@ -5,18 +5,26 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: 'clean package docker:build docker:push'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/services/prh'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+          java-version: openjdk11
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
     name: dcaegen2-services-prh-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
+    java-version: openjdk11
     project: 'dcaegen2/services/prh'
     project-name: 'dcaegen2-services-prh'
     branch: 'master'
@@ -39,7 +53,8 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/prh
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
+    java-version: openjdk11
     project-name: 'dcaegen2-services-prh'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-prh-settings'
@@ -49,5 +64,6 @@
     project-name: dcaegen2-services-prh
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/prh
     branch: master
index 2c12df9..377a276 100644 (file)
@@ -5,27 +5,52 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/services/sdk'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+          java-version: openjdk11
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'centos7-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
+- project:
+    name: dcaegen2-services-sdk-integration-pairwise
+    java-version: openjdk11
+    jobs:
+      - '{project-name}-{stream}-integration-pairwise':
+          build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/services/sdk'
+    project-name: 'dcaegen2-services-sdk'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-services-sdk-settings'
+    mvn-params: ' -P integration-pairwise'
+
 - project:
     name: dcaegen2-services-sdk-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: centos7-docker-8c-8g
     project: 'dcaegen2/services/sdk'
     project-name: 'dcaegen2-services-sdk'
     branch: 'master'
 
 - project:
     name: dcaegen2-services-sdk-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/sdk
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: centos7-docker-8c-8g
     project-name: 'dcaegen2-services-sdk'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-sdk-settings'
@@ -49,5 +75,6 @@
     project-name: dcaegen2-services-sdk
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/sdk
     branch: master
index b4d2b5c..a969c81 100644 (file)
@@ -5,18 +5,26 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/services/son-handler'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
     name: dcaegen2-services-son-handler-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/services/son-handler'
     project-name: 'dcaegen2-services-son-handler'
     branch: 'master'
@@ -39,7 +52,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/son-handler
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-son-handler'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-son-handler-settings'
@@ -49,5 +62,6 @@
     project-name: dcaegen2-services-son-handler
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/son-handler
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml
new file mode 100644 (file)
index 0000000..4ff813e
--- /dev/null
@@ -0,0 +1,18 @@
+---
+- project:
+    name: dcaegen2-services-info
+    project-name: dcaegen2-services
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: dcaegen2/services
+    branch: master
+- project:
+    name: dcaegen2-services-release
+    project-name: dcaegen2-services
+    mvn-settings: dcaegen2-services-settings
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+    build-node: centos7-docker-8c-8g
+    project: dcaegen2/services
+    branch: master
index d91b378..2603a69 100644 (file)
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-utils-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-utils-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/utils'
     project-name: 'dcaegen2-utils'
     branch: 'master'
@@ -44,7 +47,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/utils
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-utils'
     branch: 'master'
     mvn-settings: 'dcaegen2-utils-settings'
     project-name: dcaegen2-utils
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/utils
     branch: master
+
+- cbs_client_pypi_common: &cbs_client_pypi_common
+    name: cbs-client-pypi-common
+    # jenkins job prefix
+    project-name: dcaegen2-platform-cbs-client
+    # git repo
+    project: dcaegen2/utils
+    # push credentials
+    mvn-settings: dcaegen2-utils-settings
+    # requires centos to sign release
+    build-node: centos7-builder-2c-1g
+    tox-dir: onap-dcae-cbs-docker-client
+    stream:
+      - master:
+          branch: master
+
+- project:
+    name: dcaegen2-platform-cbs-client-pypi-build
+    <<: *cbs_client_pypi_common
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'onap-dcae-cbs-docker-client/{name}/.*'
+    jobs:
+      - gerrit-pypi-verify
+      - gerrit-pypi-merge:
+          pypi-repo: pypi-test
+
+- project:
+    name: dcaegen2-platform-cbs-client-pypi-release
+    <<: *cbs_client_pypi_common
+    jobs:
+      - gerrit-pypi-release-verify
+      - gerrit-pypi-release-merge
index 4c610e1..f1edafc 100644 (file)
@@ -4,11 +4,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2'
+    recipients: 'vv770d@att.com pawel.kasperkiewicz@nokia.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'testsuites'
     trigger_jobs:
@@ -20,6 +19,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dcaegen2'
+    recipients: 'vv770d@att.com piotr.wielebski@nokia.com kornel.janiak@nokia.com'
     stream:
       - 'master':
           branch: 'master'
index 38e683d..1305937 100644 (file)
@@ -17,8 +17,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dcaegen2-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
@@ -43,5 +41,6 @@
     project-name: dcaegen2
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2
     branch: master
index d866247..ea7bcaf 100644 (file)
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'demo'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''
     name: demo-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'demo'
     project-name: 'demo'
     branch: 'master'
     project-name: demo
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: demo
     branch: master
+
+- project:
+    name: demo-linters
+    project: 'demo'
+    project-name: 'demo'
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+    stream:
+      - 'master':
+          branch: 'master'
index 1ba6d5d..1362bc7 100644 (file)
@@ -2,10 +2,10 @@
 - project:
     name: dmaap-buscontroller-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dmaap-buscontroller'
     stream: 'master'
+    disabled: false
     functionality:
       - 'ssl':
           trigger_jobs:
index 2420436..b20bbc5 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-#
-# see DMAAP-334 for more details, but
-#     - '{project-name}-{stream}-docker-java-daily':
-# doesn't support mvn-goals override, so trying this...
-      - '{project-name}-{stream}-docker-java-shell-daily':
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package -P docker docker:build docker:push'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
+          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: 'dmaap/buscontroller'
     stream:
@@ -49,5 +46,6 @@
     project-name: dmaap-buscontroller
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/buscontroller
     branch: master
index 6954c66..77126de 100644 (file)
@@ -2,9 +2,9 @@
 - project:
     name: dmaap-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dmaap'
+    recipients: 'ms5838@att.com'
     stream: 'master'
     functionality:
       - 'mrpubsub':
index f01af31..254e445 100644 (file)
@@ -1,36 +1,14 @@
 ---
-- project:
-    name: dmaap-datarouter-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dmaap-datarouter'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-      - 'dublin':
-          branch: 'dublin'
-    functionality:
-      - 'dr-suite':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
-    robot-options: ''
-
 - project:
     name: dmaap-datarouter-csit-ssl
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dmaap-datarouter'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'ssl-dr-suite':
           trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
+            - '{project-name}-maven-docker-stage-{stream}'
     robot-options: ''
index 2dce2c2..ffd5a2d 100644 (file)
@@ -1,67 +1,66 @@
 - project:
-    name: dmaap-datarouter
+    name: dmaap-datarouter-java11
     project-name: 'dmaap-datarouter'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      #
-      # see DMAAP-334 for more details, but
-      #     - '{project-name}-{stream}-docker-java-daily':
-      # doesn't support mvn-goals override, so trying this...
-      - '{project-name}-{stream}-docker-java-shell-daily':
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package -P docker docker:build docker:push'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
-
+          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: 'dmaap/datarouter'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
+    java-version: openjdk11
+
 
 - project:
-    name: dmaap-datarouter-casablanca
+    name: dmaap-datarouter-java8
     project-name: 'dmaap-datarouter'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      #
-      # see DMAAP-334 for more details, but
-      #     - '{project-name}-{stream}-docker-java-daily':
-      # doesn't support mvn-goals override, so trying this...
-      - '{project-name}-{stream}-docker-java-shell-daily':
-            mvn-goals: 'clean package -P docker docker:build -DpushImage'
-            # No-op
-            script: '/bin/true'
-            build-node: 'ubuntu1604-docker-8c-8g'
-
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package -P docker docker:build docker:push'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/datarouter'
     stream:
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'frankfurt':
+          branch: 'frankfurt'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
+    java-version: openjdk8
 
 - project:
     name: dmaap-datarouter-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/datarouter'
     project-name: 'dmaap-datarouter'
     branch: 'master'
     mvn-settings: 'dmaap-datarouter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-clm
     project-name: 'dmaap-datarouter'
     branch: 'master'
     mvn-settings: 'dmaap-datarouter-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-info
     project-name: dmaap-datarouter
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/datarouter
     branch: master
index 5fd25b9..38f4a5f 100644 (file)
@@ -5,9 +5,16 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     project: 'dmaap/dbcapi'
     mvn-settings: 'dmaap-dbcapi-settings'
+    java-version: openjdk11
     stream:
       - 'master':
           branch: 'master'
     name: dmaap-dbcapi-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/dbcapi'
     project-name: 'dmaap-dbcapi'
     branch: 'master'
     mvn-settings: 'dmaap-dbcapi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-dbcapi-clm
     project-name: 'dmaap-dbcapi'
     branch: 'master'
     mvn-settings: 'dmaap-dbcapi-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-dbcapi-info
     project-name: dmaap-dbcapi
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/dbcapi
     branch: master
index b6a9ac7..1b3bfa6 100644 (file)
@@ -4,10 +4,14 @@
     name: dmaap-kafka-docker
     project-name: 'dmaap-kafka-docker'
     jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          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: 'dmaap/kafka11aaf'
     stream:
       - 'master':
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: dmaap-kafka-docker-info
     project-name: dmaap-kafka-docker
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/kafka11aaf
     branch: master
index 7b1573c..350eb03 100644 (file)
     name: dmaap-kafka-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/kafka11aaf'
     project-name: 'dmaap-kafka'
     branch: 'master'
@@ -29,5 +34,6 @@
     project-name: dmaap-kafka
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/kafka11aaf
     branch: master
index b5db723..6549204 100644 (file)
@@ -5,7 +5,12 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dmaap/messagerouter/dmaapclient'
     stream:
       - 'master':
     name: dmaap-messagerouter-dmaapclient-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/dmaapclient'
     project-name: 'dmaap-messagerouter-dmaapclient'
     branch: 'master'
@@ -42,5 +52,6 @@
     project-name: dmaap-messagerouter-dmaapclient
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/dmaapclient
     branch: master
index f2cf27a..82c12d3 100644 (file)
@@ -4,10 +4,14 @@
     name: dmaap-messagerouter-docker
     project-name: 'dmaap-messagerouter-docker'
     jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          maven-versions-plugin: true
+          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: 'dmaap/messagerouter/messageservice'
     stream:
       - 'master':
@@ -17,7 +21,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: dmaap-messagerouter-docker-clm
@@ -26,7 +30,7 @@
     nexus-iq-namespace: 'onap-'
     project: dmaap/messagerouter/messageservice
     project-name: 'dmaap-messagerouter-docker'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
 
@@ -35,5 +39,6 @@
     project-name: dmaap-messagerouter-docker
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/messageservice
     branch: master
index 828c1af..3c0df03 100644 (file)
@@ -5,7 +5,11 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+
     project: 'dmaap/messagerouter/messageservice'
     stream:
       - 'master':
     name: dmaap-messagerouter-messageservice-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/messageservice'
     project-name: 'dmaap-messagerouter-messageservice'
     branch: 'master'
@@ -42,5 +51,6 @@
     project-name: dmaap-messagerouter-messageservice
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/messageservice
     branch: master
index 91cde72..331176a 100644 (file)
@@ -5,7 +5,13 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     project: 'dmaap/messagerouter/mirroragent'
     stream:
       - 'master':
     name: dmaap-messagerouter-mirroragent-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/mirroragent'
     project-name: 'dmaap-messagerouter-mirroragent'
     branch: 'master'
@@ -42,5 +53,6 @@
     project-name: dmaap-messagerouter-mirroragent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/mirroragent
     branch: master
index ba26428..2d872f7 100644 (file)
@@ -5,7 +5,13 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     project: 'dmaap/messagerouter/msgrtr'
     stream:
       - 'master':
     name: dmaap-messagerouter-msgrtr-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/msgrtr'
     project-name: 'dmaap-messagerouter-msgrtr'
     branch: 'master'
@@ -42,5 +53,6 @@
     project-name: dmaap-messagerouter-msgrtr
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/msgrtr
     branch: master
index de9855c..4a0b523 100644 (file)
     name: dmaap-zookeeper-docker
     project-name: 'dmaap-zookeeper-docker'
     jobs:
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          maven-versions-plugin: true
+          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: 'dmaap/zookeeper'
     stream:
       - 'master':
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: dmaap-zookeeper-info
     project-name: dmaap-zookeeper
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/zookeeper
     branch: master
index 234a767..be97b29 100644 (file)
@@ -71,7 +71,7 @@
       - shell: !include-raw: doc-install-plantuml.sh
       - shell: |
           #!/bin/bash
-          virtualenv $WORKSPACE/venv-tox
+          python3 -m venv $WORKSPACE/venv-tox
           source $WORKSPACE/venv-tox/bin/activate
           pip install --upgrade pip
           pip install --upgrade tox argparse
index 5ae9f73..f03cce0 100644 (file)
@@ -8,6 +8,7 @@
 - project:
     name: doc
     project-name: 'doc'
+    python-version: python3
     jobs:
       - '{project-name}-{stream}-verify-rtd':
           build-node: centos7-docker-8c-8g
           branch: 'casablanca'
       - dublin:
           branch: 'dublin'
+      - elalto:
+          branch: 'elalto'
 
 - project:
     name: doc-info
     project-name: doc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: doc
     branch: master
index ddba042..e5adc35 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'externalapi-nbi'
+    recipients: 'adrian.osullivan@huawei.com'
     stream: 'master'
     functionality:
       - 'healthcheck':
index 574e17e..7620cca 100644 (file)
           maven-versions-plugin: true
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'externalapi/nbi'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'externalapi-nbi-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: externalapi-nbi-arm64
@@ -39,7 +42,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+          build-node: 'ubuntu1804-docker-arm64-4c-2g'
     project: 'externalapi/nbi'
     stream:
       - 'master':
       - 'master':
           branch: 'master'
     mvn-settings: 'externalapi-nbi-settings'
+    java-version: openjdk11
 
 - project:
     name: externalapi-nbi-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'externalapi/nbi'
     project-name: 'externalapi-nbi'
     branch: 'master'
     mvn-settings: 'externalapi-nbi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: externalapi-nbi-info
     project-name: externalapi-nbi
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: externalapi/nbi
     branch: master
index b86e653..74479f2 100644 (file)
@@ -38,7 +38,7 @@
 
     # Timeout in minutes
     build-timeout: 90
-    build-node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1804-builder-4c-4g
 
     archive-artifacts: ''
 
     submodule-disable: false
 
     # Jenkins
-    jenkins-ssh-credential: onap-jenkins-ssh
+    jenkins-ssh-credential: 'onap-jenkins-ssh'
+    jenkins-ssh-release-credential: 'jenkins-release'
+
+    # SonarCloud
+    sonarcloud_project_organization: onap
+    sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff
+    sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
+
+    # Nexus3 docker registries
+    container-public-registry: nexus3.onap.org:10001
+    container-snapshot-registry: nexus3.onap.org:10003
+    container-staging-registry: nexus3.onap.org:10004
+    # the quotes here are REQUIRED
+    container-push-registry: '{container-snapshot-registry}'
index c783015..9c70eec 100644 (file)
                 exclude-no-code-change: 'false'
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: '^verify-helm$'
+                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
index 50952b3..f78cce7 100644 (file)
@@ -84,7 +84,7 @@
     name: '{project-name}-{stream}-docker-c-shell-daily'
     id: gerrit-docker-c-shell-daily
     <<: *c_job_common
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
 
     triggers:
       # 12 AM UTC
           settings-file: '{mvn-settings}'
       - docker-login
       - shell: '{script}'
-
-- job-template:
-    #
-    # job template for build project executed every 6hrs
-    #
-    # Required Variables:
-    #   script:         build script to execute
-    name: '{name}-{stream}-shell-6hrs'
-    node: '{build-node}'
-    type: freestyle
-
-    triggers:
-      - timed: '00 */6 * * *'
-
-    builders:
-      - shell: '{script}'
-
-    publishers:
-      - lf-infra-publish
index 1c8242f..eecedd4 100644 (file)
             - '{parent_job}'
           result: 'success'
 
+- job-template:
+    # Job template for creating a docker manifest list
+    #
+    # The purpose of this job template is to run:
+    # 1. docker_push_manifest.sh script (which needs to exist in the
+    #    project implementation repo)
+
+    name: '{project-name}-docker-manifest-{stream}'
+    <<: *docker_job_boiler_plate
+    node: '{build-node}'
+    build-timeout: 15
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - string:
+          name: PARENT_JOB_NAME
+          default: 'none'
+
+    disabled: '{obj:disabled}'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '$GIT_URL/$PROJECT'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: true
+          submodule-disable: '{submodule-disable}'
+          submodule-timeout: '{submodule-timeout}'
+          choosing-strategy: default
+
+
+    builders:
+      - lf-infra-docker-login:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+      - shell: |
+          #!/bin/bash -ex
+          export PARENT_JOB_NAME
+          ./docker_push_manifest.sh
+
+- job-template:
+    # Job template for staging jobs on multiple architectures
+    #
+    # The purpose of this job template is to:
+    # 1. Run parallel maven-docker-stage jobs for each supported architecure
+    # 2. Build and push a docker manifest list for the images created by
+    #    the previous jobs
+
+    name: '{project-name}-multiarch-docker-stage-{stream}'
+    node: '{build-node}'
+    project-type: multijob
+    disabled: '{obj:disabled}'
+    build-timeout: 15
+    pattern: '**'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - string:
+          name: DOCKER_REGISTRY
+          default: 'none'
+      - string:
+          name: DOCKERHUB_REGISTRY
+          default: 'registry-1.docker.io'
+
+    disabled: '{obj:disabled}'
+
+    properties:
+      - throttle:
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '{project-name}-.*-docker-.*'
+          blocking-level: 'NODE'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '$GIT_URL/$PROJECT'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: true
+          submodule-timeout: 10
+          submodule-disable: false
+          choosing-strategy: default
 
+    triggers:
+      - timed: '@daily'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+             - comment-added-contains-event:
+                 comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$'
+
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                 - compare-type: ANT
+                   pattern: "**"
+
+    builders:
+      - multijob:
+          name: 'build docker images'
+          condition: ALWAYS
+          execution-type: PARALLEL
+          projects:
+            - name: '{project-name}-amd64-maven-docker-stage-{stream}'
+              kill-phase-on: FAILURE
+              current-parameters: true
+            - name: '{project-name}-arm64-maven-docker-stage-{stream}'
+              kill-phase-on: NEVER
+              current-parameters: true
+      - multijob:
+          name: 'publish docker manifest'
+          condition: SUCCESSFUL
+          execution-type: PARALLEL
+          projects:
+            - name: '{project-name}-docker-manifest-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                PARENT_JOB_NAME=$JOB_NAME
+                DOCKERHUB_REGISTRY=docker.io
index ba2f74e..4d48b87 100644 (file)
@@ -1,19 +1,26 @@
 ---
-- job-template:
+- job-template: &verify_golang_bolierplate
     # Job template for Golang verify jobs
     #
     # The purpose of this job template is to run:
     # 1. make build
     #
-    # golangver can be set to golang110 or golang111
+    # golangver can be set to golang110, golang111 or golang112
     # depending on what version is needed by the project
     # default is golang110
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+    #
+    # Optional Variables:
+    #     script:    build script to execute
+    #     pattern:   ant file-path pattern relative to the workspace used to
+    #                trigger the job
 
     name: '{project-name}-{stream}-verify-golang'
     path: '$WORKSPACE'
+    pattern: '**'
+    script: ''
     golangver: 'golang110'
 
     project-type: freestyle
@@ -47,7 +54,7 @@
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-          files: '**'
+          files: '{pattern}'
 
     builders:
       - lf-infra-pre-build
           #!/bin/bash
           cd $WORKSPACE/{path}
           make build
+      - shell: '{script}'
 
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+- job-template:
+    # Job template for Golang verify jobs with subproject support
+
+    <<: *verify_golang_bolierplate
+    name: '{project-name}-{stream}-{subproject}-verify-golang'
+
 - job-template:
     # Job template for Golang merge jobs
     #
     name: '{project-name}-{stream}-docker-golang-shell-daily'
     golangver: 'golang110'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     disabled: false
     properties:
       - infra-properties:
index 12ce9a3..a147e1a 100644 (file)
@@ -20,6 +20,7 @@
     submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
+    build-timeout: 120
 
     #####################
     # Job Configuration #
@@ -55,6 +56,7 @@
     # Job template for helm verify jobs
 
     <<: *helm_job_boiler_plate
+    concurrent: true
 
     scm:
       - gerrit-trigger-scm:
index c7fe3cf..7224b75 100644 (file)
     project-type: freestyle
     concurrent: true
     node: '{build-node}'
+    build-env-variables: ''
     pattern: '**'
     pom:
-
+    mvn-opts: ''
+    java-opts: ''
+    java-version: openjdk8
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - inject:
+          properties-content: "{build-env-variables}"
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{obj:pom}'
           goals: 'clean install -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}'
+          properties:
+            - MAVEN_OPTS='{mvn-opts}'
+          java-opts:
+            - "{java-opts}"
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
     <<: *verify_java_defaults
     name: '{project-name}-{stream}-{subproject}-verify-java'
 
+- job-template:
+    # Job template for Java integration pairwise jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean install
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *verify_java_defaults
+    name: '{project-name}-{stream}-integration-pairwise'
+    triggers:
+      - timed: '@daily'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{obj:pattern}'
+
 - job-template:
     # Job template for Java daily release jobs
     #
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
-- job-template:
-    # Job template for Java daily release jobs
-    #
-    # The purpose of this job template is to run:
-    # 1. maven set versions
-    # 2. maven clean deploy -P {mvn-profile} with Sonar scans
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-release-version-profile-java-daily'
-
-    project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disabled}'
-    maven-deploy-properties:
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: '@daily'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - inject:
-          properties-file: version.properties
-      - maven-set-release-version:
-          maven-version: '{maven-version}'
-          mvn-settings: '{mvn-settings}'
-          pom:
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean deploy -P {mvn-profile} -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-
-- job-template:
-    # Job template for Java daily release jobs with POM not at the root
-    #
-    # The purpose of this job template is to run:
-    # 1. maven clean deploy with Sonar scans
-    #
-    # This job supports subprojects.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    #     pom:       name/location of the pom.xml file relative to the workspace
-
-    name: '{project-name}-{stream}-{subproject}-release-java-daily'
-
-    project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disabled}'
-    maven-deploy-properties:
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: '@daily'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
-          java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=512m'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    # Job template for Java daily release jobs with POM not at the root
-    #
-    # The purpose of this job template is to run:
-    # 1. maven set versions
-    # 2. maven clean deploy with Sonar scans
-    #
-    # This job supports subprojects.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    #     pom:       name/location of the pom.xml file relative to the workspace
-
-    name: '{project-name}-{stream}-{subproject}-release-version-java-daily'
-
-    project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disabled}'
-    version-properties: 'version.properties'
-    maven-deploy-properties:
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: '@daily'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - inject:
-          properties-file: '{version-properties}'
-      - maven-set-release-version:
-          maven-version: '{maven-version}'
-          mvn-settings: '{mvn-settings}'
-          pom: '{pom}'
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-
 - job-template: &merge_java_defaults
     # Job template for Java merge jobs
     #
     pom:
     mvn_properties: []
     mvn-params: ''
+    mvn-opts: ''
+    java-opts: ''
+    java-version: openjdk8
 
     properties:
       - infra-properties:
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*(amd64|arm64).*
+          label: '{project-name}'
+          steps:
+            - shell: !include-raw-escape: global-jjb/shell/docker-login.sh
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{obj:pom}'
           goals: 'clean deploy -B {mvn-params}
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+          properties:
+            - MAVEN_OPTS='{mvn-opts}'
+          java-opts:
+            - "{java-opts}"
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
       - infra-wrappers-docker-build:
           build-timeout: '{build-timeout}'
 
-- job-template:
-    # Job template for building & pushing docker images
-    #
-    # The purpose of this job template is to run:
-    #  1. login to the docker registry
-    #  2. maven clean deploy on the specified profile
-    #
-    # This job uses a conditional regex match step to set versions.
-    # This template supports maven properties.
-    #
-    # Required Variables:
-    #     pom:       name/location of the pom.xml file relative to the workspace
-    #     profile:   the docker profile defined in the pom
-    #     maven-properties: properties passed to maven
-
-    name: '{project-name}-{stream}-docker-java-properties-daily'
-    project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disabled}'
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-      - maven-params:
-          mvn-params: '{mvn-params}'
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-    triggers:
-      # 12 AM UTC
-      - timed: '@daily'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-    builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - conditional-step:
-          condition-kind: regex-match
-          regex: DoSetVersion
-          label: '{setVersion}'
-          steps:
-            - inject:
-                properties-file: version.properties
-            - maven-set-release-version:
-                maven-version: '{maven-version}'
-                mvn-settings: '{mvn-settings}'
-                pom:
-      - docker-login
-      - maven-docker-push-daily:
-          maven-version: '{maven-version}'
-          mvn-settings: '{mvn-settings}'
-          pom: '{docker-pom}'
-          properties: '{maven-properties}'
-          # use default as mvn-profile if profile is not needed
-          mvn-profile: '{mvn-profile}'
-          mvn-params: '{mvn-params}'
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
 - job-template:
     # Job template for building & pushing docker images
     #
 
     name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     disabled: '{disabled}'
     properties:
       - infra-properties:
           # use default as mvn-profile if profile is not needed
           mvn-profile: '{mvn-profile}'
           mvn-params: ''
+
+- job-template:
+    # Job template for Java merge jobs on multiple architectures
+    #
+    # The purpose of this job template is to:
+    # 1. Run parallel {project-name}-{stream}-verify-java jobs for each supported architecture
+    # 2. Build and push a docker manifest list for the images created by
+    #    the previous jobs
+
+    name: '{project-name}-multiarch-{stream}-merge-java'
+    node: '{build-node}'
+    project-type: multijob
+    disabled: '{obj:disabled}'
+    pattern: '**'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - string:
+          name: DOCKER_REGISTRY
+          default: 'none'
+      - string:
+          name: DOCKERHUB_REGISTRY
+          default: 'registry-1.docker.io'
+
+    properties:
+      - throttle:
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '{project-name}-.*-merge-.*'
+          blocking-level: 'NODE'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - multijob:
+          name: 'build docker images'
+          condition: ALWAYS
+          execution-type: PARALLEL
+          projects:
+            - name: '{project-name}-amd64-{stream}-merge-java'
+              kill-phase-on: FAILURE
+              current-parameters: true
+            - name: '{project-name}-arm64-{stream}-merge-java'
+              kill-phase-on: NEVER
+              current-parameters: true
+      - multijob:
+          name: 'publish docker manifest'
+          condition: SUCCESSFUL
+          execution-type: PARALLEL
+          projects:
+            - name: '{project-name}-docker-manifest-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                PARENT_JOB_NAME=$JOB_NAME
+                DOCKERHUB_REGISTRY=docker.io
index fcbf745..1ee505f 100644 (file)
@@ -2,69 +2,50 @@
 # vim: sw=2 ts=2 sts=2 et :
 
 - job-template:
-    # Job template for merging a submission.  triggered on
-    # gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then
-    # run script
+    #
+    # job template for verifying gerrit changeset by shell script
+    #
     # Required Variables:
-    #   branch:         git branch
+    #   project-name:   name of project
+    #   area:           area of project covered with this verification job
+    #   project:        name of scm repository to work on
+    #   stream:         name of stream used (set the same as branch if you're not sure)
+    #   branch:         git branch to work on
     #   script:         build script to execute
-    #   mvn-settings:   settings file for this specific job
-    #   mvn-goals:      space separated list of maven build goals (--version
-    #                   for noop, clean deploy for deploy [snapshot])
-    name: '{project-name}-{stream}-merge-scm-mvn-script'
-
-    project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    # Optional Variables:
+    #   pattern:          trigger job only if modification covered file in pattern
+    #   build-node:     label(flavor) of jenkins slave
+    name: '{project-name}-{stream}-{area}-verify-shell'
+    node: '{build-node}'
+    type: freestyle
 
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+    pattern: '**'
 
     parameters:
-      - infra-parameters:
-          project: '{project}'
+      - lf-infra-parameters:
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
+          project: '{project}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          choosing-strategy: 'gerrit'
 
     triggers:
-      - gerrit-trigger-patch-merged:
+      - gerrit-trigger-patch-submitted:
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-          files: '**'
+          files: '{pattern}'
 
     builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - docker-login
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
+      - lf-infra-publish
 
 - job-template:
     # Job template for 2 scm and script trigger
     publishers:
       - infra-shiplogs:
           maven-version: '{maven-version}'
-
-- job-template:
-    # 1. PULL the desired image
-    # 2. TAG it to the desired release name
-    # 3. PUSH the newly tagged image on release repo
-
-    name: '{project-name}-docker-image-blessing'
-
-    project-type: freestyle
-    concurrent: true
-    node: 'ubuntu1604-docker-8c-8g'
-
-    parameters:
-      - string:
-          name: X
-          description: "x VERSION of the STAGING image to bless into this RELEASE VERSION
-            Example : 1"
-      - string:
-          name: Y
-          description: "y VERSION of the STAGING image to bless into this RELEASE VERSION
-            Example : 2"
-      - string:
-          name: Z
-          description: "z VERSION of the RELEASE VERSION
-            Example : 3"
-      - string:
-          name: PROJECT
-          default: '{project}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - docker-login
-      - shell: !include-raw: include-docker-blessing.sh
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
index 11b90ae..9b6824c 100644 (file)
@@ -15,6 +15,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'holmes/common'
     stream:
     mvn-settings: 'holmes-common-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: holmes-common-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'holmes/common'
     project-name: 'holmes-common'
     branch: 'master'
@@ -53,5 +60,6 @@
     project-name: holmes-common
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: holmes/common
     branch: master
diff --git a/jjb/holmes/holmes-csit.yaml b/jjb/holmes/holmes-csit.yaml
deleted file mode 100644 (file)
index 9d2323a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: holmes-rule-management-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'holmes-rule-management'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'holmes-rule-management-master-docker-java-daily'
-    robot-options: ''
-    branch: 'master'
index 0279d4e..f9c19be 100644 (file)
@@ -11,7 +11,9 @@
           maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'holmes/engine-management'
     stream:
       - 'master':
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: holmes-engine-management-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'holmes/engine-management'
     project-name: 'holmes-engine-management'
     branch: 'master'
@@ -51,5 +58,6 @@
     project-name: holmes-engine-management
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: holmes/engine-management
     branch: master
index df26710..347c6b7 100644 (file)
@@ -11,7 +11,9 @@
           maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'holmes/rule-management'
     stream:
       - 'master':
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: holmes-rule-management-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'holmes/rule-management'
     project-name: 'holmes-rule-management'
     branch: 'master'
@@ -51,5 +58,6 @@
     project-name: holmes-rule-management
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: holmes/rule-management
     branch: master
diff --git a/jjb/include-docker-blessing.sh b/jjb/include-docker-blessing.sh
deleted file mode 100755 (executable)
index 0c843f7..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-if [ -z "$X" ];
-then
-    echo "Error: no X version provided"
-    exit 1
-fi
-
-if [ -z "$Y" ];
-then
-    echo "Error: no Y version provided"
-    exit 1
-fi
-
-if [ -z "$Z" ];
-then
-    echo "Error: no Z version provided"
-    exit 1
-fi
-
-if [ -z "$PROJECT" ];
-then
-    echo "Error: no project provided"
-    exit 1
-fi
-
-RELEASE_REPOSITORY="nexus3.onap.org:10002"
-SNAPSHOT_REPOSITORY="nexus3.onap.org:10003"
-STAGING_IMAGE="openecomp/$PROJECT:$X.$Y-STAGING-latest"
-RELEASE_IMAGE="openecomp/$PROJECT:$X.$Y.$Z"
-
-docker pull "$SNAPSHOT_REPOSITORY/$STAGING_IMAGE"
-docker tag "$SNAPSHOT_REPOSITORY/$STAGING_IMAGE" "$RELEASE_REPOSITORY/$RELEASE_IMAGE"
-docker push "$RELEASE_REPOSITORY/$RELEASE_IMAGE"
diff --git a/jjb/integration/docker/info-integration-docker.yaml b/jjb/integration/docker/info-integration-docker.yaml
new file mode 100644 (file)
index 0000000..071f816
--- /dev/null
@@ -0,0 +1,9 @@
+---
+- project:
+    name: integration-docker-onap-java11-info
+    project-name: integration-docker-onap-java11
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/docker/onap-java11
+    branch: master
index a7fe916..38c848d 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'integration'
+    recipients: 'morgan.richomm@orange.com bf1936@att.com'
     stream:
       - 'master':
           branch: 'master'
       - 'vCPE':
           trigger_jobs:
     robot-options: ''
+
+- project:
+    name: integration-csit-info
+    project-name: integration-csit
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/csit
+    branch: master
diff --git a/jjb/integration/integration-devtool.yaml b/jjb/integration/integration-devtool.yaml
deleted file mode 100644 (file)
index b656b4f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- project:
-    name: integration-devtool
-    project-name: 'integration-devtool'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-    project: 'integration/devtool'
-    subproject:
-      - 'devtool':
-          path: '.'
-          pattern: '**'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-devtool-settings'
-    build-node: ubuntu1604-builder-2c-1g
-
-- project:
-    name: integration-devtool-info
-    project-name: integration-devtool
-    jobs:
-      - gerrit-info-yaml-verify
-    project: integration/devtool
-    branch: master
diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml
new file mode 100644 (file)
index 0000000..c3a2ab9
--- /dev/null
@@ -0,0 +1,56 @@
+---
+- project:
+    name: integration-docker-compose
+    project-name: 'integration'
+    project: 'integration'
+    stream:
+      - 'master':
+          branch: 'master'
+    jobs:
+      - integration-docker-compose-verify
+    subproject:
+      - 'netconf-pnp-simulator':
+          pattern: 'test/mocks/netconf-pnp-simulator/modules/**'
+          docker_root: 'test/mocks/netconf-pnp-simulator/modules'
+          netconf_sim_service_name: 'netconf-pnp-simulator'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            docker-compose up -d
+          post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
+      - 'emssimulator-swm-netconf':
+          pattern: 'test/mocks/emssimulator/swm-netconf/**'
+          docker_root: 'test/mocks/emssimulator/swm-netconf'
+          netconf_sim_service_name: 'ems-netconf-swm'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            docker-compose up -d
+          post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
+      - 'pmsh-pnf-sim':
+          pattern: 'test/mocks/pmsh-pnf-sim/docker-compose/**'
+          docker_root: 'test/mocks/pmsh-pnf-sim/docker-compose'
+          netconf_sim_service_name: 'netopeer2'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            docker-compose up -d
+          post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
+      - 'datafilecollector-testharness':
+          pattern: 'test/mocks/datafilecollector-testharness/**'
+          docker_root: 'test/mocks/datafilecollector-testharness/simulator-group'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            ./prepare-images.sh
+            ./docker-compose-setup.sh
+      - 'prov-mns-provider':
+          pattern: 'test/mocks/prov-mns-provider/**'
+          docker_root: 'test/mocks/prov-mns-provider'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            docker build . -t prov-mns-provider
+            docker-compose up -d
+            cd src
+            tox
index 8fea30f..3920653 100644 (file)
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
           pattern: 'test/mocks/sniroemulator/**'
-      - 'pnfsimulator':
-          pom: 'test/mocks/pnfsimulator/pom.xml'
-          pattern: 'test/mocks/pnfsimulator/**'
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: integration-netconf-pnp-simulator
+    project: integration
+    stream:
+      - 'master':
+          branch: 'master'
+    # Required by verifier
+    mvn-settings: 'integration-settings'
+    project-name: 'integration-netconf-pnp-simulator'
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
+    docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
+    docker-root: test/mocks/netconf-pnp-simulator/engine
+    container-tag-method: yaml-file
+    post_docker_build_script: |
+        #!/bin/bash
+        set -eux
+        cd "$DOCKER_ROOT"
+        # To simplify the references inside tox.ini and tests/settings.py
+        docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
+        tox
+    build-node: centos7-docker-8c-8g
+    build-timeout: 20
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
index 23eaae6..9964750 100644 (file)
     builders:
       - shell: "${WORKSPACE}/autorelease/scripts/set-version.sh"
 
+- builder:
+    name: integration-install-vagrant
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -ex # Fail build if any setup step fails
+          sudo add-apt-repository --yes ppa:tiagohillebrandt/vagrant
+          sudo apt update
+          sudo apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant
+          vagrant plugin install vagrant-libvirt
+          vagrant plugin install vagrant-disksize
+          mkdir -p ~/.ssh
+
+- builder:
+    name: integration-docker-compose-logs
+    builders:
+      - shell: !include-raw: shell/docker-compose-logs.sh
+
 - publisher:
     name: integration-robot
     publishers:
           unstable-threshold: '{unstable-if}'
           pass-threshold: '{pass-if}'
           only-critical: false
+
+- publisher:
+    name: integration-docker-compose-logs
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - FAILURE
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - integration-docker-compose-logs
index e245103..40a6a93 100644 (file)
@@ -1,11 +1,13 @@
 ---
 - job-template:
     name: '{project-name}-{stream}-verify-csit-{functionality}'
-    disabled: false
+    disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
@@ -42,6 +44,8 @@
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           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}-arm64-{stream}-verify-csit-{functionality}'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           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}-verify-csit-{functionality}-testng'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           link-to-last-build: false
           name: ExtentReport
       - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
 
 - job-template:
     name: '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           link-to-last-build: false
           name: ExtentReport
       - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
 
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}'
-    disabled: false
+    disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           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}-arm64-{stream}-csit-{functionality}'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           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}-csit-{functionality}-testng'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           link-to-last-build: false
           name: ExtentReport
       - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
 
 - job-template:
     name: '{project-name}-arm64-{stream}-csit-{functionality}-testng'
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           link-to-last-build: false
           name: ExtentReport
       - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
index a01e82f..e434d0a 100644 (file)
@@ -2,7 +2,7 @@
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-merge'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
 
     properties:
@@ -64,7 +64,7 @@
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-verify'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
 
     properties:
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+
+- job-template:
+    name: '{project-name}-{stream}-{subproject}-docker-compose-verify'
+    id: integration-docker-compose-verify
+    project-type: freestyle
+    description: 'This job validates Docker Compose based projects'
+    node: 'ubuntu1804-docker-8c-8g'
+    docker_root: '$WORKSPACE'
+    post_script: ''
+    netconf_sim_service_name: ''
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - inject:
+          properties-content: |
+            DOCKER_ROOT={docker_root}
+            NETCONF_SIM_SERVICE_NAME={netconf_sim_service_name}
+      - shell: '{script}'
+      - shell: '{post_script}'
+
+    publishers:
+      - integration-docker-compose-logs
+      - lf-infra-publish
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
new file mode 100644 (file)
index 0000000..61d09d7
--- /dev/null
@@ -0,0 +1,100 @@
+---
+- job-template:
+    # Job template for verifying Vagrantfiles
+    #
+    # The purpose of this job template is to run:
+    # vagrant validate
+
+    name: '{project-name}-{stream}-verify-vagrantfile'
+    project-type: freestyle
+    description: 'Job intended for validating vagrantfiles'
+    node: ubuntu1804-builder-4c-4g
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**/Vagrantfile'
+
+    builders:
+      - integration-install-vagrant
+      - shell: !include-raw-escape: 'vagrantfile-verify.sh'
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    # Job template for running linters against specific file formats
+    #
+    # Required Variables:
+    #     python-version: Python version to deploy in venv
+    #     tox-env:        Tox environments to run
+    #     tox-dir:        Directory containing the project's tox.ini
+    #     pattern:        List of file patterns to scan
+
+    name: '{project-name}-{stream}-{subproject}-lint'
+    id: integration-linters
+    project-type: freestyle
+    description: 'Job intended for running linters with Tox and Coala'
+    build-node: ubuntu1804-builder-4c-4g
+    node: '{build-node}'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - lf-infra-tox-parameters:
+          tox-dir: '{tox-dir}'
+          tox-envs: '{tox-envs}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - lf-infra-tox-install:
+          python-version: '{python-version}'
+      - lf-infra-tox-run:
+          parallel: 'false'
+
+    publishers:
+      - lf-infra-publish
index 714878e..5b211d7 100644 (file)
       - project-view
 
 - project:
-    name: integration
-    project-name: 'integration'
+    name: integration-info
+    project-name: integration
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-          mvn-pom: 'version-manifest/pom.xml'
-          mvn-params: '-f version-manifest/pom.xml'
-    project: 'integration'
-    subproject:
-      - 'version-manifest':
-          pom: 'version-manifest/pom.xml'
-          pattern: 'version-manifest/**'
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration
+    branch: master
+
+- project:
+    name: integration-verify-python
+    project-name: integration
+    project: integration
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'integration-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: 'centos7-builder-4c-4g'
+    subproject:
+      - 'test-vcpe':
+          path: 'test/vcpe'
+          pattern: 'test/vcpe/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
 
 - project:
-    name: integration-clm
-    jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f version-manifest/pom.xml'
-    nexus-iq-namespace: 'onap-'
-    project: integration
+    name: integration-verify-vagrantfile
     project-name: 'integration'
+    project: 'integration'
     stream:
       - 'master':
           branch: 'master'
+    jobs:
+      - '{project-name}-{stream}-verify-vagrantfile'
+
+- project:
+    name: integration-verify-golang
+    project-name: 'integration'
+    project: 'integration'
+    golangver: 'golang112'
     mvn-settings: 'integration-settings'
+    archive-artifacts: ''
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-golang'
+    subproject:
+      - 'test-security-k8s':
+          path: 'test/security/k8s'
+          pattern: '{path}/**'
+          build-node: ubuntu1804-builder-4c-4g
+          script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/{path}
+              make test
+      - 'test-security-sslendpoints':
+          path: 'test/security/sslendpoints'
+          pattern: '{path}/**'
+          build-node: ubuntu1804-docker-8c-8g
+          script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/{path}
+              rm -rf $WORKSPACE/{path}/bin
+              make docker-build
+              make test
+              make clean
+    stream:
+      - 'master':
+          branch: 'master'
 
 - project:
-    name: integration-info
-    project-name: integration
+    name: integration-linters
+    project: 'integration'
+    project-name: 'integration'
+    python-version: python3
     jobs:
-      - gerrit-info-yaml-verify
-    project: integration
-    branch: master
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+      - 'rst':
+          tox-dir: '.'
+          tox-envs: 'rst'
+          pattern: '**/*.rst'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/netconf-pnp-simulator-verify.sh b/jjb/integration/netconf-pnp-simulator-verify.sh
new file mode 100644 (file)
index 0000000..28e8ae3
--- /dev/null
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Copyright 2020 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Script verifies if all services in Netconf simulator's docker
+# service container were launched successfully.
+
+echo "---> netconf-pnp-simulator-verify.sh"
+
+set -e # Exit with zero only if all commands succeed
+
+DOCKER_COMPOSE_LOG="/tmp/docker-compose.log"
+DOCKER_COMPOSE_LOG_MSG=( "success:" "entered RUNNING state" )
+DOCKER_COMPOSE_SLEEP_INTERVAL=60
+
+if [ -z ${NETCONF_SIM_SERVICE_NAME} ];
+then
+    echo "ERROR: netconf-pnp-simulator service name not set."
+    exit 1
+fi
+
+pushd $DOCKER_ROOT
+
+# Dump container logs
+sleep ${DOCKER_COMPOSE_SLEEP_INTERVAL} # Hang for a while so the services settle
+docker-compose logs --no-color > ${DOCKER_COMPOSE_LOG}
+
+# Get the supervisord services running within container
+supervisord_services=($(docker-compose exec -T ${NETCONF_SIM_SERVICE_NAME} /bin/sh -c \
+    'cat /etc/supervisord.conf /etc/supervisord.d/*' | grep -ho "program:[-a-zA-Z0-9]*" | cut -d: -f 2))
+
+# Check all services are running and fail if not
+for service in ${supervisord_services[@]};
+do
+    if ! grep -q "${DOCKER_COMPOSE_LOG_MSG[0]} $service ${DOCKER_COMPOSE_LOG_MSG[1]}" ${DOCKER_COMPOSE_LOG};
+    then
+        echo "ERROR: Service $service is not running, failing the build."
+        exit 1
+    fi
+done
diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml
new file mode 100644 (file)
index 0000000..5b07413
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: integration-simulators-dc-simulator-info
+    project-name: integration-simulators-dc-simulator
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/simulators/dc-simulator
+    branch: master
+
+- project:
+    name: integration-simulators-dc-simulator-linters
+    project: integration/simulators/dc-simulator
+    project-name: integration-simulators-dc-simulator
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
new file mode 100644 (file)
index 0000000..df000a1
--- /dev/null
@@ -0,0 +1,90 @@
+---
+- project:
+      name: integration-simulators-pnf-simulator
+      project-name: integration-pnf-simulator
+      stream:
+          -   'master':
+                  branch: 'master'
+                  java-version: openjdk8
+      project: 'integration/simulators/pnf-simulator'
+      mvn-settings: 'integration-simulators-pnf-simulator-settings'
+      files: '**'
+      maven-deploy-properties: |
+          deployAtEnd=true
+      archive-artifacts: ''
+      build-node: ubuntu1804-docker-8c-8g
+      jobs:
+          - '{project-name}-{stream}-verify-java':
+                mvn-goals: 'clean install'
+          - '{project-name}-{stream}-merge-java':
+                mvn-goals: 'clean deploy'
+          -  '{project-name}-gerrit-release-jobs':
+                 build-node: centos7-docker-8c-8g
+          - gerrit-maven-stage:
+                sign-artifacts: true
+                build-node: centos7-docker-8c-8g
+                maven-versions-plugin: true
+                mvn-goals: 'clean deploy'
+          - gerrit-maven-docker-stage:
+                build-node: ubuntu1804-docker-8c-8g
+                container-public-registry: 'nexus3.onap.org:10001'
+                container-staging-registry: 'nexus3.onap.org:10003'
+                mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+
+- project:
+      name: integration-simulators-pnf-simulator-sonar
+      java-version: openjdk8
+      jobs:
+          - gerrit-maven-sonar
+      sonarcloud: true
+      sonarcloud-project-organization: '{sonarcloud_project_organization}'
+      sonarcloud-api-token: '{sonarcloud_api_token}'
+      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+      sonar-mvn-goal: '{sonar_mvn_goal}'
+      cron: '@daily'
+      build-node: ubuntu1804-docker-8c-8g
+      project: integration/simulators/pnf-simulator
+      project-name: integration-pnf-simulator
+      branch: 'master'
+      mvn-settings: 'integration-simulators-pnf-simulator-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
+- project:
+      name: integration-simulators-pnf-simulator-info
+      project-name: integration-pnf-simulator
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos7-builder-2c-1g
+      project: integration/simulators/pnf-simulator
+      branch: master
+
+- project:
+      name: integration-simulators-pnf-simulator-linters
+      project: integration/simulators/pnf-simulator
+      project-name: integration-pnf-simulator
+      python-version: python3
+      jobs:
+          - integration-linters
+      subproject:
+          - 'yaml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yaml'
+          - 'yml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yml'
+          - 'json':
+                tox-dir: '.'
+                tox-envs: 'json'
+                pattern: '**/*.json'
+          - 'python':
+                tox-dir: '.'
+                tox-envs: 'py'
+                pattern: '**/*.py'
+      stream:
+          - 'master':
+                branch: 'master'
+
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
new file mode 100644 (file)
index 0000000..895854a
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: integration-simulators-ran-simulator-info
+    project-name: integration-simulators-ran-simulator
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/simulators/ran-simulator
+    branch: master
+
+- project:
+    name: integration-simulators-ran-simulator-linters
+    project: integration/simulators/ran-simulator
+    project-name: integration-simulators-ran-simulator
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml
new file mode 100644 (file)
index 0000000..ce2743e
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: integration-usecases-bbs-info
+    project-name: integration-usecases-bbs
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/usecases/bbs
+    branch: master
+
+- project:
+    name: integration-usecases-bbs-linters
+    project: integration/usecases/bbs
+    project-name: integration-usecases-bbs
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/usecases/integration-usecases-mdons.yaml b/jjb/integration/usecases/integration-usecases-mdons.yaml
new file mode 100644 (file)
index 0000000..475b271
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: integration-usecases-mdons-info
+    project-name: integration-usecases-mdons
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/usecases/mdons
+    branch: master
+
+- project:
+    name: integration-usecases-mdons-linters
+    project: integration/usecases/mdons
+    project-name: integration-usecases-mdons
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/vagrantfile-verify.sh b/jjb/integration/vagrantfile-verify.sh
new file mode 100644 (file)
index 0000000..6af0a9d
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright 2020 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> vagrantfile-verify.sh"
+
+set -e
+
+declare -a CHANGED_VAGRANTFILES
+CMD='vagrant validate'
+
+CHANGED_VAGRANTFILES=(`git diff HEAD^ HEAD --name-only "*Vagrantfile"`)
+
+for v_dir in ${CHANGED_VAGRANTFILES[@]};
+do
+  echo "---> Validating ./$v_dir"
+  pushd $(dirname $v_dir)
+  eval "$CMD"
+  popd
+done
diff --git a/jjb/integration/xtesting/info-integration-xtesting.yaml b/jjb/integration/xtesting/info-integration-xtesting.yaml
new file mode 100644 (file)
index 0000000..babd9f6
--- /dev/null
@@ -0,0 +1,9 @@
+---
+- project:
+    name: integration-xtesting-info
+    project-name: integration-xtesting
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/xtesting
+    branch: master
index ff7a59d..234d1fc 100644 (file)
@@ -4,7 +4,7 @@
     description: '{job-desc}'
     disabled: false
     project-type: freestyle
-    build-node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1804-builder-4c-4g
 
     properties:
       - lf-infra-properties:
diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
new file mode 100644 (file)
index 0000000..62d07a7
--- /dev/null
@@ -0,0 +1,68 @@
+---
+- builder:
+    name: lf-onap-releasedockerhub-macro
+    builders:
+      - shell: !include-raw-escape:
+        - ../shell/run_releasedockerhub.sh
+        ##- ../shell/run_releasedockerhub.sh "{org} {summary} {verbose} {copy}"
+
+
+- job:
+    name: lf-onap-release-docker-hub
+    build-timeout: 90
+
+    project-type: freestyle
+    node: ubuntu1804-docker-8c-8g                           ## Probably don't need this much
+    disable-job: false
+    disabled: '{disable-job}'
+
+    # Runs once a week 
+    triggers:
+      - timed: '@weekly'
+
+#   Define needed parameters for lf-infra-docker-login
+    parameters:
+      - string:
+          name: DOCKER_REGISTRY
+          default: 'nexus3.onap.org'
+      - string:
+          name: REGISTRY_PORTS
+          default: '10002'
+      - string:
+          name: DOCKERHUB_REGISTRY
+          default: 'docker.io'
+
+#   Define needed parameters for lf-onap-releasedockerhub-macro
+      - string:
+          name: RELEASEDOCKERHUB_ORG
+          default: 'onap'
+          description: ''
+      - string:
+          name: RELEASEDOCKERHUB_REPO
+          default: ''
+          description: 'Only match repos that contains this string'
+      - string:
+          name: RELEASEDOCKERHUB_EXACT
+          default: ''
+          description: 'Repo has to exactly match RELEASEDOCKERHUB_REPO '
+      - string:
+          name: RELEASEDOCKERHUB_SUMMARY
+          default: 'Yes'
+          description: 'Provides a brief statistic summary of what it found, and what it should do. Activate with Yes'
+      - string:
+          name: RELEASEDOCKERHUB_VERBOSE
+          default: ''
+          description: 'Provides a verbose output of the operations. Activate with Yes'
+      - string:
+          name: RELEASEDOCKERHUB_COPY
+          default: 'Yes'
+          description: 'If a copy operation should be done from Nexus3 to docker hub. Activate with Yes'
+
+
+    builders:
+      - lf-infra-pre-build                                  ## shell/python-tools-install.sh
+      - lf-infra-docker-login:
+          global-settings-file: 'global-settings'
+          settings-file: 'onap-releasedockerhub-authz-settings'
+      - lf-onap-releasedockerhub-macro:
+
index 2dd843f..085788f 100644 (file)
@@ -9,23 +9,23 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-aai-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
 
     mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
 #    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:
     name: logging-analytics-pomba-pomba-aai-context-builder-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-aai-context-builder
     project-name: logging-analytics-pomba-pomba-aai-context-builder
     branch: master
@@ -65,6 +70,7 @@
     project-name: 'logging-analytics-pomba-pomba-aai-context-builder'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-aai-context-builder'
     branch: 'master'
 
index 2fbfff6..0130f17 100644 (file)
@@ -9,24 +9,28 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-audit-common
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: logging-analytics-pomba-pomba-audit-common-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-audit-common
     project-name: logging-analytics-pomba-pomba-audit-common
     branch: master
@@ -38,6 +42,7 @@
     project-name: 'logging-analytics-pomba-pomba-audit-common'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-audit-common'
     branch: 'master'
 
index 091b9a4..0fed024 100644 (file)
@@ -9,31 +9,35 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'docker:build'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-context-aggregator
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 - project:
     name: logging-analytics-pomba-pomba-context-aggregator-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-context-aggregator
     project-name: logging-analytics-pomba-pomba-context-aggregator
     branch: master
@@ -46,6 +50,7 @@
     project-name: 'logging-analytics-pomba-pomba-context-aggregator'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-context-aggregator'
     branch: 'master'
 
index f41625f..bc760c0 100644 (file)
@@ -9,22 +9,22 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-network-discovery-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
 #    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:
     name: logging-analytics-pomba-pomba-network-discovery-context-builder-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-network-discovery-context-builder
     project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
     branch: master
@@ -65,6 +70,7 @@
     project-name: 'logging-analytics-pomba-pomba-network-discovery-context-builder'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-network-discovery-context-builder'
     branch: 'master'
 
index 5bc97bb..17c4198 100644 (file)
@@ -9,22 +9,22 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-sdc-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
 #    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:
     name: logging-analytics-pomba-pomba-sdc-context-builder-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-sdc-context-builder
     project-name: logging-analytics-pomba-pomba-sdc-context-builder
     branch: master
@@ -63,6 +68,7 @@
     project-name: 'logging-analytics-pomba-pomba-sdc-context-builder'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-sdc-context-builder'
     branch: 'master'
 
index cd1d05c..4b94f80 100644 (file)
@@ -9,22 +9,22 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: logging-analytics/pomba/pomba-sdnc-context-builder
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
 #    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: logging-analytics/pomba/pomba-sdnc-context-builder
     project-name: logging-analytics-pomba-pomba-sdnc-context-builder
     branch: master
@@ -60,6 +65,7 @@
     project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-sdnc-context-builder'
     branch: 'master'
 
index 95de71c..8b6c391 100644 (file)
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-8c-8g'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     project: 'logging-analytics'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'logging-analytics-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: logging-analytics-arm64
 #    mvn-settings: 'logging-analytics-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
+
 - project:
     name: logging-analytics-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'logging-analytics'
     project-name: 'logging-analytics'
     branch: 'master'
 
 - project:
     name: logging-analytics-pylog
-    project-name: 'logging-analytics-pylog'
+    project-name: 'logging-analytics'
     project: 'logging-analytics'
-    python-version: python3
+    python-version: python3.6
+    tox-dir: 'pylog/'
+    tox-envs: ''
     stream:
       - 'master':
           branch: 'master'
+    build-node: centos7-builder-4c-4g
     mvn-settings: 'logging-analytics-settings'
     subproject:
       - 'pylog':
-          pom: 'pylog/pom.xml'
           pattern: 'pylog/**'
-          tox-dir: pylog/
-          tox-envs: ''
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - '{project-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: logging-analytics-pylog-python
-    project-name: 'logging-analytics-pylog'
-    project: 'logging-analytics'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'logging-analytics-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
-    subproject:
-      - 'pylog':
           path: 'pylog'
-          pattern: 'pylog/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
 
 - project:
     name: logging-analytics-info
     project-name: 'logging-analytics'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics'
     branch: 'master'
 
similarity index 55%
rename from jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
rename to jjb/modeling/modeling-etsicatalog-csit.yaml
index 9be81e0..e699b68 100644 (file)
@@ -1,14 +1,14 @@
 ---
 - project:
-    name: vfc-nfvo-driver-vnfm-svnfm-csit
+    name: modeling-etsicatalog-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-vnfm-svnfm'
+    project-name: 'modeling-etsicatalog'
+    recipients: 'denghui12@huawei.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily'
+          trigger_jobs: 'modeling-etsicatalog-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
new file mode 100644 (file)
index 0000000..a2fc451
--- /dev/null
@@ -0,0 +1,71 @@
+---
+
+- project:
+    name: modeling-etsicatalog
+    project-name: 'modeling-etsicatalog'
+    project: 'modeling/etsicatalog'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'modeling-etsicatalog-settings'
+    subproject:
+      - 'etsicatalog':
+          path: '.'
+          pattern: '**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh'
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+            build-node: centos7-docker-8c-8g
+    files: '**'
+    archive-artifacts: ''
+    build-node: centos7-redis-4c-4g
+
+- project:
+    name: modeling-etsicatalog-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: centos7-redis-4c-4g
+    project: 'modeling/etsicatalog'
+    project-name: 'modeling-etsicatalog'
+    branch: 'master'
+    mvn-settings: 'modeling-etsicatalog-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: modeling-etsicatalog-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: modeling/etsicatalog
+    project-name: 'modeling-etsicatalog'
+    build-node: centos7-redis-4c-4g
+    branch: 'master'
+    mvn-settings: 'modeling-etsicatalog-settings'
+
+- project:
+    name: modeling-etsicatalog-info
+    project-name: modeling-etsicatalog
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: modeling/etsicatalog
+    branch: master
diff --git a/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml b/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml
deleted file mode 100644 (file)
index 032881c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: modeling-genericparser-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'modeling-genericparser'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'modeling-genericparser-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
\ No newline at end of file
diff --git a/jjb/modeling/modeling-toscaparsers-genericparser.yaml b/jjb/modeling/modeling-toscaparsers-genericparser.yaml
deleted file mode 100644 (file)
index 88ab332..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
----
-
-- project:
-    name: modeling-genericparser
-    project-name: 'modeling-genericparser'
-    project: 'modeling/genericparser'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'modeling-genericparser-settings'
-    subproject:
-      - 'genericparser':
-          path: '.'
-          pattern: '**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-modeling-genericparser-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    build-node: centos7-redis-4c-4g
-
-- project:
-    name: modeling-genericparser-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: centos7-redis-4c-4g
-    project: 'modeling/genericparser'
-    project-name: 'modeling-genericparser'
-    branch: 'master'
-    mvn-settings: 'modeling-genericparser-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: modeling-genericparser-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: modeling/genericparser
-    project-name: 'modeling-genericparser'
-    build-node: centos7-redis-4c-4g
-    branch: 'master'
-    mvn-settings: 'modeling-genericparser-settings'
-
-- project:
-    name: modeling-genericparser-info
-    project-name: modeling-genericparser
-    jobs:
-      - gerrit-info-yaml-verify
-    project: modeling/genericparser
-    branch: master
index 4ff6b3d..e816422 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'modeling-toscaparsers-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'nfvparser':
           path: 'nfvparser/'
     name: modeling-toscaparsers-nfvparser-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'modeling/toscaparsers'
     project-name: 'modeling-toscaparsers-nfvparser'
     branch: 'master'
index 7529485..f4d2365 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-apigateway-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-pom: 'distributions/msb-apigateway/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'msb/apigateway'
     stream:
       - 'master':
@@ -25,7 +31,7 @@
     mvn-settings: 'msb-apigateway-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: msb-apigateway-arm64
 #    mvn-settings: 'msb-apigateway-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: msb-apigateway-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/apigateway'
     project-name: 'msb-apigateway'
     branch: 'master'
@@ -74,5 +85,6 @@
     project-name: msb-apigateway
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: msb/apigateway
     branch: master
diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
deleted file mode 100644 (file)
index 3b4df5f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- project:
-    name: msb-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'msb'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
-      - 'rest-service':
-          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
-      - 'tcp-service':
-          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
-      - 'iag-redirect-discovery':
-          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
index fe84a2c..84d75c8 100644 (file)
@@ -5,13 +5,19 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-discovery-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-pom: 'distributions/msb-discovery/pom.xml'
+          mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'msb/discovery'
     stream:
       - 'master':
@@ -19,7 +25,7 @@
     mvn-settings: 'msb-discovery-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: msb-discovery-arm64
@@ -30,7 +36,7 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-discovery-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    project: 'msb/discovery'
 #    stream:
 #      - 'master':
     name: msb-discovery-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/discovery'
     project-name: 'msb-discovery'
     branch: 'master'
@@ -67,5 +78,6 @@
     project-name: msb-discovery
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: msb/discovery
     branch: master
index 5394ba1..c7bb49b 100644 (file)
@@ -5,7 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
     project: 'msb/java-sdk'
     stream:
       - 'master':
     mvn-settings: 'msb-java-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: msb-java-sdk-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/java-sdk'
     project-name: 'msb-java-sdk'
     branch: 'master'
@@ -43,5 +51,6 @@
     project-name: msb-java-sdk
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: msb/java-sdk
     branch: master
index 732d618..376cc1a 100644 (file)
@@ -5,7 +5,10 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
     project: 'msb/swagger-sdk'
     stream:
       - 'master':
     mvn-settings: 'msb-swagger-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: msb-swagger-sdk-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/swagger-sdk'
     project-name: 'msb-swagger-sdk'
     branch: 'master'
@@ -43,5 +51,6 @@
     project-name: msb-swagger-sdk
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: msb/swagger-sdk
     branch: master
index 5ae8828..472325a 100755 (executable)
@@ -5,16 +5,16 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
-chmod 755 ./ocata/docker/*.*
 chmod 755 ./windriver/docker/*.*
 chmod 755 ./pike/docker/*.*
 chmod 755 ./starlingx/docker/*.*
-chmod 755 ./lenovo/docker/*.*
+#chmod 755 ./lenovo/docker/*.*
 chmod 755 ./fcaps/docker/*.*
+chmod 755 ./hpa/docker/*.*
 
-./ocata/docker/build_image.sh
 ./windriver/docker/build_image.sh
 ./pike/docker/build_image.sh
 ./starlingx/docker/build_image.sh
-./lenovo/docker/build_image.sh
+#./lenovo/docker/build_image.sh
 ./fcaps/docker/build_image.sh
+./hpa/docker/build_image.sh
diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
deleted file mode 100755 (executable)
index bdb5a84..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-echo '========================== Building docker for vesagent =========================='
-chmod 755 ./vesagent/docker/*.*
-./vesagent/docker/docker-build.sh
index c720098..a5cc39e 100644 (file)
@@ -1,8 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-# setting-up bash flags
 set -x -e -o pipefail
-
-# run all-in-one deployment
 cd ./kud/ci
-sudo bash -x ./ci-kud-installer.sh
+bash -x ./kud-installer.sh
diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml
deleted file mode 100644 (file)
index 1094631..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: multicloud-azure-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-azure'
-    stream: 'master'
-    functionality:
-      - 'functionality1':
-          trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
index b90b929..da9827b 100644 (file)
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-azure-arm64-java
 #            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: multicloud-azure-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/azure'
     project-name: 'multicloud-azure'
     branch: 'master'
@@ -81,5 +86,6 @@
     project-name: multicloud-azure
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/azure
     branch: master
index 5066a4c..8aec29b 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'multicloud-azure-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'azure':
           path: 'azure'
index 1687e9c..8538713 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud'
+    recipients: 'bin.yang@windriver.com'
     stream: 'master'
     functionality:
       - 'functionality1':
index c2b72cf..3233118 100644 (file)
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-framework-arm64-java
 #            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: multicloud-framework-multivimbroker-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/framework'
     project-name: 'multicloud-framework-multivimbroker'
     branch: 'master'
     name: multicloud-framework-artifactbroker-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/framework'
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
index c8b4b35..d81081a 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'multicloud-framework-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'multivimbroker':
           path: 'multivimbroker'
diff --git a/jjb/multicloud/multicloud-framework.yaml b/jjb/multicloud/multicloud-framework.yaml
new file mode 100644 (file)
index 0000000..cec2f67
--- /dev/null
@@ -0,0 +1,8 @@
+- project:
+    name: multicloud-framework-info
+    project-name: multicloud-framework
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud/framework
+    branch: master
diff --git a/jjb/multicloud/multicloud-k8s-csit.yaml b/jjb/multicloud/multicloud-k8s-csit.yaml
deleted file mode 100644 (file)
index a5a1540..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: multicloud-k8s-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-k8s'
-    stream: 'master'
-    functionality:
-      - 'functionality1':
-          trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily'
-    robot-options: ''
-    branch: 'master'
diff --git a/jjb/multicloud/multicloud-k8s-kud-deployment.yaml b/jjb/multicloud/multicloud-k8s-kud-deployment.yaml
deleted file mode 100644 (file)
index d533464..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- project:
-    name: multicloud-k8s-kud-deployment
-    project: 'multicloud/k8s'
-    build-node: ubuntu1604-builder-4c-4g
-    kud_build_script: !include-raw-escape: kud-deployment.sh
-
-    stream:
-      - 'master':
-          branch: 'master'
-
-    jobs:
-      - '{name}-{stream}-shell-6hrs':
-          script: '{kud_build_script}'
-
index d4aa0be..283aa34 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: multicloud-k8s
     project-name: 'multicloud-k8s'
-    path: 'src/k8splugin'
+    path: 'src'
     golangver: 'golang112'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-golang-shell-daily':
           script:
             !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
+      - '{project-name}-{stream}-{area}-verify-shell':
+          area: kud-deployment
+          script:
+            !include-raw-escape: 'kud-deployment.sh'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'multicloud/k8s'
     subproject:
       - validation-scripts:
@@ -22,7 +28,7 @@
     mvn-settings: 'multicloud-k8s-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-k8s-arm64
 #    mvn-settings: 'multicloud-k8s-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: multicloud-k8s-info
     project-name: multicloud-k8s
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/k8s
     branch: master
index 9630ab3..f6710b2 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-fcaps'
+    recipients: 'bin.yang@windriver.com'
     stream: 'master'
     functionality:
       - 'functionality1':
index b97abda..92f21d2 100644 (file)
@@ -1,13 +1,13 @@
 ---\r
-- project:\r
-    name: multicloud-openstack-lenovo-csit\r
-    jobs:\r
-      - '{project-name}-{stream}-verify-csit-{functionality}'\r
-      - '{project-name}-{stream}-csit-{functionality}'\r
-    project-name: 'multicloud-lenovo'\r
-    stream: 'master'\r
-    functionality:\r
-      - 'functionality1':\r
-          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'\r
-    robot-options: ''\r
-    branch: 'master'\r
+#- project:\r
+#    name: multicloud-openstack-lenovo-csit\r
+#    jobs:\r
+#      - '{project-name}-{stream}-verify-csit-{functionality}'\r
+#      - '{project-name}-{stream}-csit-{functionality}'\r
+#    project-name: 'multicloud-lenovo'\r
+#    stream: 'master'\r
+#    functionality:\r
+#      - 'functionality1':\r
+#          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'\r
+#    robot-options: ''\r
+#    branch: 'master'\r
diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml
deleted file mode 100644 (file)
index d44ac3c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- project:
-    name: multicloud-openstack-ocata-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-ocata'
-    stream: 'master'
-    functionality:
-      - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
-#            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
-      - 'hpa-discovery':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
-#            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
deleted file mode 100644 (file)
index 2e36856..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- project:
-    name: multicloud-openstack-pike-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-pike'
-    stream: 'master'
-    functionality:
-      - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
-#            - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
index f2dd999..39dae5e 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-starlingx'
+    recipients: 'bin.yang@windriver.com'
     stream: 'master'
     functionality:
       - 'functionality1':
index 4becc19..ebae903 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'multicloud-vmware'
+    recipients: 'bin.yang@windriver.com'
     stream: 'master'
     functionality:
       - 'functionality1':
index 40c79e6..4dad5cb 100644 (file)
           pom: 'vio/pom.xml'
           pattern: 'vio/**'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-openstack-vmware-arm64-java
@@ -49,7 +51,7 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #
     name: multicloud-openstack-vmware-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack/vmware'
     project-name: 'multicloud-openstack-vmware'
     branch: 'master'
@@ -73,6 +80,7 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack/vmware
     project-name: 'multicloud-openstack-vmware'
+    build-node: 'ubuntu1804-builder-4c-4g'
     branch: 'master'
     mvn-settings: 'multicloud-openstack-vmware-settings'
 
@@ -81,5 +89,6 @@
     project-name: multicloud-openstack-vmware
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/openstack/vmware
     branch: master
index a23ecf3..973ca51 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'multicloud-openstack-vmware-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'vio':
           path: 'vio'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
deleted file mode 100644 (file)
index 0066522..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- project:
-    name: multicloud-openstack-vmware-vesagent-java
-    project-name: 'multicloud-openstack-vmware-vesagent'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    subproject:
-      - 'vesagent':
-          pom: 'vesagent/pom.xml'
-          pattern: 'vesagent/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-#- project:
-#    name: multicloud-openstack-vmware-vesagent-arm64-java
-#    project-name: 'multicloud-openstack-vmware-vesagent-arm64'
-#    project: 'multicloud/openstack/vmware'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-openstack-vmware-settings'
-#    subproject:
-#      - 'vesagent':
-#          pom: 'vesagent/pom.xml'
-#          pattern: 'vesagent/**'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
-#    files: '**'
-#    archive-artifacts: ''
diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
deleted file mode 100644 (file)
index ca22904..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
-    name: multicloud-openstack-vmware-vesagent-python
-    project-name: 'multicloud-openstack-vmware-vesagent'
-    project: 'multicloud/openstack/vmware'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
-    subproject:
-      - 'vesagent':
-          path: 'vesagent'
-          pattern: 'vesagent/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
deleted file mode 100644 (file)
index fa8dfd4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- project:
-    name: multicloud-openstack-windriver-csit
-    jobs:
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-windriver'
-    stream: 'master'
-    functionality:
-      - 'functionality1':
-          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
index 9947419..764748f 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'multicloud-openstack-settings'
     subproject:
-      - 'ocata':
-          path: 'ocata'
-          pattern: 'ocata/**'
-          pom: 'ocata/pom.xml'
-      - 'ocata_share':
-          path: 'ocata'
-          pattern: 'share/**'
-          pom: 'ocata/pom.xml'
       - 'pike':
           path: 'pike'
           pattern: 'pike/**'
           path: 'fcaps'
           pattern: 'fcaps/**'
           pom: 'fcaps/pom.xml'
-      - 'lenovo':
-          path: 'lenovo'
-          pattern: 'lenovo/**'
-          pom: 'lenovo/pom.xml'
-      - 'lenovo_share':
-          path: 'lenovo'
-          pattern: 'share/**'
-          pom: 'lenovo/pom.xml'
+#      - 'lenovo':
+#          path: 'lenovo'
+#          pattern: 'lenovo/**'
+#          pom: 'lenovo/pom.xml'
+#      - 'lenovo_share':
+#          path: 'lenovo'
+#          pattern: 'share/**'
+#          pom: 'lenovo/pom.xml'
+      - 'hpa':
+          path: 'hpa'
+          pattern: 'hpa/**'
+          pom: 'hpa/pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: centos7-docker-8c-8g
+          maven-goals: install
+          mvn-params: '-P docker'
+          maven-versions-plugin: true
+          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
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-memcached-4c-4g'
+    build-node: 'centos7-builder-4c-4g'
 
 #- project:
 #    name: multicloud-openstack-arm64
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #
-- project:
-    name: multicloud-openstack-ocata-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-ocata'
-    branch: 'master'
-    mvn-params: '-f ocata/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
     name: multicloud-openstack-windriver-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-windriver'
     branch: 'master'
     name: multicloud-openstack-pike-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-pike'
     branch: 'master'
     name: multicloud-openstack-starlingx-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-starlingx'
     branch: 'master'
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack
     project-name: 'multicloud-openstack'
-    build-node: ubuntu1604-memcached-4c-4g
+    build-node: ubuntu1804-memcached-4c-4g
     branch: 'master'
     mvn-settings: 'multicloud-openstack-settings'
 
     name: multicloud-openstack-fcaps-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-fcaps'
     branch: 'master'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+#- project:
+#    name: multicloud-openstack-lenovo-sonar
+#    jobs:
+#      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+#    cron: '@daily'
+#    build-node: ubuntu1804-builder-4c-4g
+#    project: 'multicloud/openstack'
+#    project-name: 'multicloud-openstack-lenovo'
+#    branch: 'master'
+#    mvn-params: '-f lenovo/pom.xml'
+#    mvn-settings: 'multicloud-openstack-settings'
+#    mvn-goals: 'clean install'
+#    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
-    name: multicloud-openstack-lenovo-sonar
+    name: multicloud-openstack-hpa-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-lenovo'
+    project-name: 'multicloud-openstack-hpa'
     branch: 'master'
-    mvn-params: '-f lenovo/pom.xml'
+    mvn-params: '-f hpa/pom.xml'
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     project-name: multicloud-openstack
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/openstack
     branch: master
diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml
deleted file mode 100644 (file)
index a0dbc81..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- project:
-     name: music-csit
-     jobs:
-       - '{project-name}-{stream}-verify-csit-{functionality}'
-       - '{project-name}-{stream}-csit-{functionality}'
-     project-name: 'music'
-     stream: 'master'
-     functionality:
-       - 'music-test-plan':
-           trigger_jobs: 'music-master-docker-version-java-daily'
-     robot-options: ''
-     branch: 'master'
-
-
index 261c94a..d5b0308 100644 (file)
     mvn-settings: 'music-distributed-kv-store-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: music-distributed-kv-store-info
     project-name: music-distributed-kv-store
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: music/distributed-kv-store
     branch: master
index f981b21..1450e9c 100644 (file)
@@ -9,6 +9,13 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-version-plugin: true
+          mvn-pom: 'jar/pom.xml'
+          mvn-params: '-f jar/pom.xml'
+          pattern: 'jar/**'
     project: 'music'
     stream:
       - 'jar-master':
@@ -20,7 +27,7 @@
     mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
index 273efcf..5f2c154 100644 (file)
@@ -16,7 +16,7 @@
     mvn-settings: 'music-mdbc-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
@@ -34,5 +34,6 @@
     project-name: music-mdbc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: music/mdbc
     branch: master
index 0349f9b..93ffe45 100644 (file)
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -24,7 +24,7 @@
     mvn-settings: 'music-prom-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
@@ -42,5 +42,6 @@
     project-name: music-prom
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: music/prom
     branch: master
index a69bb7e..fb7bdd8 100644 (file)
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'music'
     stream:
       - 'master':
     mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: music-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'music'
     project-name: 'music'
     branch: 'master'
@@ -61,5 +68,6 @@
     project-name: music
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: music
     branch: master
index 7e462d2..5e96e18 100644 (file)
@@ -2,13 +2,24 @@
 - project:
     name: offline-installer
     project-name: 'offline-installer'
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh
 
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
 
     jobs:
       - '{project-name}-{stream}-review':
           build_script: '{offline_review_bootstrap}'
+
+- project:
+    name: offline-installer-info
+    project-name: offline-installer
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: oom/offline-installer
+    branch: master
index 5a7d377..5868f9f 100644 (file)
@@ -6,23 +6,27 @@
     mvn-settings: oom-settings
     mvn-global-settings: global-settings
     archive-artifacts: ''
-    build-node: ubuntu1604-helm-2c-1g
+    build-node: ubuntu1804-helm-2c-1g
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
         #!/bin/bash
         set -e -o pipefail
         cd kubernetes/
-        if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then
-          echo "[ERROR] Only release images are allowed in helm charts."
-          exit 1
+        if [ "$GERRIT_BRANCH" != "staging" ]; then
+          if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then
+            echo "[ERROR] Only release images are allowed in helm charts."
+            exit 1
+          fi
         fi
         make all
     subproject_build_script: |
         #!/bin/bash
         cd kubernetes/
-        if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then
-          echo "[ERROR] Only release images are allowed in helm charts."
-          exit 1
+        if [ "$GERRIT_BRANCH" != "staging" ]; then
+          if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then
+            echo "[ERROR] Only release images are allowed in helm charts."
+            exit 1
+          fi
         fi
         make common
         make {subproject}
@@ -31,6 +35,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
       - 'casablanca':
           branch: 'casablanca'
 
index 2daca91..8defb44 100644 (file)
@@ -13,7 +13,7 @@
    files: '**'
    archive-artifacts: ''
    build-timeout: 60
-   build-node: ubuntu1604-docker-8c-8g
+   build-node: ubuntu1804-docker-8c-8g
    submodule-recursive: true
 
    jobs:
@@ -53,5 +53,6 @@
     project-name: oomconfig
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: oom
     branch: master
index 5dc9d30..fd35695 100644 (file)
@@ -15,7 +15,9 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-registrator-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'oom/registrator'
     stream:
       - 'master':
@@ -23,7 +25,7 @@
     mvn-settings: 'oom-registrator-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: oom-registrator-clm
@@ -40,5 +42,6 @@
     project-name: oom-registrator
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: oom/registrator
     branch: master
index b5f9150..aced946 100644 (file)
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     project: 'oparent'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch:  'elalto'
     mvn-settings: 'oparent-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: oparent-clm
@@ -39,5 +45,6 @@
     project-name: oparent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: oparent
     branch: master
index b956da7..03b9be8 100644 (file)
@@ -25,7 +25,7 @@
 
     concurrent: false
 
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     parameters:
       - string:
@@ -71,7 +71,7 @@
 
     concurrent: false
 
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     triggers:
       - jms-messaging:
index 6c93c8b..af73158 100644 (file)
@@ -6,5 +6,8 @@ CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
 chmod 755 ./*.*
+cd ./valetapi
+./build-dockers.sh
 
+cd ../engine
 ./build-dockers.sh
index b655a67..3b1de27 100644 (file)
@@ -1,15 +1,16 @@
----\r
-- project:\r
-     name: optf-cmso-csit\r
-     jobs:\r
-       - '{project-name}-{stream}-verify-csit-{functionality}'\r
-       - '{project-name}-{stream}-csit-{functionality}'\r
-     project-name: 'optf-cmso'\r
-     stream:\r
-       - 'master':\r
-           branch: master\r
-     functionality:\r
-       - 'cmso':\r
-           trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'\r
-     robot-options: ''\r
-     branch: 'master'\r
+---
+- project:
+     name: optf-cmso-csit
+     jobs:
+       - '{project-name}-{stream}-verify-csit-{functionality}'
+       - '{project-name}-{stream}-csit-{functionality}'
+     project-name: 'optf-cmso'
+     recipients: 'snarayanan@research.att.com'
+     stream:
+       - 'master':
+           branch: master
+     functionality:
+       - 'cmso':
+           trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'
+     robot-options: ''
+     branch: 'master'
index 5b240f4..2c0d585 100644 (file)
     project-name: 'optf-cmso'
     jobs:
       - gerrit-maven-stage:
-          maven-versions-plugin: true
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: false
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: false
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
       - '{project-name}-{stream}-verify-java-checkstyle':
          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-merge-properties-java':
          mvn_properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-docker-java-properties-daily':
-         setVersion: 'DoSetVersion'
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-Dmaven.test.skip=true'
-         maven-properties: |
-          cmso.registry=$
-
-    build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/cmso'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-cmso-settings'
+    java-version: openjdk11
+
     subproject:
       - 'cmso':
           path: '.'
     jobs:
       - gerrit-maven-sonar:
           mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001  -DskipIntegrationTests=false'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/cmso'
     project-name: 'optf-cmso'
     branch: 'master'
     mvn-settings: 'optf-cmso-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: optf-cmso-clm
     nexus-iq-namespace: 'onap-'
     project: optf/cmso
     project-name: 'optf-cmso'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-cmso-settings'
+    java-version: openjdk11
 
 - project:
     name: optf-cmso-info
     project-name: optf-cmso
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: optf/cmso
     branch: master
diff --git a/jjb/optf/optf-fgps-csit.yaml b/jjb/optf/optf-fgps-csit.yaml
deleted file mode 100644 (file)
index a60c453..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- project:
-     name: optf-fgps-csit
-     jobs:
-       - '{project-name}-{stream}-verify-csit-{functionality}'
-       - '{project-name}-{stream}-csit-{functionality}'
-     project-name: 'optf-fgps'
-     stream:
-       - 'master':
-           branch: master
-     functionality:
-       - 'fgps':
-           trigger_jobs: 'optf-fgps-master-docker-java-version-shell-daily'
-     robot-options: ''
-     branch: 'master'
index 66bbdbd..5f4509b 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: optf-fgps
+    name: optf-fgps-engine
     project-name: 'optf-fgps'
     project: 'optf/fgps'
     stream:
@@ -8,22 +8,49 @@
           branch: 'master'
     mvn-settings: 'optf-fgps-settings'
     subproject:
-      - 'valetapi':
-          path: 'valetapi'
-          pattern: 'valetapi/**'
+      - 'engine':
+          path: 'engine'
+          pattern: 'engine/**'
           pom: 'pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-builder-4c-4g'
+
+- project:
+    name: optf-fgps-valetapi
+    project-name: 'optf-fgps'
+    project: 'optf/fgps'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'optf-fgps-settings'
+    subproject:
+      - 'valetapi':
+          path: 'valetapi'
+          pattern: 'valetapi/**'
+          pom: 'pom.xml'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-fgps-docker
     name: optf-fgps-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'optf/fgps'
     project-name: 'optf-fgps'
     branch: 'master'
     project-name: optf-fgps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: optf/fgps
     branch: master
index 08a03c3..73b2771 100644 (file)
@@ -1,15 +1,15 @@
----
 - project:
-     name: optf-has-csit
-     jobs:
-       - '{project-name}-{stream}-verify-csit-{functionality}'
-       - '{project-name}-{stream}-csit-{functionality}'
-     project-name: 'optf-has'
-     stream:
-       - 'master':
-           branch: master
-     functionality:
-       - 'has':
-           trigger_jobs: 'optf-has-master-conductor-docker-java-version-shell-daily'
-     robot-options: ''
-     branch: 'master'
+    name: optf-has-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: optf-has
+    recipients: 'snarayanan@research.att.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'has':
+          trigger_jobs:
+            - '{project-name}-{stream}-conductor-docker-java-version-shell-daily'
+    robot-options: ''
index 50a8035..c657540 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
           pattern: 'conductor/**'
           pom: 'pom.xml'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-python':
+          build-node: ubuntu1804-builder-4c-4g
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          docker-pom: 'conductor/pom.xml'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
-
-- project:
-    name: optf-has-docker
-    project-name: 'optf-has'
-    project: 'optf/has'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'optf-has-settings'
-    subproject:
-      - 'conductor':
-          path: 'conductor'
-          pattern: 'conductor/**'
-          pom: 'pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-has-docker-image.sh'
-          build-node: queue-docker-4c-4g
-      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-has-docker-image.sh'
-          build-node: queue-docker-4c-4g
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-has-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/has'
     project-name: 'optf-has'
     branch: 'master'
     nexus-iq-namespace: 'onap-'
     project: optf/has
     project-name: 'optf-has'
+    build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-has-settings'
 
 - project:
@@ -84,5 +75,6 @@
     project-name: optf-has
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: optf/has
     branch: master
index c79a189..7a9c7fc 100644 (file)
@@ -1,15 +1,15 @@
----
 - project:
-     name: optf-osdf-csit
-     jobs:
-       - '{project-name}-{stream}-verify-csit-{functionality}'
-       - '{project-name}-{stream}-csit-{functionality}'
-     project-name: 'optf-osdf'
-     stream:
-       - 'master':
-           branch: master
-     functionality:
-       - 'osdf':
-           trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily'
-     robot-options: ''
-     branch: 'master'
+    name: optf-osdf-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: optf-osdf
+    recipients: 'snarayanan@research.att.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'osdf':
+          trigger_jobs:
+            - '{project-name}-{stream}-osdf-docker-java-version-shell-daily'
+    robot-options: ''
index 0949850..2607b1f 100644 (file)
@@ -3,9 +3,12 @@
     name: optf-osdf
     project-name: 'optf-osdf'
     project: 'optf/osdf'
+    python-version: python3
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
           pattern: '**'
           pom: 'pom.xml'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-python':
+          build-node: ubuntu1804-builder-4c-4g
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          docker-pom: 'pom.xml'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
-
-- project:
-    name: optf-osdf-docker
-    project-name: 'optf-osdf'
-    project: 'optf/osdf'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'optf-osdf-settings'
-    subproject:
-      - 'osdf':
-          path: '.'
-          pattern: '**'
-          pom: 'pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-osdf-docker-image.sh'
-          build-node: queue-docker-4c-4g
-      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-osdf-docker-image.sh'
-          build-node: queue-docker-4c-4g
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-osdf-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/osdf'
     project-name: 'optf-osdf'
     branch: 'master'
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: optf/osdf
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'optf-osdf'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-osdf-settings'
 
 - project:
@@ -83,5 +76,6 @@
     project-name: optf-osdf
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: optf/osdf
     branch: master
index e1cfe9d..34a7a64 100644 (file)
     project-name: 'policy-apex-pdp'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          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: 'policy/apex-pdp'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-apex-pdp-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-apex-pdp-dublin
-    project-name: 'policy-apex-pdp-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'policy/apex-pdp'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-apex-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-apex-pdp-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/apex-pdp'
     project-name: 'policy-apex-pdp'
     branch: 'master'
     mvn-settings: 'policy-apex-pdp-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-apex-pdp'
     branch: 'master'
     mvn-settings: 'policy-apex-pdp-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-apex-pdp-info
     project-name: policy-apex-pdp
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/apex-pdp
     branch: master
index f5763e0..4c4c47d 100644 (file)
@@ -7,55 +7,46 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          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: 'policy/api'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-api-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-api-dublin
-    project-name: 'policy-api-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-
-    project: 'policy/api'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-api-settings'
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-api-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/api'
     project-name: 'policy-api'
     branch: 'master'
     mvn-settings: 'policy-api-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-api'
     branch: 'master'
     mvn-settings: 'policy-api-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-api-info
     project-name: policy-api
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/api
     branch: master
index 5237719..006ad3b 100644 (file)
@@ -5,46 +5,39 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/common'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-common-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-common-dublin
-    project-name: 'policy-common-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
-
-    project: 'policy/common'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-common-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-common-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/common'
     project-name: 'policy-common'
     branch: 'master'
     mvn-settings: 'policy-common-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-common'
     branch: 'master'
     mvn-settings: 'policy-common-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-common-info
     project-name: policy-common
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/common
     branch: master
index fe89f30..38759ff 100644 (file)
@@ -1,38 +1,18 @@
-- project:
-    name: policy-health-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'policy'
-    stream:
-      - 'master':
-          branch: master
-      - 'dublin':
-          branch: dublin
-    functionality:
-      - 'health'
-    trigger_jobs:
-      - 'policy-engine-{stream}-merge-scm-mvn-script'
-      - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
-      - 'policy-drools-applications-{stream}-merge-java'
-    robot-options: ''
-    build-timeout: 40
-
 - project:
     name: policy-apex-pdp-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
+    recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
-      - 'dublin':
-          branch: dublin
     functionality:
       - 'apex-pdp'
     trigger_jobs:
-      - 'policy-apex-pdp-{stream}-merge-scm-mvn-script'
+      - 'policy-apex-pdp-{stream}-merge-java'
     robot-options: ''
 
 - project:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
+    recipients: 'ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
-      - 'dublin':
-          branch: dublin
     functionality:
       - 'distribution'
     trigger_jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
     stream:
       - 'master':
           branch: master
-      - 'dublin':
-          branch: dublin
     functionality:
       - 'api'
     trigger_jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
+    recipients: 'ah999m@att.com'
     stream:
       - 'master':
           branch: master
-      - 'dublin':
-          branch: dublin
     functionality:
       - 'xacml-pdp'
     trigger_jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
+    recipients: 'jrh3@att.com ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
-      - 'dublin':
-          branch: dublin
     functionality:
       - 'pap'
     trigger_jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
     stream:
       - 'master':
           branch: master
-      - 'dublin':
-          branch: dublin
     functionality:
       - 'drools-pdp'
     trigger_jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
     stream:
       - 'master':
           branch: master
-      - 'dublin':
-          branch: dublin
     functionality:
       - 'drools-applications'
     trigger_jobs:
       - 'policy-drools-applications-{stream}-merge-java'
     robot-options: ''
-
index e8a1681..9cb4ca0 100644 (file)
@@ -7,58 +7,46 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          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: 'policy/distribution'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-distribution-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-distribution-dublin
-    project-name: 'policy-distribution-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-
-    project: 'policy/distribution'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-distribution-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-distribution-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/distribution'
     project-name: 'policy-distribution'
     branch: 'master'
     mvn-settings: 'policy-distribution-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-distribution'
     branch: 'master'
     mvn-settings: 'policy-distribution-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-distribution-info
     project-name: policy-distribution
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/distribution
     branch: master
index 6775406..61ac6fe 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-docker-base-common
+    name: policy-docker-base-common-elalto
     project-name: 'policy-docker'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -8,59 +8,81 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: "-P docker"
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          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: 'policy/docker'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: policy-docker-base-common-dublin
-    project-name: 'policy-docker-dublin'
+    name: policy-docker-base-common
+    project-name: 'policy-docker'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java':
+          project-name: 'policy-docker-amd64'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-          mvn-params: "-P docker"
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
+          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          build-node: ubuntu1804-docker-8c-8g
+          pattern: 'do_not_match_any_file'
+      - '{project-name}-{stream}-merge-java':
+          project-name: 'policy-docker-arm64'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-          mvn-params: '-P docker'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
+          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          build-node: ubuntu1804-docker-arm64-4c-2g
+          pattern: 'do_not_match_any_file'
+      - '{project-name}-multiarch-{stream}-merge-java'
+      - gerrit-maven-docker-stage:
+          project-name: 'policy-docker-arm64'
+          build-node: ubuntu1804-docker-arm64-4c-2g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          container-public-registry: 'docker.io'
+          container-staging-registry: 'docker.io'
+          cron: ''
+          gerrit_trigger_file_paths:
+             - compare-type: REG_EXP
+               pattern: 'do_not_match_any_file'
+      - gerrit-maven-docker-stage:
+          project-name: 'policy-docker-amd64'
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          container-public-registry: 'docker.io'
+          container-staging-registry: 'docker.io'
+          cron: ''
+          gerrit_trigger_file_paths:
+             - compare-type: REG_EXP
+               pattern: 'do_not_match_any_file'
+      - '{project-name}-docker-manifest-{stream}':
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-multiarch-docker-stage-{stream}'
+#      - '{project-name}-gerrit-release-jobs':
+#          build-node: centos7-docker-8c-8g
+
     project: 'policy/docker'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'master':
+          branch: 'master'
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-docker-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/docker'
-    project-name: 'policy-docker'
-    branch: 'master'
-    mvn-settings: 'policy-docker-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-clm
@@ -77,5 +99,6 @@
     project-name: policy-docker
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/docker
     branch: master
index a22d850..d255266 100644 (file)
@@ -8,49 +8,45 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: "-P docker"
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker'
-          disabled: true
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          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: 'policy/drools-applications'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-
-- project:
-    name: policy-drools-applications-dublin
-    project-name: 'policy-drools-applications-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
-
-    project: 'policy/drools-applications'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-drools-applications-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-applications-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/drools-applications'
     project-name: 'policy-drools-applications'
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-drools-applications'
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
+    java-version: openjdk11
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-applications-info
     project-name: policy-drools-applications
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/drools-applications
     branch: master
index 8e18ba5..6440e35 100644 (file)
@@ -8,57 +8,45 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: "-P docker"
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker'
-          disabled: true
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          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: 'policy/drools-pdp'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-drools-pdp-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-
-- project:
-    name: policy-drools-pdp-dublin
-    project-name: 'policy-drools-pdp-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'policy/drools-pdp'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-drools-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-pdp-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/drools-pdp'
     project-name: 'policy-drools-pdp'
     branch: 'master'
     mvn-settings: 'policy-drools-pdp-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-drools-pdp'
     branch: 'master'
     mvn-settings: 'policy-drools-pdp-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-drools-pdp-info
     project-name: policy-drools-pdp
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/drools-pdp
     branch: master
index 5a6e430..9f8030a 100644 (file)
@@ -4,67 +4,51 @@
     project-name: 'policy-engine'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          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: 'policy/engine'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-engine-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
-
-- project:
-    name: policy-engine-dublin
-    project-name: 'policy-engine-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'policy/engine'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-engine-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: policy-engine-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/engine'
     project-name: 'policy-engine'
     branch: 'master'
     mvn-settings: 'policy-engine-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
 
 - project:
     name: policy-engine-clm
     project-name: 'policy-engine'
     branch: 'master'
     mvn-settings: 'policy-engine-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    java-version: openjdk11
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: policy-engine-info
     project-name: policy-engine
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/engine
     branch: master
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
new file mode 100644 (file)
index 0000000..862c040
--- /dev/null
@@ -0,0 +1,73 @@
+---
+- project:
+    name: policy-gui
+    project-name: 'policy-gui'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          disabled: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
+          disabled: true
+
+    project: 'policy/gui'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    java-version: openjdk11
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: policy-gui-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-builder-4c-4g
+    project: 'policy/gui'
+    project-name: 'policy-gui'
+    branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    java-version: openjdk11
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-gui-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: policy/gui
+    project-name: 'policy-gui'
+    branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    java-version: openjdk11
+
+- project:
+    name: policy-gui-info
+    project-name: policy-gui
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: policy/gui
+    branch: master
index 23df1d0..0b9e637 100644 (file)
@@ -5,46 +5,39 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/models'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-models-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-models-dublin
-    project-name: 'policy-models-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
-
-    project: 'policy/models'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-models-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-models-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/models'
     project-name: 'policy-models'
     branch: 'master'
     mvn-settings: 'policy-models-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-models'
     branch: 'master'
     mvn-settings: 'policy-models-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-models-info
     project-name: policy-models
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/models
     branch: master
index bd57635..75c9e22 100644 (file)
@@ -7,58 +7,46 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          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: 'policy/pap'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-pap-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-pap-dublin
-    project-name: 'policy-pap-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-
-    project: 'policy/pap'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-pap-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-pap-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/pap'
     project-name: 'policy-pap'
     branch: 'master'
     mvn-settings: 'policy-pap-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-pap'
     branch: 'master'
     mvn-settings: 'policy-pap-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-pap-info
     project-name: policy-pap
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/pap
     branch: master
index 6c35fe6..7901d4f 100644 (file)
@@ -5,35 +5,22 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/parent'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-parent-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-parent-dublin
-    project-name: 'policy-parent-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
-
-    project: 'policy/parent'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-parent-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-parent-clm
     project-name: 'policy-parent'
     branch: 'master'
     mvn-settings: 'policy-parent-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-parent-info
     project-name: policy-parent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/parent
     branch: master
index 05aea8e..a4982aa 100644 (file)
@@ -7,58 +7,46 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          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: 'policy/xacml-pdp'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-xacml-pdp-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-xacml-pdp-dublin
-    project-name: 'policy-xacml-pdp-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-
-    project: 'policy/xacml-pdp'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-xacml-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-xacml-pdp-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/xacml-pdp'
     project-name: 'policy-xacml-pdp'
     branch: 'master'
     mvn-settings: 'policy-xacml-pdp-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-xacml-pdp'
     branch: 'master'
     mvn-settings: 'policy-xacml-pdp-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-xacml-pdp-info
     project-name: policy-xacml-pdp
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/xacml-pdp
     branch: master
index d77ea9f..dca6674 100644 (file)
@@ -9,26 +9,39 @@
     subproject-name: 'onap-sdk'
 
     jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'ecomp-sdk/pom.xml'
+          mvn-params: '-f ecomp-sdk/pom.xml'
+          pattern: 'ecomp-sdk/**'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'portal/sdk'
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.5.0':
-          branch: 'release-2.5.0'
+      - 'release-3.2.0':
+          branch: 'release-3.2.0'
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: portal-sdk-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'portal/sdk'
     project-name: 'portal-sdk'
     branch: 'master'
@@ -43,7 +56,7 @@
       - gerrit-maven-clm:
           mvn-params: '-f ecomp-sdk/pom.xml'
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: portal/sdk
     project-name: 'portal-sdk'
     branch: 'master'
@@ -54,5 +67,6 @@
     project-name: portal-sdk
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: portal/sdk
     branch: master
index d275d65..04a6374 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.2.0':
-          branch: 'release-2.2.0'
+      - 'release-3.2.0':
+          branch: 'release-3.2.0'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     extra-project: 'portal/sdk'
     extra-branch: '{branch}'
     extra-refspec: 'refs/heads/{branch}'
index ce944dd..325d79a 100644 (file)
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-{stream}-release-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     project: 'portal'
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.2.0':
-          branch: 'release-2.2.0'
+      - 'release-3.2.0':
+          branch: 'release-3.2.0'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER
 
 - project:
     name: portal-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'portal'
     project-name: 'portal'
     branch: 'master'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: 'portal-coverity'
+    jobs:
+      - 'onap-gerrit-maven-coverity'
+    cron: '@daily'
+    max-git-repo-age-hours: 48
+    build-node: 'ubuntu1804-builder-4c-4g'
+    project: 'portal'
+    project-name: 'portal'
+    branch: 'master'
+    mvn-settings: 'portal-settings'
+    # FIXME: it does not build without building tests at the moment
+    #mvn-params: '-Dmaven.test.skip=true'
+    mvn-params: '-DskipTests'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    coverity-project-name: 'onap-portal'
+    coverity-token: 'ViM5eI953g1mE2vb8MiHtA'
+    coverity-user-email: 'A.Naluzhnyy@samsung.com'
+    coverity-search-paths: >
+      ecomp-portal-FE-os/client
+      ecomp-portal-FE-os/mock
+      ecomp-portal-FE-os/server
+      ecomp-portal-widget-ms
+      ecomp-portal-FE-common/client/app
+    coverity-search-exclude-regexs: >
+      /cov-int/
+      /cov-analysis-
+      ^/usr/
+      ^/home/
+      /node_modules/
+      /bower_components/
+      /bower_components_external/
+      /src/test/
+      /__test__/
+
 - project:
     name: portal-clm
     jobs:
@@ -47,7 +90,7 @@
     project: portal
     project-name: 'portal'
     branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-settings: 'portal-settings'
 
 - project:
@@ -55,5 +98,6 @@
     project-name: portal
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: portal
     branch: master
diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml
new file mode 100644 (file)
index 0000000..017218a
--- /dev/null
@@ -0,0 +1,30 @@
+# Global read the docs version 3 jobs
+#
+# jobs trigger for all projects, all branches
+# on any changes to files in a docs/ directory
+# and publish subprojects to readthedocs.io
+# using credentials from Jenkins settings
+---
+- project:
+    name: rtdv3-view
+    project-name: rtdv3-global
+    views:
+      - project-view
+
+- project:
+    name: rtdv3-global
+    default-version: latest
+    tox-dir: "docs/"
+    doc-dir: "_build/html"
+    build-node: centos7-builder-2c-1g
+    # override the default to ignore ref-updated-event (tag)
+    gerrit_merge_triggers:
+      - change-merged-event
+      - comment-added-contains-event:
+          comment-contains-value: remerge$
+    jobs:
+      - rtdv3-global-verify
+      - rtdv3-global-merge
+    stream:
+      - master:
+          branch: '*'
index 7ec4294..fe8d56c 100644 (file)
@@ -5,11 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}-testng'
       - '{project-name}-{stream}-csit-{functionality}-testng'
     project-name: 'sdc'
+    recipients: 'ofir.sonsino@intl.att.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'sanity':
           trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
index 18146a2..bd2f1d4 100644 (file)
     project-name: 'sdc-dcae-d-ci'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
-         build-node: 'ubuntu1604-docker-8c-8g'
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-DskipTests=true'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -DskipTests=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
     project: 'sdc/dcae-d/ci'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-ci-settings'
     files: '**'
     archive-artifacts: ''
@@ -36,7 +38,7 @@
 #         docker-pom: 'pom.xml'
 #         mvn-profile: 'docker'
 #         mvn-params: '-DskipTests=true'
-#         build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#         build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #    project: 'sdc/dcae-d/ci'
 #    stream:
 #      - 'master':
     name: sdc-dcae-ci-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/ci'
     project-name: 'sdc-dcae-d-ci'
     branch: 'master'
@@ -75,5 +82,6 @@
     project-name: sdc-dcae-d-ci
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/ci
     branch: master
diff --git a/jjb/sdc/sdc-dcae-d-csit.yaml b/jjb/sdc/sdc-dcae-d-csit.yaml
new file mode 100644 (file)
index 0000000..a8a8f3e
--- /dev/null
@@ -0,0 +1,20 @@
+---
+- project:
+    name: sdc-dcae-d-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'sdc-dcae-d'
+    recipients: 'ofir.sonsino@intl.att.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'dcaed':
+          trigger_jobs:
+            - 'sdc-{stream}-docker-version-java-daily'
+            - '{project-name}-dt-be-main-{stream}-docker-version-java-daily'
+            - '{project-name}-dt-{stream}-docker-version-java-daily'
+            - '{project-name}-fe-{stream}-docker-version-java-daily'
+            - '{project-name}-tosca-lab-{stream}-docker-java-daily'
+    robot-options: ''
index 1b896e0..0fdee27 100644 (file)
@@ -4,19 +4,23 @@
     project-name: 'sdc-dcae-d-dt-be-main'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-8c-8g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-DskipTests=true'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -DskipTests=true'
+          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/dcae-d/dt-be-main'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     files: '**'
     archive-artifacts: ''
@@ -27,7 +31,7 @@
 #    project-name: 'sdc-dcae-d-dt-be-main-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true'
@@ -36,7 +40,7 @@
 #      - 'master':
 #          branch: 'master'
 #    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #    build-timeout: 60
     name: sdc-dcae-d-dt-be-main-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-main'
     project-name: 'sdc-dcae-d-dt-be-main'
     branch: 'master'
@@ -70,5 +79,6 @@
     project-name: sdc-dcae-d-dt-be-main
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/dt-be-main
     branch: master
index e203c5c..7180195 100644 (file)
@@ -4,14 +4,15 @@
     project-name: 'sdc-dcae-d-dt-be-property'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
     project: 'sdc/dcae-d/dt-be-property'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
     files: '**'
     archive-artifacts: ''
     name: sdc-dcae-d-dt-be-property-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-property'
     project-name: 'sdc-dcae-d-dt-be-property'
     branch: 'master'
@@ -46,5 +52,6 @@
     project-name: sdc-dcae-d-dt-be-property
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/dt-be-property
     branch: master
index 03f0e88..41847c3 100644 (file)
@@ -2,22 +2,27 @@
 - project:
     name: sdc-dcae-d-dt
     project-name: 'sdc-dcae-d-dt'
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-8c-8g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'server,docker'
-          mvn-params: '-DskipTests=true'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P server,docker -DskipTests=true'
+          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/dcae-d/dt'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     files: '**'
     archive-artifacts: ''
 #- project:
 #    name: sdc-dcae-d-dt-arm64
 #    project-name: 'sdc-dcae-d-dt-arm64'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'server,docker'
 #          mvn-params: '-DskipTests=true'
     name: sdc-dcae-d-dt-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/dt'
     project-name: 'sdc-dcae-d-dt'
     branch: 'master'
@@ -63,7 +73,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/dt
     project-name: 'sdc-dcae-d-dt'
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-settings'
 
@@ -72,5 +82,6 @@
     project-name: sdc-dcae-d-dt
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/dt
     branch: master
index 8191aae..fa80c53 100644 (file)
@@ -2,22 +2,27 @@
 - project:
     name: sdc-dcae-d-fe
     project-name: 'sdc-dcae-d-fe'
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-8c-8g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-DskipTests=true'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -DskipTests=true'
+          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/dcae-d/fe'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     files: '**'
     archive-artifacts: ''
@@ -28,7 +33,7 @@
 #    project-name: 'sdc-dcae-d-fe-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true'
     name: sdc-dcae-d-fe-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/dcae-d/fe'
     project-name: 'sdc-dcae-d-fe'
     branch: 'master'
@@ -62,7 +72,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/dcae-d/fe
     project-name: 'sdc-dcae-d-fe'
-    build-node: ubuntu1604-builder-4c-2g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-fe-settings'
 
@@ -71,5 +81,6 @@
     project-name: sdc-dcae-d-fe
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/fe
     branch: master
index f6332ff..1165d58 100644 (file)
@@ -6,18 +6,22 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     subproject:
     - dcae-d-tosca-lab:
         path: '.'
         pattern: '**'
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P default -Dmaven.test.skip=true'
+          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
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 
@@ -33,7 +37,7 @@
 #        path: '.'
 #        pattern: '**'
 #    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-java-daily':
 #          mvn-params: '-Dmaven.test.skip=true'
     name: sdc-dcae-d-tosca-lab-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'sdc/dcae-d/tosca-lab'
     project-name: 'sdc-dcae-d-tosca-lab'
     branch: 'master'
@@ -59,5 +68,6 @@
     project-name: sdc-dcae-d-tosca-lab
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/tosca-lab
     branch: master
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
deleted file mode 100644 (file)
index a36b758..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
-    name: sdc-jtosca-project-view
-    project-name: sdc-jtosca
-    views:
-      - project-view
-
-- project:
-    name: sdc-jtosca
-    project-name: 'sdc-jtosca'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-merge-java'
-    project: 'sdc/jtosca'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'sdc-jtosca-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-    maven-version: 'mvn35'
-
-- project:
-    name: sdc-jtosca-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'sdc/jtosca'
-    project-name: 'sdc-jtosca'
-    branch: 'master'
-    mvn-settings: 'sdc-jtosca-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-jtosca-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/jtosca
-    project-name: 'sdc-jtosca'
-    branch: 'master'
-    mvn-settings: 'sdc-jtosca-settings'
-
-- project:
-    name: sdc-jtosca-info
-    project-name: sdc-jtosca
-    jobs:
-      - gerrit-info-yaml-verify
-    project: sdc/jtosca
-    branch: master
diff --git a/jjb/sdc/sdc-microservices.yaml b/jjb/sdc/sdc-microservices.yaml
new file mode 100644 (file)
index 0000000..0aad248
--- /dev/null
@@ -0,0 +1,74 @@
+---
+- project:
+    name: sdc-microservices-project-view
+    project-name: sdc-microservices
+    views:
+      - project-view
+
+- project:
+    name: sdc-microservices
+    project-name: 'sdc-microservices'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-v1-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-DskipTests=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+    subproject:
+      - 'catalog-facade-ms':
+          pom: 'catalog-facade-ms/pom.xml'
+          pattern: 'catalog-facade-ms/**'
+    project: 'sdc/microservices'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'sdc-microservices-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+    maven-version: 'mvn35'
+
+- project:
+    name: sdc-microservices-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    cron: '@daily'
+    build-node: ubuntu1804-builder-4c-4g
+    project: 'sdc/microservices'
+    project-name: 'sdc-microservices'
+    branch: 'master'
+    mvn-settings: 'sdc-microservices-settings'
+    mvn-params: '-Dsonar.branch={branch}'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m'
+
+- project:
+    name: sdc-microservices-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: sdc/microservices
+    project-name: 'sdc-microservices'
+    branch: 'master'
+    mvn-settings: 'sdc-microservices-settings'
+
+- project:
+    name: sdc-microservices-info
+    project-name: sdc-microservices
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: sdc/microservices
+    branch: master
index c897042..ef6ff5a 100644 (file)
@@ -10,6 +10,7 @@
     project-name: 'sdc-onap-ui-angular'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'sdc/onap-ui-angular'
     branch: 'master'
 
     name: sdc-onap-ui-angular-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/onap-ui-angular'
     project-name: 'sdc-onap-ui-angular'
     branch: 'master'
index a614c91..7f6689f 100644 (file)
@@ -4,6 +4,7 @@
     project-name: 'sdc-onap-ui-common'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'sdc/onap-ui-common'
     branch: 'master'
 
     name: sdc-onap-ui-common-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/onap-ui-common'
     project-name: 'sdc-onap-ui-common'
     branch: 'master'
index 8705f02..45b9792 100644 (file)
@@ -4,6 +4,7 @@
     project-name: 'sdc-onap-ui-react'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'sdc/onap-ui-react'
     branch: 'master'
 
     name: sdc-onap-ui-react-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/onap-ui-react'
     project-name: 'sdc-onap-ui-react'
     branch: 'master'
index 5e48a60..487967d 100644 (file)
     project-name: 'sdc-sdc-be-common'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'sdc/sdc-be-common'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'sdc-sdc-be-common-settings'
     files: '**'
     archive-artifacts: ''
     name: sdc-sdc-be-common-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-be-common'
     project-name: 'sdc-sdc-be-common'
     branch: 'master'
@@ -51,5 +63,6 @@
     project-name: sdc-sdc-be-common
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-be-common
     branch: master
index 69c6e4a..7250a84 100644 (file)
     project-name: 'sdc-sdc-distribution-client'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     project: 'sdc/sdc-distribution-client'
     stream:
       - 'master':
     name: sdc-sdc-distribution-client-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-distribution-client'
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
@@ -51,5 +62,6 @@
     project-name: sdc-sdc-distribution-client
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-distribution-client
     branch: master
index 03b9d2a..57726b7 100644 (file)
@@ -4,20 +4,29 @@
     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: 'ubuntu1604-docker-8c-8g'
+          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'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
@@ -25,7 +34,7 @@
 #    project-name: 'sdc-sdc-docker-base-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-sdc-merge-java':
-#          build-node: 'ubuntu1604-docker-8c-8g'
+#          build-node: 'ubuntu1804-docker-8c-8g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'default'
 #    project: 'sdc/sdc-docker-base'
@@ -35,7 +44,7 @@
 #    mvn-settings: 'sdc-sdc-docker-base-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 
 - project:
@@ -43,5 +52,6 @@
     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 2930983..adaa2d5 100644 (file)
@@ -4,6 +4,7 @@
     project-name: 'sdc-sdc-pubsub'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'sdc/sdc-pubsub'
     branch: 'master'
 
@@ -17,8 +18,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-sdc-pubsub-settings'
     files: '**'
     archive-artifacts: ''
     name: sdc-sdc-pubsub-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-pubsub'
     project-name: 'sdc-sdc-pubsub'
     branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
deleted file mode 100644 (file)
index 92f9482..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
-    name: sdc-sdc-titan-project-view
-    project-name: sdc-sdc-titan
-    views:
-      - project-view
-
-- project:
-    name: sdc-sdc-titan-cassandra
-    project-name: 'sdc-sdc-titan-cassandra'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-merge-java'
-    project: 'sdc/sdc-titan-cassandra'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-sdc-titan-cassandra-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-    maven-version: 'mvn35'
-
-- project:
-    name: sdc-sdc-titan-cassandra-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/sdc-titan-cassandra
-    project-name: 'sdc-sdc-titan-cassandra'
-    branch: 'master'
-    mvn-settings: 'sdc-sdc-titan-cassandra-settings'
-
-- project:
-    name: sdc-sdc-titan-cassandra-info
-    project-name: sdc-sdc-titan-cassandra
-    jobs:
-      - gerrit-info-yaml-verify
-    project: sdc/sdc-titan-cassandra
-    branch: master
index 73662b9..51d91ee 100644 (file)
     project-name: 'sdc-sdc-tosca'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     project: 'sdc/sdc-tosca'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
     name: sdc-sdc-tosca-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-tosca'
     project-name: 'sdc-sdc-tosca'
     branch: 'master'
@@ -53,5 +62,6 @@
     project-name: sdc-sdc-tosca
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-tosca
     branch: master
index 7db82e5..9bc31df 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          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-workflow-designer'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn35'
 
 #- project:
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:
     name: sdc-sdc-workflow-designer-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-workflow-designer'
     project-name: 'sdc-sdc-workflow-designer'
     branch: 'master'
@@ -68,7 +82,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/sdc-workflow-designer
     project-name: 'sdc-sdc-workflow-designer'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
 
@@ -77,5 +91,6 @@
     project-name: sdc-sdc-workflow-designer
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-workflow-designer
     branch: master
index a164c54..19e2957 100644 (file)
     project-name: 'sdc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1604-docker-8c-8g'
+          build-node: 'ubuntu1804-docker-v1-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
-      - '{project-name}-{stream}-release-version-java-daily':
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-8c-8g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+      - gerrit-maven-stage:
+          build-timeout: 90
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+      - gerrit-maven-docker-stage:
+          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/'
+          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'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     maven-version: 'mvn35'
 
 #- project:
@@ -58,7 +66,7 @@
 #    project-name: 'sdc-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
 - project:
     name: sdc-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          build-timeout: 120
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'sdc'
     project-name: 'sdc'
     branch: 'master'
     mvn-settings: 'sdc-settings'
-    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
 
 - project:
-    name: sdc-clm
+    name: sdc-clm-catalog
     jobs:
       - gerrit-maven-clm:
           build-timeout: 120
           submodule-timeout: 30
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-P catalog -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
     nexus-iq-namespace: 'onap-'
     project: sdc
-    project-name: 'sdc'
-    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'sdc-catalog'
+    build-node: ubuntu1804-docker-8c-8g
+    branch: 'master'
+    mvn-settings: 'sdc-settings'
+
+- project:
+    name: sdc-clm-onboarding
+    jobs:
+      - gerrit-maven-clm:
+          build-timeout: 120
+          submodule-timeout: 30
+          mvn-params: '-P onboarding -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+    nexus-iq-namespace: 'onap-'
+    project: sdc
+    project-name: 'sdc-onboarding'
+    build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'
 
     project-name: sdc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc
     branch: master
+
+- project:
+    name: 'sdc-whitesource'
+    project-name: 'sdc'
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan:
+          build-timeout: 120
+          submodule-timeout: 30
+          java-opts: '-Xmx2048m'
+    mvn-settings: 'sdc-settings'
+    wss-product-name: 'sdc'
+    mvn-clean-install: true
+    project: 'sdc'
+    branch: master
index cf747e7..0b04a27 100644 (file)
@@ -9,19 +9,29 @@
     name: sdnc-apps
     project-name: 'sdnc-apps'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          cron: ''
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+          cron: '@daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'sdnc/apps'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: sdnc-apps-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdnc/apps'
     project-name: 'sdnc-apps'
     branch: 'master'
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
-- project:
-    name: sdnc-apps-docker
-    project-name: 'sdnc-apps'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'sdnc/apps'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'sdnc-apps-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: queue-docker-4c-4g
 #
 #- project:
 #    name: sdnc-apps-docker-arm64
@@ -80,7 +81,7 @@
 #    mvn-settings: 'sdnc-apps-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: sdnc-apps-clm
     nexus-iq-namespace: 'onap-'
     project: sdnc/apps
     project-name: 'sdnc-apps'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-apps-settings'
 
 - project:
     project-name: sdnc-apps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/apps
     branch: master
index 285f0f0..4450a34 100644 (file)
@@ -5,11 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'sdnc'
+    recipients: 'dtimoney@att.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
index 7e0f5de..ee7c79d 100644 (file)
@@ -3,19 +3,22 @@
     name: sdnc-northbound
     project-name: 'sdnc-northbound'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          cron: ''
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'sdnc/northbound'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    maven-version: "mvn35"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: sdnc-northbound-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdnc/northbound'
     project-name: 'sdnc-northbound'
     branch: 'master'
     mvn-settings: 'sdnc-northbound-settings'
     mvn-goals: 'clean install'
+    maven-version: "mvn35"
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
     nexus-iq-namespace: 'onap-'
     project: sdnc/northbound
     project-name: 'sdnc-northbound'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-northbound-settings'
 
 - project:
@@ -60,5 +70,6 @@
     project-name: sdnc-northbound
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/northbound
     branch: master
index 2b29994..8cba7aa 100644 (file)
@@ -4,41 +4,39 @@
     name: sdnc-oam
     project-name: 'sdnc-oam'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
-      - '{project-name}-{stream}-release-version-java-daily'
+          maven-versions-plugin: true
+          cron: ''
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+          maven-versions-plugin: true
+          cron: '@daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'sdnc/oam'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdnc-oam-settings'
+    maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
+    shallow-clone: true
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
-- project:
-    name: sdnc-oam-docker
-    project-name: 'sdnc-oam'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'sdnc/oam'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'sdnc-oam-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: queue-docker-4c-4g
 #
 #- project:
 #    name: sdnc-oam-docker-arm64
@@ -55,7 +53,7 @@
 #    mvn-settings: 'sdnc-oam-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: sdnc-oam-clm
     nexus-iq-namespace: 'onap-'
     project: sdnc/oam
     project-name: 'sdnc-oam'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'sdnc-oam-settings'
 
 - project:
@@ -77,5 +73,6 @@
     project-name: sdnc-oam
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/oam
     branch: master
diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
new file mode 100644 (file)
index 0000000..ae86ef5
--- /dev/null
@@ -0,0 +1,41 @@
+---
+- project:
+    name: sdnc-oom
+    helm-module: 'sdnc'
+    project-name: 'sdnc-oom'
+    project: 'sdnc/oom'
+    jobs:
+      - '{project-name}-{stream}-verify-external-helm'
+      - '{project-name}-{stream}-merge-external-helm':
+          build_script: '{oom_build_script}'
+          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+          files: '**'
+    stream:
+      - 'master':
+          branch: 'master'
+
+    mvn-settings: 'sdnc-oom-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-helm-2c-1g
+    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
+    oom_build_script: |
+        #!/bin/bash
+        set -e -o pipefail
+        cd kubernetes/
+        make all
+    build_script: |
+        #!/bin/bash
+        cd kubernetes/
+        make common
+        make {helm-module}
+    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+
+- project:
+    name: sdnc-oom-info
+    project-name: sdnc-oom
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: sdnc/oom
+    branch: master
index 47a8e7f..8feffb6 100644 (file)
@@ -5,12 +5,13 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'so'
+    recipients: 'seshu.kumar.m@huawei.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'integration-testing':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+      - 'integration-etsi-testing':
+          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
     robot-options: ''
index f39545d..af1be77 100644 (file)
@@ -5,13 +5,18 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'so/libs'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'so-libs-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     name: so-libs-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'so/libs'
     project-name: 'so-libs'
     branch: 'master'
@@ -49,5 +59,7 @@
     project-name: so-libs
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: so/libs
     branch: master
+    branch: elalto
index e69cb5b..2de4db9 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          build-node: 'ubuntu1604-docker-8c-8g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -DskipTests'
+          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: 'so'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: so-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-builder-4c-4g
     project: 'so'
     project-name: 'so'
     branch: 'master'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: 'so-coverity'
+    jobs:
+      - 'onap-gerrit-maven-coverity'
+    cron: '@daily'
+    build-node: 'ubuntu1804-builder-4c-4g'
+    project: 'so'
+    project-name: 'so'
+    branch: 'master'
+    mvn-settings: 'so-settings'
+    mvn-params: '-DskipTests'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    coverity-project-name: 'onap-so'
+    coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ'
+    coverity-user-email: 'A.Naluzhnyy@samsung.com'
+    coverity-search-paths: >
+      so-monitoring/so-monitoring-ui/src/main/frontend/src
+    coverity-search-exclude-regexs: >
+      /cov-int/
+      /cov-analysis-
+      ^/usr/
+      ^/home/
+      /node_modules/
+      /bower_components/
+      /bower_components_external/
+      /src/test/
+      /__test__/
+
 - project:
     name: so-clm
     jobs:
     nexus-iq-namespace: 'onap-'
     project: so
     project-name: 'so'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     mvn-settings: 'so-settings'
 
 - project:
@@ -61,5 +99,7 @@
     project-name: so
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: so
     branch: master
+    branch: frankfurt
index 20ba913..77f8cb5 100644 (file)
@@ -7,18 +7,23 @@
           path: '.'
           pattern: '**'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-python'
     project: 'testsuite/heatbridge'
+    subproject:
+      - 'heatbridge':
+          path: 'heatbridge'
+          pattern: 'heatbridge/**'
     stream:
       - 'master':
           branch: 'master'
       - 'dublin':
           branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'testsuite-heatbridge-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: testsuite-heatbridge-master-clm
@@ -27,7 +32,7 @@
     nexus-iq-namespace: 'onap-'
     project: testsuite/heatbridge
     project-name: 'testsuite-heatbridge'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'testsuite-heatbridge-settings'
 
@@ -36,5 +41,6 @@
     project-name: testsuite-heatbridge
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: testsuite/heatbridge
     branch: master
diff --git a/jjb/testsuite/testsuite-oom.yaml b/jjb/testsuite/testsuite-oom.yaml
new file mode 100644 (file)
index 0000000..40b281a
--- /dev/null
@@ -0,0 +1,10 @@
+---
+- project:
+    name: testsuite-oom
+    project-name: testsuite-oom
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: testsuite/oom
+    branch: master
+
index db8c90c..a8993e1 100644 (file)
@@ -2,43 +2,52 @@
 - project:
     name: testsuite-python-testing-utils
     project-name: 'testsuite-python-testing-utils'
-    python-version: python2
+    python-version: python3
     jobs:
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
     project: 'testsuite/python-testing-utils'
     subproject:
       - 'robotframework-onap':
-          tox-dir: robotframework-onap/
-          tox-envs: ''
-
+          tox-dir: './robotframework-onap/'
+          tox-envs: 'py3'
     stream:
       - 'master':
           branch: 'master'
       - 'dublin':
           branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'testsuite-python-testing-utils-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'centos7-builder-4c-4g'
 
 - project:
-    name: testsuite-python-testing-utils-master-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: testsuite/python-testing-utils
+    name: testsuite-python-testing-utils-verify
     project-name: 'testsuite-python-testing-utils'
-    build-node: 'ubuntu1604-builder-4c-4g'
+    project: 'testsuite/python-testing-utils'
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'testsuite-python-testing-utils-settings'
+    build-node: 'centos7-builder-4c-4g'
+    subproject:
+      - 'robotframework-onap':
+          path: 'robotframework-onap'
+          pattern: 'robotframework-onap/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
 
 - project:
     name: testsuite-python-testing-utils-info
     project-name: testsuite-python-testing-utils
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: testsuite/python-testing-utils
     branch: master
index 0b1e6cb..58bab20 100644 (file)
@@ -5,6 +5,15 @@
     views:
       - project-view
 
+- project:
+    name: testsuite-release
+    project-name: 'testsuite'
+    project: 'testsuite'
+    mvn-settings: 'testsuite-settings'
+    jobs:
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
 - project:
     name: testsuite
     project-name: 'testsuite'
@@ -35,6 +44,8 @@
           branch: 'master'
       - 'dublin':
           branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'testsuite-settings'
 
 - project:
     project-name: testsuite
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: testsuite
     branch: master
+
+- project:
+    name: testsuite-linters
+    project: 'testsuite'
+    project-name: 'testsuite'
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+#      - 'robot':
+#          tox-dir: '.'
+#          tox-envs: 'robot'
+#          pattern: '**/*.robot'
+    stream:
+      - 'master':
+          branch: 'master'
index ce90c49..e4e112f 100644 (file)
@@ -5,15 +5,12 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'usecases'
+    recipients: 'morgan.richomm@orange.com bf1936@att.com rajendra.jaiswal@ericsson.com liam.burke@ericsson.com'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-      - 'casablanca':
-          branch: 'casablanca'
     functionality:
       - '5G-bulkpm':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
-    robot-options: ''
\ No newline at end of file
+    robot-options: ''
diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml
new file mode 100644 (file)
index 0000000..69e92f8
--- /dev/null
@@ -0,0 +1,19 @@
+---
+- project:
+    name: usecases-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'usecases'
+    recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech eric.e.moore@est.tech raj.gumma@ericsson.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'config-over-netconf':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+      - 'pnf-sw-upgrade':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
index b705594..a4241e7 100644 (file)
           maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: usecase-ui-server-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'usecase-ui/server'
     project-name: 'usecase-ui-server'
     branch: 'master'
@@ -44,7 +51,7 @@
     nexus-iq-namespace: 'onap-'
     project: usecase-ui/server
     project-name: 'usecase-ui-server'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'usecase-ui-server-settings'
 
@@ -53,5 +60,6 @@
     project-name: usecase-ui-server
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: usecase-ui/server
     branch: master
index 1e034bf..4965f82 100644 (file)
           maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: usecase-ui-clm
@@ -36,7 +38,7 @@
     nexus-iq-namespace: 'onap-'
     project: usecase-ui
     project-name: 'usecase-ui'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'usecase-ui-settings'
 
@@ -45,5 +47,6 @@
     project-name: usecase-ui
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: usecase-ui
     branch: master
index ba91dff..08ec49b 100644 (file)
@@ -5,10 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vfc-gvnfm-vnflcm'
+    recipients: 'yangyanyj@chinamobile.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
           trigger_jobs: 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
index 2442077..e05273b 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
     name: vfc-gvnfm-vnflcm-lcm-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f lcm/pom.xml'
     build-node: centos7-redis-4c-4g
@@ -61,5 +71,6 @@
     project-name: vfc-gvnfm-vnflcm
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/gvnfm/vnflcm
     branch: master
index 1264efd..1445f9b 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-gvnfm-vnfmgr-mgr-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f mgr/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/gvnfm/vnfmgr'
     project-name: 'vfc-gvnfm-vnfmgr-mgr'
     branch: 'master'
@@ -46,7 +56,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/gvnfm/vnfmgr
     project-name: 'vfc-gvnfm-vnfmgr'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
 
@@ -55,5 +65,6 @@
     project-name: vfc-gvnfm-vnfmgr
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/gvnfm/vnfmgr
     branch: master
index 6c9afed..2bb891b 100644 (file)
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'mgr':
           path: 'mgr'
index 3b76a2a..e4a0d8f 100644 (file)
@@ -5,10 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vfc-gvnfm-vnfres'
+    recipients: 'yangyanyj@chinamobile.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
           trigger_jobs: 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
index e9fa8fe..6551d45 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-gvnfm-vnfres-res-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f res/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/gvnfm/vnfres'
     project-name: 'vfc-gvnfm-vnfres-res'
     branch: 'master'
@@ -47,7 +57,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/gvnfm/vnfres
     project-name: 'vfc-gvnfm-vnfres'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
 
@@ -56,5 +66,6 @@
     project-name: vfc-gvnfm-vnfres
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/gvnfm/vnfres
     branch: master
index f172330..5bdf8e4 100644 (file)
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'res':
           path: 'res'
index 9affcfc..cb43838 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vfc-nfvo-catalog'
+    recipients: 'yangyanyj@chinamobile.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
index 81b4527..0e46c40 100644 (file)
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
     name: vfc-nfvo-catalog-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'vfc/nfvo/catalog'
@@ -56,5 +66,6 @@
     project-name: vfc-nfvo-catalog
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/catalog
     branch: master
index 86f9e5c..679cc45 100644 (file)
@@ -7,17 +7,22 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-db-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
 
 - project:
@@ -25,5 +30,6 @@
     project-name: vfc-nfvo-db
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/db
     branch: master
index 10accee..390228f 100644 (file)
@@ -5,10 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vfc-nfvo-driver-ems'
+    recipients: 'yangyanyj@chinamobile.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
           trigger_jobs: 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
index e295551..85e9d68 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-driver-ems-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-ems-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/ems'
     project-name: 'vfc-nfvo-driver-ems'
     branch: 'master'
@@ -46,7 +56,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/ems
     project-name: 'vfc-nfvo-driver-ems'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-ems-settings'
 
@@ -55,5 +65,6 @@
     project-name: vfc-nfvo-driver-ems
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/ems
     branch: master
index 6d089c7..1905012 100644 (file)
@@ -5,10 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vfc-nfvo-driver-sfc'
+    recipients: 'yangyanyj@chinamobile.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
           trigger_jobs: 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
index 10ea310..407a615 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'zte/sfc-driver/pom.xml'
+          mvn-params: '-f zte/sfc-driver/pom.xml'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-driver-zte-sfc-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-sfc-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f zte/sfc-driver/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/sfc'
     project-name: 'vfc-nfvo-driver-sfc'
     branch: 'master'
@@ -46,7 +58,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/sfc
     project-name: 'vfc-nfvo-driver-sfc'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-sfc-settings'
 
@@ -55,5 +67,6 @@
     project-name: vfc-nfvo-driver-sfc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/sfc
     branch: master
index 46a0e3c..f878452 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'huawei/pom.xml'
+          mvn-params: '-f huawei/pom.xml'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-params: '-f huawei/pom.xml'
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     project-name: 'vfc-nfvo-driver-svnfm-huawei'
@@ -41,7 +53,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/svnfm
     project-name: 'vfc-nfvo-driver-svnfm-huawei'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
 
@@ -50,5 +62,6 @@
     project-name: vfc-nfvo-driver-svnfm-huawei
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/vnfm/svnfm
     branch: master
index 93fb9ef..747223e 100644 (file)
@@ -5,10 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+    recipients: 'yangyanyj@chinamobile.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
           trigger_jobs: 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
index ac8c87e..db89aff 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'gvnfmadapter/pom.xml'
+          mvn-params: '-f gvnfmadapter/pom.xml'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f gvnfmadapter/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/vnfm/gvnfm'
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
     branch: 'master'
@@ -47,7 +59,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/gvnfm
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
 
@@ -56,5 +68,6 @@
     project-name: vfc-nfvo-driver-vnfm-gvnfm
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/vnfm/gvnfm
     branch: master
index 788b8fb..0f56d0c 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-juju-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-params: '-f juju/juju-vnfmadapter/pom.xml'
     project: 'vfc/nfvo/driver/vnfm/gvnfm'
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm-juju'
index 2552386..0cad04b 100644 (file)
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'gvnfmadapter':
           path: 'gvnfmadapter'
index 6807afa..ac6138a 100644 (file)
@@ -14,8 +14,8 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
index abcf1ed..88607eb 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'nokiav2/pom.xml'
+          mvn-params: '-f nokiav2/pom.xml'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: 'nokiav2/**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker
@@ -57,7 +64,7 @@
           docker_registry: '$DOCKER_REGISTRY:10003'
     files: 'nokiav2/**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     jobs:
       - gerrit-maven-sonar
-    build-node: ubuntu1604-builder-4c-4g
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm
@@ -81,6 +93,6 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/svnfm
     project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
index 1dd3cff..52aee73 100644 (file)
           mvn-params: '-P rootOnly'
           pattern: 'pom.xml'
       - '{project-name}-{stream}-merge-profile-java':
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           pattern: 'pom.xml'
-      - '{project-name}-{stream}-release-version-profile-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-P rootOnly'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-svnfm-root-info
     project-name: vfc-nfvo-driver-svnfm-root
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/vnfm/svnfm
     branch: master
index 3663663..db2b6bb 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'zte/vmanager/pom.xml'
+          mvn-params: '-f zte/vmanager/pom.xml'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f zte/vmanager/pom.xml'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
     branch: 'master'
@@ -41,6 +53,6 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/svnfm
     project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
index 39d7eb8..5c77ac2 100644 (file)
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'drv-vnfm-zte':
           path: 'zte/vmanager'
index 7aeb1b5..c687330 100644 (file)
@@ -5,10 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vfc-nfvo-lcm'
+    recipients: 'yangyanyj@chinamobile.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
           trigger_jobs: 'vfc-nfvo-lcm-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
index 2805ea9..fd848c5 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
     name: vfc-nfvo-lcm-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'vfc/nfvo/lcm'
@@ -50,5 +60,6 @@
     project-name: vfc-nfvo-lcm
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/lcm
     branch: master
index 9611a96..6a8377f 100644 (file)
@@ -5,10 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vfc-nfvo-multivimproxy'
+    recipients: 'yangyanyj@chinamobile.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
           trigger_jobs: 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
index 935ffca..16866a8 100644 (file)
@@ -7,24 +7,34 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      -  '{project-name}-gerrit-release-jobs':
+           build-node: centos7-docker-8c-8g
 
 - project:
     name: vfc-nfvo-multivimproxy-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/multivimproxy'
     project-name: 'vfc-nfvo-multivimproxy'
     branch: 'master'
@@ -39,7 +49,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/multivimproxy
     project-name: 'vfc-nfvo-multivimproxy'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-multivimproxy-settings'
 
@@ -48,5 +58,6 @@
     project-name: vfc-nfvo-multivimproxy
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/multivimproxy
     branch: master
index 304ac8e..1534fd5 100644 (file)
@@ -5,10 +5,10 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vfc-nfvo-resmanagement'
+    recipients: 'yangyanyj@chinamobile.com'
     stream: 'master'
     functionality:
       - 'sanity-check':
           trigger_jobs: 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
index 7ebfd06..b162ab8 100644 (file)
@@ -7,24 +7,34 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      -  '{project-name}-gerrit-release-jobs':
+           build-node: centos7-docker-8c-8g
 
 - project:
     name: vfc-nfvo-resmanagement-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/resmanagement'
     project-name: 'vfc-nfvo-resmanagement'
     branch: 'master'
@@ -39,7 +49,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/resmanagement
     project-name: 'vfc-nfvo-resmanagement'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-resmanagement-settings'
 
@@ -48,5 +58,6 @@
     project-name: vfc-nfvo-resmanagement
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/resmanagement
     branch: master
diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
deleted file mode 100644 (file)
index 591ad82..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
-    name: vfc-nfvo-wfengine-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-wfengine'
-    stream: 'master'
-    functionality:
-      - 'sanity-check'
-    trigger_jobs:
-      - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily'
-      - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
-
index 9664d08..ca51fc3 100644 (file)
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
           mvn-goals: 'clean'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: vfc-nfvo-wfengine-engine-mgr-service-stage
+    project-name: 'vfc-nfvo-wfengine-engine-mgr-service'
+    project: 'vfc/nfvo/wfengine'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-wfengine-settings'
+    subproject:
+      - 'engine-mgr-service':
+          pom: 'wfenginemgrservice/pom.xml'
+          pattern: 'wfenginemgrservice/**'
+          script:
+            !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'wfenginemgrservice/pom.xml'
+          mvn-params: '-f wfenginemgrservice/pom.xml'
+
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: vfc-nfvo-wfengine-engine-activiti-extension-stage
+    project-name: 'vfc-nfvo-wfengine-engine-activiti-extension'
+    project: 'vfc/nfvo/wfengine'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-wfengine-settings'
+    subproject:
+      - 'engine-activiti-extension':
+          pom: 'activiti-extension/pom.xml'
+          pattern: 'activiti-extension/**'
+          script:
+            !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'activiti-extension/pom.xml'
+          mvn-params: '-f activiti-extension/pom.xml'
+
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-wfengine-wfenginemgrservice-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     mvn-params: '-f wfenginemgrservice/pom.xml'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/wfengine'
     project-name: 'vfc-nfvo-wfengine-wfenginemgrservice'
     branch: 'master'
     name: vfc-nfvo-wfengine-activiti-extension-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     mvn-params: '-f activiti-extension/pom.xml'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/wfengine'
     project-name: 'vfc-nfvo-wfengine-activiti-extension'
     branch: 'master'
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/wfengine
     project-name: 'vfc-nfvo-wfengine'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-wfengine-settings'
 
     project-name: vfc-nfvo-wfengine
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/wfengine
     branch: master
index b8d0b0a..c300a50 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'vid'
+    recipients: 'ittay.stern@intl.att.com'
     stream:
       - 'master':
           branch: 'master'
index db9624a..a8668dc 100644 (file)
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: queue-docker-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-P docker'
+          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: 'vid'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: vid-docker
-    project-name: 'vid'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-    project: 'vid'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'vid-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: queue-docker-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: vid-docker-arm64
 #    mvn-settings: 'vid-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: vid-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vid'
     project-name: 'vid'
     branch: 'master'
     mvn-settings: 'vid-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-params: '-Dskip.npm'
 
 - project:
     name: vid-clm
     nexus-iq-namespace: 'onap-'
     project: vid
     project-name: 'vid'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vid-settings'
-    mvn-params: '-Dskip.npm'
 
 - project:
     name: vid-info
     project-name: vid
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vid
     branch: master
index 33a21d6..69f158c 100644 (file)
@@ -13,7 +13,7 @@
 
     project-type: freestyle
     concurrent: true
-    node: '{build-node}'
+    node: ubuntu1804-docker-8c-8g
 
     properties:
       - infra-properties:
@@ -67,4 +67,4 @@
 
     publishers:
       - infra-shiplogs:
-          maven-version: '{maven-version}'
\ No newline at end of file
+          maven-version: '{maven-version}'
index da1d5e2..c27b550 100644 (file)
@@ -1,8 +1,9 @@
 #!/bin/bash
 
-virtualenv $WORKSPACE/venv-tox
+virtualenv -p python3.6 $WORKSPACE/venv-tox
 source $WORKSPACE/venv-tox/bin/activate
 pip install --upgrade pip
 pip install -r etc/requirements.txt
 ls
+wget -O docs/data/needs.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" && echo "Copied newest needs." || exit 1
 tox -e needs
\ No newline at end of file
index 4c83e8f..f38f4d8 100644 (file)
@@ -10,6 +10,7 @@
     project: 'vnfrqts/epics'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-epics'
     branch: 'master'
     mvn-settings: 'vnfrqts-epics-settings'
index a8f5ece..dbd30a7 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfrqts/guidelines'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-guidelines'
     branch: 'master'
     mvn-settings: 'vnfrqts-guidelines-settings'
index 7bb260e..e026fb4 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfrqts/requirements'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-requirements'
     branch: 'master'
     mvn-settings: 'vnfrqts-requirements-settings'
index 83fb50e..a06e7ed 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfrqts/testcases'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-testcases'
     branch: 'master'
     mvn-settings: 'vnfrqts-testcases-settings'
index 0fdceb2..5070867 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfrqts/usecases'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-usecases'
     branch: 'master'
     mvn-settings: 'vnfrqts-usecases-settings'
index 499bfae..5c7716f 100644 (file)
@@ -21,7 +21,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vnfsdk-dovetail-integration-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-merge-java'
@@ -31,7 +31,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
 #- project:
 #    name: vnfsdk-dovetail-integration-arm64
 #    project-name: 'vnfsdk-dovetail-integration-arm64'
@@ -44,7 +44,7 @@
 #      - 'master':
 #          branch: 'master'
 #    mvn-settings: 'vnfsdk-dovetail-integration-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-java-daily':
 #          docker-pom: 'pom.xml'
@@ -56,7 +56,7 @@
     jobs:
       - gerrit-tox-sonar
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
@@ -68,6 +68,7 @@
     name: vnfsdk-dovetail-integration-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
@@ -79,6 +80,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/dovetail-integration
     project-name: 'vnfsdk-dovetail-integration'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-dovetail-integration-settings'
index f996394..57e12fc 100644 (file)
@@ -5,7 +5,10 @@
     jobs:
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
-    - '{project-name}-{stream}-release-version-java-daily'
+    - gerrit-maven-stage:
+        sign-artifacts: true
+        build-node: centos7-builder-4c-4g
+        maven-versions-plugin: true
 
     project: 'vnfsdk/functest'
     stream:
     mvn-settings: 'vnfsdk-functest-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-functest-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/functest'
     project-name: 'vnfsdk-functest'
     branch: 'master'
@@ -33,6 +41,7 @@
     name: vnfsdk-functest-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/functest'
     project-name: 'vnfsdk-functest'
     branch: 'master'
@@ -44,6 +53,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/functest
     project-name: 'vnfsdk-functest'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-functest-settings'
index e77fa78..e2e365c 100644 (file)
@@ -15,6 +15,7 @@
     name: vnfsdk-lctest-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/lctest'
     project-name: 'vnfsdk-lctest'
     branch: 'master'
index 71808ea..90763d2 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfsdk/model'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: vnfsdk-model
     branch: master
     mvn-settings: vnfsdk-model-settings
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml
deleted file mode 100644 (file)
index 93cbf9f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: vnfsdk-pkgtools-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vnfsdk-pkgtools'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs:
-    robot-options: ''
-    branch: 'master'
index 509f01b..6d22310 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: vnfsdk-pkgtools
     project-name: 'vnfsdk-pkgtools'
-    python-version: python2.7
+    python-version: python3
     tox-dir: '.'
     tox-envs: ''
     subproject:
@@ -14,7 +14,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vnfsdk-pkgtools-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{subproject}-python-staging-{stream}'
@@ -25,7 +25,7 @@
     jobs:
       - gerrit-tox-sonar
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/pkgtools'
     project-name: 'vnfsdk-pkgtools'
     branch: 'master'
@@ -37,6 +37,7 @@
     name: vnfsdk-pkgtools-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/pkgtools'
     project-name: 'vnfsdk-pkgtools'
     branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
deleted file mode 100644 (file)
index e34fd74..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: vnfsdk-refrepo-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vnfsdk-refrepo'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: '{project-name}-{stream}-merge-java'
-    robot-options: ''
-    branch: 'master'
index 0724f66..d435641 100644 (file)
@@ -5,17 +5,23 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
-          mvn-goals: 'docker:build'
-          docker-image-name: 'onap/vnfsdk/refrepo'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: 'clean package -Pdocker'
+          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-name}-{stream}-docker-version-java-daily':
+#          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#          build-node: ubuntu1804-docker-8c-8g
     project: 'vnfsdk/refrepo'
     stream:
       - 'master':
@@ -23,7 +29,7 @@
     mvn-settings: 'vnfsdk-refrepo-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: vnfsdk-refrepo-arm64
 #    mvn-settings: 'vnfsdk-refrepo-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: vnfsdk-refrepo-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
@@ -63,6 +74,7 @@
     name: vnfsdk-refrepo-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
@@ -74,6 +86,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/refrepo
     project-name: 'vnfsdk-refrepo'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-refrepo-settings'
index faa9e59..3d5a602 100644 (file)
@@ -5,7 +5,12 @@
     jobs:
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
-    - '{project-name}-{stream}-release-version-java-daily'
+    - gerrit-maven-stage:
+        sign-artifacts: true
+        build-node: centos7-builder-4c-4g
+        maven-versions-plugin: true
+    - '{project-name}-gerrit-release-jobs':
+        build-node: centos7-docker-8c-8g
     project: 'vnfsdk/validation'
     stream:
       - 'master':
     mvn-settings: 'vnfsdk-validation-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-validation-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
@@ -32,6 +42,7 @@
     name: vnfsdk-validation-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
@@ -43,6 +54,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/validation
     project-name: 'vnfsdk-validation'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-validation-settings'
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh b/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh
new file mode 100644 (file)
index 0000000..4a2a76a
--- /dev/null
@@ -0,0 +1,75 @@
+#!/bin/bash
+set -x
+
+#3rd party
+cmake_build_type=RELEASE
+LEVELDB_VER=1.22
+THRIFT_VER=0.12.0
+JSON_VER=3.5.0
+SPDLOG_VER=1.3.1
+
+sudo yum install -y cppcheck bison libcurl-devel; yum clean all
+sudo pip install gcovr
+
+#cmake
+cd /tmp/
+wget https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Linux-x86_64.tar.gz
+tar xzvf cmake*.tar.gz
+sudo rpm -e cmake
+sudo ln -s $(pwd)/cmake-3.15.3-Linux-x86_64/bin/cmake /usr/bin/cmake
+
+#leveldb
+cd /tmp
+curl -o leveldb.zip https://codeload.github.com/google/leveldb/zip/$LEVELDB_VER
+unzip leveldb.zip
+rm leveldb.zip
+mv leveldb-$LEVELDB_VER leveldb
+mkdir leveldb/_build
+cd leveldb/_build;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DCMAKE_POSITION_INDEPENDENT_CODE=ON; make -j 10; sudo make install
+
+#json
+cd /tmp
+curl -o json.zip https://codeload.github.com/nlohmann/json/zip/v$JSON_VER
+unzip json.zip
+rm json.zip
+mv json-$JSON_VER json
+cd json;mkdir _build
+cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DJSON_BuildTests=OFF;make -j 10;sudo make install
+
+#spdlog
+cd /tmp
+curl -o spdlog.zip https://codeload.github.com/gabime/spdlog/zip/v$SPDLOG_VER
+unzip spdlog.zip
+rm spdlog.zip
+mv spdlog-$SPDLOG_VER spdlog
+cd spdlog;mkdir _build
+cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DSPDLOG_BUILD_EXAMPLES=OFF -DSPDLOG_BUILD_BENCH=OFF -DSPDLOG_BUILD_TESTS=OFF; make -j 10; sudo make install
+
+#thrift
+cd /tmp
+curl -o thrift.zip https://codeload.github.com/apache/thrift/zip/v$THRIFT_VER
+unzip thrift.zip
+rm thrift.zip
+mv thrift-$THRIFT_VER thrift
+cd thrift;mkdir _build
+cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DBUILD_PYTHON=OFF -DBUILD_JAVA=OFF -DBUILD_C_GLIB=OFF -DWITH_LIBEVENT=OFF -DWITH_ZLIB=OFF -DWITH_OPENSSL=OFF -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON;make -j 10;sudo make install
+
+#verify/sonar
+if [[ "${JOB_NAME}" == "vnfsdk-ves-agent-cmake-sonar" ]]; then
+echo "sonar"
+mkdir -p ${BUILD_DIR}
+cppcheck --enable=all --inconclusive --xml --xml-version=2 --output-file=${BUILD_DIR}/cppcheck.xml .
+
+cd ${BUILD_DIR}
+cat >> sonar-project.properties <<EOF
+sonar.cfamily.gcov.reportsPath=${BUILD_DIR}/coverage
+sonar.cppcheck.reportPath=${BUILD_DIR}/cppcheck.xml
+sonar.exclusions=**/gen-cpp/**/*,**/build/**/*
+sonar.projectBaseDir=${WORKSPACE}/veslibrary/ves_cpplibrary
+sonar.cfamily.threads=4
+EOF
+
+ls ${BUILD_DIR}/sonar-project.properties
+cat ${BUILD_DIR}/sonar-project.properties
+
+fi
index 866775b..7d41914 100644 (file)
           mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-java-daily'
+      - 'gerrit-cmake-verify':
+          build-timeout: 30
+          pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh
+          build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build
+          make-opts: -j6
+          build-node: centos7-builder-4c-4g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+          mvn-pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+          pattern: 'veslibrary/**'
     project: 'vnfsdk/ves-agent'
     stream:
       - 'master':
     mvn-settings: 'vnfsdk-ves-agent-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-ves-agent-sonar
     jobs:
       - gerrit-maven-sonar
+      - gerrit-cmake-sonar:
+          build-timeout: 60
+          pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh
+          build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build
+          cmake-opts: '-DENABLE_COVERAGE=on -DCOVERAGE_DIR=coverage'
+          sonarcloud-api-token: '{sonarcloud_api_token}'
+          sonarcloud-organization: '{sonarcloud_project_organization}'
+          sonarcloud-project-key: '{sonarcloud_project_organization}_vnfsdk-ves-agent'
+          make-opts: -j6
+          stream: master
+          build-node: centos7-builder-4c-4g
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/ves-agent'
     project-name: 'vnfsdk-ves-agent'
     branch: 'master'
@@ -39,6 +67,7 @@
     name: vnfsdk-ves-agent-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/ves-agent'
     project-name: 'vnfsdk-ves-agent'
     branch: 'master'
@@ -51,6 +80,6 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/ves-agent
     project-name: 'vnfsdk-ves-agent'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-ves-agent-settings'
index b90f77b..f17b3db 100644 (file)
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-virtualenv -p python3 $WORKSPACE/venv-tox
+python3 -m venv $WORKSPACE/venv-tox
 source $WORKSPACE/venv-tox/bin/activate
 pip3 install --upgrade pip
 pip3 install --no-use-pep517 -r requirements.txt
 ls
-wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json"
-echo "Copied newest needs."
+wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" && echo "Copied newest needs." || exit 1
 cd ice_validator/
 pytest --self-test tests/
\ No newline at end of file
index 338c79b..b0516ce 100644 (file)
@@ -7,3 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
diff --git a/jjb/vvp/vvp-em.yaml b/jjb/vvp/vvp-em.yaml
new file mode 100644 (file)
index 0000000..a0870ad
--- /dev/null
@@ -0,0 +1,10 @@
+---
+- project:
+    name: vvp-engagementmgr
+    project-name: 'vvp-engagementmgr'
+    project: 'vvp/engagementmgr'
+    mvn-settings: 'vvp-engagementmgr-settings'
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
diff --git a/jjb/vvp/vvp-oom.yaml b/jjb/vvp/vvp-oom.yaml
new file mode 100644 (file)
index 0000000..2a6b271
--- /dev/null
@@ -0,0 +1,10 @@
+---
+- project:
+    name: vvp-oom
+    project-name: 'vvp-oom'
+    project: 'vvp/oom'
+    mvn-settings: 'vvp-oom-settings'
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
diff --git a/jjb/vvp/vvp-regression.yaml b/jjb/vvp/vvp-regression.yaml
new file mode 100644 (file)
index 0000000..bea93c3
--- /dev/null
@@ -0,0 +1,10 @@
+---
+- project:
+    name: vvp-regression-tests
+    project-name: 'vvp-regression-tests'
+    project: 'vvp/regression-tests'
+    mvn-settings: 'vvp-regression-tests-settings'
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
new file mode 100644 (file)
index 0000000..0a8303c
--- /dev/null
@@ -0,0 +1,44 @@
+---
+- project:
+    name: vvp-test-engine-info
+    project-name: 'vvp-test-engine'
+    project: 'vvp/test-engine'
+    mvn-settings: 'vvp-test-engine-settings'
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+
+- project:
+    name: vvp-test-engine-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'vvp/test-engine'
+    project-name: 'vvp-test-engine'
+    branch: 'master'
+    mvn-settings: 'vvp-test-engine-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vvp-test-engine-verify
+    project-name: 'vvp-test-engine'
+    project: 'vvp/test-engine'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vvp-test-engine-settings'
+    build-node: 'centos7-builder-4c-4g'
+    subproject:
+      - 'onap-client':
+          path: 'onap-client'
+          pattern: 'onap-client/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
index 943ea87..9f9b85e 100644 (file)
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-validation-scripts-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 
     name: vvp-validation-scripts-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'vvp/validation-scripts'
     project-name: 'vvp-validation-scripts'
     branch: 'master'
@@ -37,6 +44,7 @@
     name: vvp-validation-scripts-tracability-matrix
     project: 'vvp/validation-scripts'
     project-name: 'vvp-validation-scripts'
+    build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'vvp-validation-scripts-settings'
     mvn-global-settings: 'global-settings'
     stream:
index 1cb0f11..da5d5cf 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1cb0f11add7a8494b6b22f4d55a5ab3f7b1ee3cd
+Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100
index e3b8086..daed681 100644 (file)
@@ -7,7 +7,7 @@
 
   vars:
     kubectl_version: 1.11.2
-    helm_version: 2.9.1
+    helm_version: 2.12.3
 
   tasks:
     - name: 'Install kubectl {{kubectl_version}}'
index ddfe3a9..3460981 100644 (file)
@@ -1,2 +1,108 @@
 ---
 - import_playbook: ../common-packer/provision/baseline.yaml
+
+- hosts: all
+  become_user: root
+  become_method: sudo
+
+  tasks:
+    - apt_repository:
+        repo: ppa:deadsnakes/ppa
+        state: present
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Update and upgrade apt packages
+      apt:
+        upgrade: 'yes'
+        update_cache: yes
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install python-tox and deps
+      pip:
+        name:
+          - tox
+          - tox-pyenv
+          - virtualenv
+          - more-itertools~=5.0.0
+          - zipp==1.0.0
+        state: present
+      become: true
+
+    - name: Install Python 3.6 and packages
+      apt:
+        name:
+          - python3.6
+          - python3.6-dev
+          - python3.6-tk
+          - libssl-dev
+          - libmysqlclient-dev
+          - gcc
+          - python3-venv
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install Python 3.7
+      apt:
+        name:
+          - python3.7
+          - python3.7-dev
+          - python3.7-tk
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install libssl1.0-dev dep
+      apt:
+        name: libssl1.0-dev
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install nodejs-dev dep for npm
+      apt:
+        name: nodejs-dev
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install base packages
+      apt:
+        name:
+          - unzip
+          - xz-utils
+          - libxml-xpath-perl
+          - wget
+          - make
+          - sshuttle
+          - netcat
+          - libssl-dev
+          - libffi-dev
+          - xmlstarlet
+          - xvfb
+          - crudini
+          - maven
+          - python-ncclient
+          - xmlstarlet
+          - xvfb
+          - crudini
+          - maven
+          - python-ncclient
+        update_cache: yes
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install npm and addon packages
+      apt:
+        name:
+          - nodejs
+          - npm
+          - node-gyp
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+
index 8654b99..0948cd0 100644 (file)
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install python-tox
+    - name: Install python-tox and deps
       pip:
-        name: tox
+        name:
+          - tox
+          - tox-pyenv
+          - virtualenv
+          - more-itertools~=5.0.0
+          - zipp==1.0.0
         state: present
       become: true
 
     - apt_repository:
-        repo: ppa:jonathonf/python-3.6
+        repo: ppa:deadsnakes/ppa
         state: present
       become: true
       when: ansible_distribution == 'Ubuntu'
 
     - name: Update and upgrade apt packages
       apt:
-        upgrade: yes
+        upgrade: 'yes'
         update_cache: yes
       become: true
       when: ansible_distribution == 'Ubuntu'
         name:
           - python3.6
           - python3.6-dev
+          - python3.6-tk
           - libssl-dev
           - libmysqlclient-dev
           - gcc
+          - python3-venv
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install Python 3.7
+      apt:
+        name:
+          - python3.7
+          - python3.7-dev
+          - python3.7-tk
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install nodejs-dev libssl1.0-dev dep
+      apt:
+        name:
+          - libssl1.0-dev
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install nodejs-dev dep for npm
+      apt:
+        name:
+          - nodejs-dev
+        update_cache: yes
+        state: fixed
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install base packages
+    - name: Install supporting packages
       apt:
         name:
           - unzip
           - libxml-xpath-perl
           - wget
           - make
-          - npm
           - sshuttle
           - netcat
           - libssl-dev
           - libffi-dev
-      become: true
-      when: ansible_distribution == 'Ubuntu'
-
-    - name: Install autorelease support packages
-      apt:
-        name:
           - xmlstarlet
           - xvfb
           - crudini
           - maven
           - python-ncclient
+          - xmlstarlet
+          - xvfb
+          - crudini
+          - maven
+          - python-ncclient
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install npm and addon packages
+      apt:
+        name:
+          - nodejs
+          - npm
+          - node-gyp
+        update_cache: yes
+        state: fixed
       become: true
       when: ansible_distribution == 'Ubuntu'
 
 
     - name: Install Erlang
       apt:
-        deb: https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
+        deb: https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
       become: true
       when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
         state: link
       become: true
       when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
+
+    - name: Install jinja2
+      pip:
+        name: jinja2
+        state: present
+      become: true
+      when: ansible_architecture == 'x86_64'
index 495566c..b97437b 100644 (file)
       service:
         name: redis
         state: started
-      become: true
\ No newline at end of file
+      become: true
+
+    - name: Install Python 3.6
+      yum:
+        name:
+          - epel-release
+          - python36
+        update_cache: yes
+        state: latest
+      become: true
diff --git a/packer/vars/ubuntu-18.04-arm64.json b/packer/vars/ubuntu-18.04-arm64.json
new file mode 100644 (file)
index 0000000..6b8b2b5
--- /dev/null
@@ -0,0 +1,10 @@
+{
+  "arch": "arm64",
+  "base_image": "Ubuntu 18.04 LTS (arm64) [2020-02-18]",
+  "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
+  "distro": "Ubuntu 18.04",
+  "flavor": "lf-standard-1",
+  "source_ami_filter_name": "*ubuntu*18.04*",
+  "source_ami_filter_owner": "099720109477",
+  "ssh_user": "ubuntu"
+}
diff --git a/shell/docker-compose-logs.sh b/shell/docker-compose-logs.sh
new file mode 100644 (file)
index 0000000..87bcd69
--- /dev/null
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Copyright 2020 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Dump Docker Compose info
+
+set +e  # Do not fail build if any of script command fails
+set -x
+
+echo "---> docker-compose-logs.sh"
+
+cd $DOCKER_ROOT
+docker-compose config
+docker-compose ps
+docker-compose top
+docker-compose images
+
+# Do not fail build if script fails.
+exit 0
diff --git a/shell/docker-ts-tag-override.sh b/shell/docker-ts-tag-override.sh
new file mode 100755 (executable)
index 0000000..e14d2e5
--- /dev/null
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# ================================================================================
+# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
+set -feu -o pipefail
+
+echo "--> docker-ts-tag-override.sh"
+
+# Get project version from pom.xml
+version=`xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" $DOCKER_ROOT/pom.xml`
+echo "INFO: version from pom file $version"
+
+# Some pom has -SNAPSHOT or -STAGING under pom version, remove all text
+version="${version//[^0-9.]/}"
+
+# Get build TS for specifying in the tag
+timestamp=$(date +%C%y%m%dT%H%M%SZ)
+
+# Following the https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process
+# IndependentVersioningandReleaseProcess-StandardizedDockerTagging
+# ONAP Tag requirement :  {imagename}:{semver}-SNAPSHOT-{timestamp}Z (from CIMAN-132)
+
+if [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+  tag="${version}-SNAPSHOT-${timestamp}"
+else
+  # Default to latest tag with TS if not conforming to semantic versioning
+  echo "WARN: version not complaint to sem-ver; tag defaulted to latest"
+  version=latest
+  tag="${version}-${timestamp}"
+fi
+
+echo "INFO: docker tag is $tag"
+
+# Write DOCKER_IMAGE_TAG information to a file so it can be
+# injected into the environment for following steps
+echo "DOCKER_IMAGE_TAG=$tag" >> "$WORKSPACE/env_docker_inject.txt"
index e319b06..eed10c4 100644 (file)
@@ -19,29 +19,86 @@ PS4='+['$(readlink -f "$0")' ${FUNCNAME[0]%main}#$LINENO] '
 
 echo '---> maven-coverity.sh'
 
+SUBMISSION_ATTEMPTS=5
+SUBMISSION_INITIAL_REST_INTERVAL=30 # seconds, will be doubled after each attempt
+
+#-----------------------------------------------------------------------------
+# Check for git repo changes within the last $MAX_GIT_REPO_AGE_HOURS hours
+#
+# It makes sense to set the value twice the 'cron' interval for the job (e.g.
+# if 'cron: @daily', then MAX_GIT_REPO_AGE_HOURS=48)
+
+if ! [[ "${MAX_GIT_REPO_AGE_HOURS:=0}" =~ ^[0-9]+$ ]]; then
+  echo '[ERROR] MAX_GIT_REPO_AGE_HOURS must be non-negative integer.' \
+    >&2
+  exit 1
+fi
+
+if [ ${MAX_GIT_REPO_AGE_HOURS:=0} -ne 0 ]; then
+  LAST_COMMIT_AGE=$(( $(date +%s) - $(git log -1 --pretty=format:%ct) ))
+
+  if [ $LAST_COMMIT_AGE -gt $(( MAX_GIT_REPO_AGE_HOURS *60*60 )) ]; then
+    echo '[NOTICE] Git repository did not have any commits last' \
+      "${MAX_GIT_REPO_AGE_HOURS} hours - no need to re-analyse it." \
+      >&2
+    exit 0
+  fi
+fi
+
+#-----------------------------------------------------------------------------
+# Process parameters for JS/TS/Python/Ruby/PHP files analysis
+
+if [ -n "${SEARCH_PATHS:=}" ]; then
+  for SEARCH_PATH in ${SEARCH_PATHS}; do
+    if [ -d "${SEARCH_PATH}" ]; then
+      FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS:=} --fs-capture-search '${SEARCH_PATH}'"
+    else
+      echo "[ERROR] '${SEARCH_PATH}' from \$SEARCH_PATHS is not an" \
+        "existing directory." \
+        >&2
+      exit 1
+    fi
+  done
+
+  for EXCLUDE_REGEX in ${SEARCH_EXCLUDE_REGEXS:=}; do
+    EXCLUDE_REGEX=${EXCLUDE_REGEX//\'/\'\\\'\'} # escape single quote "'"
+    FS_CAPTURE_SEARCH_PARAMS="${FS_CAPTURE_SEARCH_PARAMS} --fs-capture-search-exclude-regex '${EXCLUDE_REGEX}'"
+
+    # FIXME: a hack to deal with temporary(?) non-functional filter to ignore
+    # specific source code parts by Coverity Scan ("--fs-capture-search-exclude-regex"
+    # CLI parameter for "cov-build" tool). The hack can be removed when this CLI
+    # parameter is fixed on Coverity side.
+    FS_CAPTURE_SEARCH_EXCLUDE_HACK_PARAMS="${FS_CAPTURE_SEARCH_EXCLUDE_HACK_PARAMS:=} --tu-pattern 'file('\\''${EXCLUDE_REGEX}'\\'')'"
+  done
+fi
+
 #-----------------------------------------------------------------------------
 # Check if we are allowed to submit results to Coverity Scan service
 # and have not exceeded our upload quota limits
 # See also: https://scan.coverity.com/faq#frequency
 
-CURL_OUTPUT=$(
-  curl \
-    --verbose \
-    --silent \
-    --show-error \
-    --fail \
-    --form "project=${COVERITY_PROJECT_NAME}" \
-    --form "token=${COVERITY_TOKEN}" \
-    'https://scan.coverity.com/api/upload_permitted'
-)
+if [ "${DRY_RUN}" != 'true' ]; then
+  CURL_OUTPUT=$(
+    curl \
+      --verbose \
+      --silent \
+      --show-error \
+      --fail \
+      --form "project=${COVERITY_PROJECT_NAME}" \
+      --form "token=${COVERITY_TOKEN}" \
+      'https://scan.coverity.com/api/upload_permitted'
+  )
 
-IS_COVERITY_UPLOAD_PERMITTED=$(
-  echo "${CURL_OUTPUT}" \
-  | jq '.upload_permitted'
-)
-if [ x"${IS_COVERITY_UPLOAD_PERMITTED}" != x'true' ]; then
-  echo "Upload quota reached. Next upload permitted at "$(echo "${CURL_OUTPUT}" | jq '.next_upload_permitted_at') >&2
-  exit 1
+  IS_COVERITY_UPLOAD_PERMITTED=$(
+    echo "${CURL_OUTPUT}" \
+    | jq '.upload_permitted'
+  )
+  if [ x"${IS_COVERITY_UPLOAD_PERMITTED}" != x'true' ]; then
+    echo "[WARNING] Upload quota reached. Next upload permitted at" \
+      $(echo "${CURL_OUTPUT}" | jq '.next_upload_permitted_at') \
+      >&2
+    exit 1
+  fi
 fi
 
 #-----------------------------------------------------------------------------
@@ -54,7 +111,7 @@ curl \
   --fail \
   --form "project=${COVERITY_PROJECT_NAME}" \
   --form "token=${COVERITY_TOKEN}" \
-  --output 'coverity_tool.tgz' \
+  --output '/tmp/coverity_tool.tgz' \
   'https://scan.coverity.com/download/linux64'
 
 curl \
@@ -65,23 +122,24 @@ curl \
   --form "project=${COVERITY_PROJECT_NAME}" \
   --form "token=${COVERITY_TOKEN}" \
   --form 'md5=1' \
-  --output 'coverity_tool.md5' \
+  --output '/tmp/coverity_tool.md5' \
   'https://scan.coverity.com/download/linux64'
 
-echo -n ' coverity_tool.tgz' >> 'coverity_tool.md5'
-md5sum --check 'coverity_tool.md5'
+echo -n ' /tmp/coverity_tool.tgz' >> '/tmp/coverity_tool.md5'
+md5sum --check '/tmp/coverity_tool.md5'
 
 tar \
   --extract \
   --gunzip \
-  --file='coverity_tool.tgz'
+  --file='/tmp/coverity_tool.tgz' \
+  --directory='/tmp'
 
-COVERITY_BUILD_TOOL_DIRECTORY=$(
+COVERITY_BUILD_TOOL_DIRECTORY='/tmp/'$(
   head -1 <( \
     tar \
       --list \
       --gunzip \
-      --file='coverity_tool.tgz'
+      --file='/tmp/coverity_tool.tgz'
   )
 )
 COVERITY_BINARY_DIRECTORY="${COVERITY_BUILD_TOOL_DIRECTORY}bin"
@@ -89,15 +147,17 @@ test -d "${COVERITY_BINARY_DIRECTORY}" \
   || exit 1
 export PATH="${PATH}:${COVERITY_BINARY_DIRECTORY}"
 
-rm 'coverity_tool.tgz'
+rm '/tmp/coverity_tool.tgz'
 
 #-----------------------------------------------------------------------------
 # Build
 
 export MAVEN_OPTS
 
-cov-build \
+eval cov-build \
   --dir 'cov-int' \
+  --append-log \
+  ${FS_CAPTURE_SEARCH_PARAMS:=} \
   "${MVN}" clean install \
     --errors \
     --global-settings "${GLOBAL_SETTINGS_FILE}" \
@@ -105,32 +165,97 @@ cov-build \
     ${MAVEN_OPTIONS:=} \
     ${MAVEN_PARAMS:=}
 
+# FIXME: a hack to deal with temporary(?) non-functional filter to ignore
+# specific source code parts by Coverity Scan ("--fs-capture-search-exclude-regex"
+# CLI parameter for "cov-build" tool). The hack can be removed when this CLI
+# parameter is fixed on Coverity side.
+if [ -n "${FS_CAPTURE_SEARCH_EXCLUDE_HACK_PARAMS:=}" ]; then
+  eval cov-manage-emit \
+    --dir 'cov-int' \
+    ${FS_CAPTURE_SEARCH_EXCLUDE_HACK_PARAMS} \
+    delete
+fi
+
+# Extract git data for analysed files
 cov-import-scm \
   --dir 'cov-int' \
   --scm 'git'
 
+# List all analysed files from the project
+cov-manage-emit \
+  --dir cov-int \
+  list \
+| grep \
+  --invert-match \
+  '^Translation unit:$' \
+| sed \
+  --regexp-extended \
+  's!^[[:digit:]]+ -> !!' \
+| sort \
+> 'cov-int/coverity-scan-analysed-files.txt'
+
+# List all analyzed files that are not tracked by SCM repository
+cov-manage-emit \
+  --dir cov-int \
+  list-scm-unknown \
+| sed \
+  --regexp-extended \
+  's!^[^ ]+ !!' \
+| sort \
+> 'cov-int/scm-untracked-files.txt'
+
+if [ -s 'cov-int/scm-untracked-files.txt' ]; then
+  echo '[WARNING] There are some files analysed but not tracked by SCM repository.' \
+    'There might be 3rd-party or auto-generated sources. See details in' \
+    '"cov-int/scm-untracked-files.txt" file.' \
+    >&2
+fi
+
 #-----------------------------------------------------------------------------
 # Submit results to Coverity service
 
-tar \
-  --create \
-  --gzip \
-  --file='results.tgz' \
-  'cov-int'
+if [ "${DRY_RUN}" != 'true' ]; then
+  tar \
+    --create \
+    --gzip \
+    --file='results.tgz' \
+    'cov-int'
 
-curl \
-  --verbose \
-  --silent \
-  --show-error \
-  --fail \
-  --form "project=${COVERITY_PROJECT_NAME}" \
-  --form "email=${COVERITY_USER_EMAIL}" \
-  --form "token=${COVERITY_TOKEN}" \
-  --form 'file=@results.tgz' \
-  --form "version=${GIT_COMMIT:0:7}" \
-  --form "description=${GIT_BRANCH}" \
-  'https://scan.coverity.com/builds'
+  for (( ATTEMPT=1; ATTEMPT<=SUBMISSION_ATTEMPTS; ATTEMPT++ )); do
+    CURL_OUTPUT=$(
+      curl \
+        --verbose \
+        --silent \
+        --show-error \
+        --fail \
+        --write-out '\n%{http_code}' \
+        --form "project=${COVERITY_PROJECT_NAME}" \
+        --form "email=${COVERITY_USER_EMAIL}" \
+        --form "token=${COVERITY_TOKEN}" \
+        --form 'file=@results.tgz' \
+        --form "version=${GIT_COMMIT:0:7}" \
+        --form "description=${GIT_BRANCH}" \
+        'https://scan.coverity.com/builds'
+    )
+    HTTP_RESPONSE_CODE=$(echo -n "${CURL_OUTPUT}" | tail -1)
+    test x"${HTTP_RESPONSE_CODE}" = x"200" \
+      && break
 
-#-----------------------------------------------------------------------------
+    sleep "${SUBMISSION_REST_INTERVAL:-$SUBMISSION_INITIAL_REST_INTERVAL}"
 
+    SUBMISSION_REST_INTERVAL=$(( ${SUBMISSION_REST_INTERVAL:-$SUBMISSION_INITIAL_REST_INTERVAL} * 2 ))
+  done
+
+  HTTP_RESPONSE=$(echo -n "${CURL_OUTPUT}" | head -n -1 | tr -d '\n')
+  if [ x"${HTTP_RESPONSE}" != x"Build successfully submitted." ]; then
+    echo "[ERROR] Coverity Scan service responded with '${HTTP_RESPONSE}'" \
+      "while 'Build successfully submitted.' expected." \
+      >&2
+    exit 1
+  fi
+
+  echo "[INFO] Build successfully submitted to Coverity Scan server." >&2
+fi
+
+#-----------------------------------------------------------------------------
 exit 0
index bc3d4ae..cd4afb6 100644 (file)
@@ -2,7 +2,7 @@
 # Script to build PyPI artifacts
 set -e -x -o pipefail
 
-virtualenv -p "$PYTHON_VERSION" /tmp/v/twine
+virtualenv -p "$PYTHON" /tmp/v/twine
 source "/tmp/v/twine/bin/activate"
 
 pip install twine wheel
index 2510ed3..e097b16 100644 (file)
@@ -2,7 +2,7 @@
 # Script to publush PyPI artifacts
 set -e -x -o pipefail
 
-virtualenv -p "$PYTHON_VERSION" /tmp/v/twine
+virtualenv -p "$PYTHON" /tmp/v/twine
 source "/tmp/v/twine/bin/activate"
 
 pip install twine
diff --git a/shell/run_releasedockerhub.sh b/shell/run_releasedockerhub.sh
new file mode 100644 (file)
index 0000000..474911d
--- /dev/null
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+echo "---> run_releasedockerhub.sh"
+# Ensure we fail the job if any steps fail
+# Disable 'globbing'
+set -euf -o pipefail
+
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-activate-venv zipp==1.1.0 lftools
+
+if [ ! -v RELEASEDOCKERHUB_ORG ]
+then
+  echo "RELEASEDOCKERHUB_ORG is not defined. For onap set it to 'onap'"
+  exit 1
+fi
+
+cmd_str="--org $RELEASEDOCKERHUB_ORG"
+if [ -v RELEASEDOCKERHUB_SUMMARY ]
+then
+    cmd_str+=" --summary"
+fi
+if [ -v RELEASEDOCKERHUB_VERBOSE ]
+then
+    cmd_str+=" --verbose"
+fi
+if [ -v RELEASEDOCKERHUB_REPO ]
+then
+    cmd_str+=" --repo $RELEASEDOCKERHUB_REPO"
+fi
+if [ -v RELEASEDOCKERHUB_EXACT ]
+then
+    cmd_str+=" --exact"
+fi
+
+
+if [ -v RELEASEDOCKERHUB_COPY ]
+then
+    cmd_str+=" --copy"
+fi
+
+echo "cmd_str = >>$cmd_str<<"
+
+# Run the releasedockerhub command in lftools
+lftools nexus docker releasedockerhub  $cmd_str