Merge "remove modeling-toscaparsers-nfvparser from JJB"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Thu, 20 May 2021 18:42:18 +0000 (18:42 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 20 May 2021 18:42:18 +0000 (18:42 +0000)
297 files changed:
INFO.yaml [new file with mode: 0644]
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/cloud.cfg
jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
jenkins-config/global-vars-production.sh
jenkins-config/global-vars-sandbox.sh
jjb/aaf/aaf-cadi.yaml
jjb/aaf/aaf-certservice-csit.yaml
jjb/aaf/aaf-certservice.yaml
jjb/aaf/aaf-luaplugin.yaml [deleted file]
jjb/aaf/aaf-sms.yaml [deleted file]
jjb/aaf/aaf-sshsm.yaml [deleted file]
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-cacher.yaml
jjb/aai/aai-esr-gui.yaml [deleted file]
jjb/aai/aai-event-client.yaml
jjb/aai/aai-graphadmin.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 [deleted file]
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-traversal.yaml
jjb/aai/aai-validation.yaml
jjb/appc/appc-cdt.yaml [deleted file]
jjb/appc/appc-csit.yaml
jjb/appc/appc-deployment.yaml [deleted file]
jjb/appc/appc-parent.yaml [deleted file]
jjb/ccsdk/apps.yaml
jjb/ccsdk/ccsdk-csit.yaml
jjb/ccsdk/ccsdk-oran.yaml [new file with mode: 0644]
jjb/ccsdk/cds.yaml
jjb/ccsdk/dashboard.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/sli-adaptors.yaml [deleted file]
jjb/ccsdk/sli-northbound.yaml [deleted file]
jjb/ccsdk/sli-plugins.yaml [deleted file]
jjb/ccsdk/sli.yaml [moved from jjb/ccsdk/sli-core.yaml with 63% similarity]
jjb/ccsdk/utils.yaml
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/ci-management/ci-management.yaml
jjb/clamp/clamp-csit.yaml [deleted file]
jjb/clamp/dashboard/clamp-dashboard.yaml [deleted file]
jjb/clamp/ui/info-clamp-ui.yaml [deleted file]
jjb/cli/cli.yaml
jjb/cps/cps-cps-tbdmt.yaml [new file with mode: 0644]
jjb/cps/cps-cps-temporal.yaml [new file with mode: 0644]
jjb/cps/cps-csit.yaml [new file with mode: 0644]
jjb/cps/cps.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-analytics-tca.yaml [deleted file]
jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
jjb/dcaegen2/dcaegen2-deployments.yaml
jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml [deleted file]
jjb/dcaegen2/dcaegen2-platform-plugins.yaml
jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
jjb/dcaegen2/dcaegen2-services-prh.yaml
jjb/dcaegen2/dcaegen2-services-sdk.yaml
jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-services-son-handler.yaml
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 [deleted file]
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-csit.yaml [deleted file]
jjb/dmaap/dmaap-datarouter-csit.yaml [deleted file]
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-dbcapi.yaml [deleted file]
jjb/dmaap/dmaap-kafka-docker.yaml [deleted file]
jjb/dmaap/dmaap-kafka.yaml [deleted file]
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-docker.yaml [deleted file]
jjb/dmaap/dmaap-messagerouter-kafka.yaml [new file with mode: 0644]
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
jjb/dmaap/dmaap-messagerouter-zookeeper.yaml [moved from jjb/dmaap/dmaap-zookeeper.yaml with 62% similarity]
jjb/doc/doc-templates-rtd.yaml
jjb/doc/doc.yaml
jjb/externalapi/externalapi-nbi.yaml
jjb/global-defaults.yaml
jjb/global-macros.yaml
jjb/global-templates-docker.yaml
jjb/global-templates-golang.yaml
jjb/global-templates-helm.yaml
jjb/global-templates-java.yaml
jjb/global-templates-python.yaml
jjb/global-templates-script.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/integration/include-raw-integration-install-robotframework.sh
jjb/integration/integration-docker.yaml
jjb/integration/integration-ietf-actn-tools.yaml [new file with mode: 0644]
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates-csit.yaml
jjb/integration/integration-templates-docker.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-terraform.yaml [new file with mode: 0644]
jjb/integration/integration-terragrunt.yaml [new file with mode: 0644]
jjb/integration/integration.yaml
jjb/integration/simulators/integration-5G-core-nf-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-core-nssmf-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-masspnf-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-pnf-simulator.yaml
jjb/integration/simulators/integration-ran-nssmf-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/integration-ran-simulator.yaml
jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml [new file with mode: 0644]
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml [new file with mode: 0644]
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml [new file with mode: 0644]
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml [new file with mode: 0644]
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml [new file with mode: 0644]
jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml [new file with mode: 0644]
jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml [new file with mode: 0644]
jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml [new file with mode: 0644]
jjb/integration/xtesting/integration-xtesting.yaml
jjb/lf-infra-releasedockerhub.yaml
jjb/logging-analytics/logging-analytics.yaml
jjb/modeling/modeling-modelspec.yaml [moved from jjb/clamp/dashboard/info-clamp-dashboard.yaml with 52% similarity]
jjb/multicloud/build-multicloud-azure-docker-image.sh [deleted file]
jjb/multicloud/multicloud-azure-java.yaml [deleted file]
jjb/multicloud/multicloud-azure-python.yaml [deleted file]
jjb/multicloud/multicloud-csit.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-framework-python.yaml
jjb/multicloud/multicloud-info.yaml [new file with mode: 0644]
jjb/multicloud/multicloud-k8s.yaml
jjb/multicloud/multicloud-openstack-fcaps-csit.yaml
jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
jjb/multicloud/multicloud-openstack-vmware-csit.yaml
jjb/music/build-music-distributed-kv-store-image.sh
jjb/music/music-distributed-kv-store-csit.yaml
jjb/music/music-distributed-kv-store.yaml
jjb/music/music-mdbc.yaml [deleted file]
jjb/music/music-prom.yaml [deleted file]
jjb/music/tag-music-distributed-kv-store-image-staging.sh [new file with mode: 0755]
jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml [new file with mode: 0644]
jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml [new file with mode: 0644]
jjb/oom-platform-cert-service/oom-platform-cert-service.yaml [new file with mode: 0644]
jjb/oom-platform-keycloak/oom-platform-keycloak.yaml [new file with mode: 0644]
jjb/oom-utils/oom-utils.yaml [new file with mode: 0644]
jjb/oom/offline-installer.yaml
jjb/oom/oom-consul.yaml [new file with mode: 0644]
jjb/oom/oom-helm-legacy.yaml [new file with mode: 0644]
jjb/oom/oom-helm-verify-helm2.yaml [new file with mode: 0644]
jjb/oom/oom-helm.yaml
jjb/oom/oom-image-verify.yaml [new file with mode: 0644]
jjb/oom/oom-main-linter.yaml [new file with mode: 0644]
jjb/oparent/oparent.yaml
jjb/optf/optf-cmso-csit.yaml
jjb/optf/optf-cmso.yaml
jjb/optf/optf-fgps.yaml [deleted file]
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-clamp.yaml [moved from jjb/clamp/clamp.yaml with 56% similarity]
jjb/policy/policy-common.yaml
jjb/policy/policy-csit-jobs.yaml [new file with mode: 0644]
jjb/policy/policy-csit.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-docker-base-common.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-gui.yaml
jjb/policy/policy-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
jjb/sdc/sdc-csit.yaml
jjb/sdc/sdc-dcae-d-ci.yaml [deleted file]
jjb/sdc/sdc-dcae-d-csit.yaml [deleted file]
jjb/sdc/sdc-dcae-d-dt-be-main.yaml [deleted file]
jjb/sdc/sdc-dcae-d-dt-be-property.yaml [deleted file]
jjb/sdc/sdc-dcae-d-dt.yaml [deleted file]
jjb/sdc/sdc-dcae-d-fe.yaml [deleted file]
jjb/sdc/sdc-dcae-d-tosca-lab.yaml [deleted file]
jjb/sdc/sdc-microservices.yaml [deleted file]
jjb/sdc/sdc-onap-ui-angular.yaml
jjb/sdc/sdc-onap-ui-common.yaml
jjb/sdc/sdc-onap-ui-react.yaml [deleted file]
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-helm-validator-csit.yaml [new file with mode: 0644]
jjb/sdc/sdc-sdc-helm-validator.yaml [moved from jjb/policy/policy-engine.yaml with 50% similarity]
jjb/sdc/sdc-sdc-pubsub.yaml
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 [deleted file]
jjb/so/so-adapters-so-cnf-adapter.yaml [moved from jjb/aai/aai-esr-server.yaml with 52% similarity]
jjb/so/so-adapters-so-etsi-sol003-adapter.yaml [new file with mode: 0644]
jjb/so/so-adapters-so-etsi-sol005-adapter.yaml [new file with mode: 0644]
jjb/so/so-adapters-so-nssmf-adapter.yaml [new file with mode: 0644]
jjb/so/so-adapters-so-oof-adapter.yaml [new file with mode: 0644]
jjb/so/so-csit.yaml
jjb/so/so-libs.yaml
jjb/so/so-so-admin-cockpit.yaml [new file with mode: 0644]
jjb/so/so-so-etsi-nfvo.yaml [moved from jjb/aai/aai-data-router.yaml with 55% similarity]
jjb/so/so.yaml
jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml
jjb/testsuite/testsuite-cds-mock-odl.yaml [new file with mode: 0644]
jjb/testsuite/testsuite-cds-mock-server.yaml [new file with mode: 0644]
jjb/testsuite/testsuite-cds-mock-ssh.yaml [new file with mode: 0644]
jjb/testsuite/testsuite-cds.yaml [new file with mode: 0644]
jjb/testsuite/testsuite-heatbridge.yaml
jjb/testsuite/testsuite-python-testing-utils.yaml
jjb/testsuite/testsuite.yaml
jjb/ubuntu-latest-nodejs.sh [new file with mode: 0644]
jjb/usecases/usecases-csit.yaml
jjb/usecaseui/usecase-ui-nlp.yaml [moved from jjb/music/music.yaml with 62% similarity]
jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
jjb/vid/vid-csit.yaml
jjb/vid/vid.yaml
jjb/vnfrqts/build-and-upload.yaml
jjb/vnfsdk/generate-dosc.sh [new file with mode: 0644]
jjb/vnfsdk/upload-artifact.sh [new file with mode: 0644]
jjb/vnfsdk/vnfsdk-marketplace-csit.yaml [new file with mode: 0644]
jjb/vnfsdk/vnfsdk-refrepo-csit.yaml [new file with mode: 0644]
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
packer/common-packer
packer/provision/helm.yaml
packer/provision/local-builder.yaml
packer/provision/local-docker.yaml
packer/templates/helm.json
packer/templates/memcached.json
packer/templates/redis.json
shell/helm-repo-init.sh [changed mode: 0644->0755]
shell/helm2-repo-init.sh [new file with mode: 0755]
shell/helm2-verify.sh [new file with mode: 0755]
shell/publish_helm_charts.sh

diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644 (file)
index 0000000..801bb85
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,65 @@
+---
+project: 'ci-management'
+project_creation_date: '2017-01-24'
+lifecycle_state: 'Incubation'
+project_category: ''
+project_lead: &onap_releng_ptl
+    name: 'Jessica Wagantall'
+    email: 'jwagantall@linuxfoundation.org'
+    id: 'jwagantall'
+    company: 'LF'
+    timezone: 'America/Los_Angeles'
+primary_contact: *onap_releng_ptl
+issue_tracking:
+    type: 'jira'
+    url: 'https://jira.onap.org/projects/CIMAN'
+    key: 'CIMAN'
+mailing_list:
+    type: 'groups.io'
+    url: 'lists.onap.org'
+    tag: '<[sub-project_name]>'
+realtime_discussion: ''
+meetings:
+    - type: 'zoom'
+      agenda: 'n/a'
+      url: 'n/a'
+      server: 'n/a'
+      channel: 'n/a'
+      repeats: 'n/a'
+      time: 'n/a'
+repositories:
+    - ci-management
+committers:
+    - <<: *onap_releng_ptl
+    - name: 'Bengt Thuree'
+      email: 'bthuree@linuxfoundation.org'
+      company: 'LF'
+      id: 'bthuree'
+      timezone: 'Australia/Melbourne'
+    - name: 'Andrew Grimberg'
+      email: 'agrimberg@linuxfoundation.org'
+      company: 'LF'
+      id: 'agrimberg'
+      timezone: 'America/Los_Angeles'
+    - name: 'Eric Ball'
+      email: 'eball@linuxfoundation.org'
+      company: 'LF'
+      id: 'eball'
+      timezone: 'America/Los_Angeles'
+    - name: 'Morgan Richomme'
+      email: 'morgan.richomme@orange.com'
+      company: 'orange'
+      id: 'mrichomme'
+      timezone: 'France/Paris'
+    - name: 'Bartek Grzybowski'
+      email: 'b.grzybowski@partner.samsung.com'
+      company: 'samsung'
+      id: 'bgrzybowski'
+      timezone: 'Poland/Warsaw'
+    - name: 'Lasse Kaihlavirta'
+      email: 'l.kaihlavirt@partner.samsung.com'
+      company: 'samsung'
+      id: 'kaihlavi'
+      timezone: 'Europe/Helsinki'
+tsc:
+    approval: 'https://lists.onap.org/pipermail/onap-tsc'
index 1ec8470..8904105 100644 (file)
@@ -41,7 +41,7 @@ Once you successfully clone the repository, next step is to install JJB
 
 ```
 cd ci-management
-sudo apt-get install python-virtualenv
+pip install virtualenv
 virtualenv onap_sandbox
 source onap_sandbox/bin/activate
 pip install jenkins-job-builder
@@ -53,6 +53,7 @@ jenkins-jobs test --recursive jjb/
 
 Backup the jenkins.ini.example to jenkins.ini
 
+`mkdir -p ~/.config/jenkins_jobs`
 `cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini`
 
 After copying the jenkins.ini.example, modify `jenkins.ini` with your
@@ -72,9 +73,10 @@ password= <Refer below steps to get API token>
 url=https://jenkins.onap.org/sandbox
 query_plugins_info=False
 ```
-### How to retrieve API token?
+### How to retrieve username and API token?
 Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user
-page by clicking on your username. Click **Configure** and then click **Add new Token**.
+page by clicking on your username - `Jenkins User ID` on this page is your Jenkins
+Sandbox username. Click **Configure** and then click **Add new Token**.
 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.
 
@@ -106,18 +108,14 @@ The output directory will contain files with the XML configurations.
 
 ## To Update a job:
 
-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.
+Ensure you’ve configured your `jenkins_jobs.ini` and verified the changes by
+outputting valid XML descriptions of the relevant Jenkins jobs. Upon successful
+verification, execute the following command to update the job to the Jenkins sandbox.
 
 `jenkins-jobs update jjb/ <job-name>`
 
 **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 8914478..5beb455 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 89144786dbd6e556bc251aeff6b397d6e28eddeb
+Subproject commit 5beb45586451cb772982de881cd09fd97360be87
index a5b4bd9..4ea16cc 100644 (file)
@@ -1,3 +1,4 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
 LABELS=centos7-builder-2c-1g
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=v3-standard-2
+VOLUME_SIZE=20
index 209cb0e..27f0cbe 100644 (file)
@@ -1,3 +1,4 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
 LABELS=centos7-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
+VOLUME_SIZE=20
index edbfd34..f306339 100644 (file)
@@ -1,3 +1,4 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324
 LABELS=centos7-docker-8c-8g
-HARDWARE_ID=v2-highcpu-8
+HARDWARE_ID=v3-standard-8
+VOLUME_SIZE=20
index 791a9b6..8bb7c03 100644 (file)
@@ -1,3 +1,4 @@
-IMAGE_NAME=CentOS 7 - redis -  - 70180101-1009
+IMAGE_NAME=CentOS 7 - redis -  - 50880808-8011
 LABELS=centos7-redis-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
+VOLUME_SIZE=50
index 2b0ca12..5695a77 100644 (file)
@@ -5,7 +5,8 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180601-1002
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235
+VOLUME_SIZE=20
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf
 USER_DATA_ID=jenkins-init-script
index 37a375a..9f9d867 100644 (file)
@@ -1,6 +1,7 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200220-113128.675
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125
 LABELS=queue-docker-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
 INSTANCE_CAP=1
 NUM_EXECUTORS=4
 RETENTION_TIME=4320
+VOLUME_SIZE=20
index 7b9af8f..f36cf96 100644 (file)
@@ -1,3 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200219-191621.319
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210317-233509.164
 LABELS=ubuntu1804-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
+VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
new file mode 100644 (file)
index 0000000..adc76ac
--- /dev/null
@@ -0,0 +1,4 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605
+LABELS=ubuntu1804-docker-8c-16g
+HARDWARE_ID=v3-standard-16
+VOLUME_SIZE=40
index c4d05ac..efb5787 100644 (file)
@@ -1,3 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605
 LABELS=ubuntu1804-docker-8c-8g
-HARDWARE_ID=v2-highcpu-8
+HARDWARE_ID=v3-standard-8
+VOLUME_SIZE=20
index 5e19001..cd44cbc 100644 (file)
@@ -1,3 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711
 LABELS=ubuntu1804-docker-arm64-4c-2g
 HARDWARE_ID=lf-standard-2
+VOLUME_SIZE=20
index 5ece275..47fa5e7 100644 (file)
@@ -1,3 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20210318-025845.711
 LABELS=ubuntu1804-docker-arm64-4c-4g
 HARDWARE_ID=lf-standard-4
+VOLUME_SIZE=20
index da8a241..97fb2ca 100644 (file)
@@ -1,3 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210317-220033.605
 LABELS=ubuntu1804-docker-v1-8c-8g
 HARDWARE_ID=v1-standard-8
+VOLUME_SIZE=50
index d69e209..26892ac 100644 (file)
@@ -1,3 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20200506-233718.921
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20210318-054700.866
 LABELS=ubuntu1804-helm-2c-1g
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=v3-standard-2
+VOLUME_SIZE=50
index 6d2f06e..5610c6a 100644 (file)
@@ -1,3 +1,4 @@
-IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120380303-3010
+IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120780707-7003
 LABELS=ubuntu1804-memcached-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
+VOLUME_SIZE=50
index 3c83f0a..9f7a172 100644 (file)
@@ -17,7 +17,7 @@ RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
 S3_BUCKET=
 SIGUL_BRIDGE_IP=10.30.104.3
-SIGUL_KEY=onap-release-2018
+SIGUL_KEY=onap-release-2020
 SILO=production
 SONAR_URL=https://sonar.onap.org
 MASTER_RTD_PROJECT=doc
index 75ce593..7247094 100644 (file)
@@ -17,7 +17,7 @@ RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
 S3_BUCKET=
 SIGUL_BRIDGE_IP=10.30.104.3
-SIGUL_KEY=onap-test
+SIGUL_KEY=onap-sandbox
 SILO=sandbox
 SONAR_URL=https://sonar.onap.org
 MASTER_RTD_PROJECT=doc-test
index 64b3bc3..d8417ba 100644 (file)
@@ -6,6 +6,8 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{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-docker-8c-8g
index 990545b..4876ba6 100644 (file)
@@ -5,9 +5,8 @@
           - "{project-name}-{stream}-verify-csit-{functionality}"
           - "{project-name}-{stream}-csit-{functionality}"
       project-name: "aaf"
+      disabled: true
       stream:
-          - "master":
-                branch: "master"
           -  "frankfurt":
                 branch: "frankfurt"
       functionality:
index 0fb6892..8aa7518 100644 (file)
@@ -4,9 +4,6 @@
     name: aaf-certservice
     project-name: 'aaf-certservice'
     stream:
-        -   'master':
-                branch: 'master'
-                java-version: openjdk11
         -   'frankfurt':
                 branch: 'frankfurt'
                 java-version: openjdk11
@@ -51,7 +48,7 @@
     build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/certservice'
     project-name: 'aaf-certservice'
-    branch: 'master'
+    branch: 'frankfurt'
     mvn-settings: 'aaf-certservice-settings'
     mvn-pom: 'certService/pom.xml'
     mvn-goals: 'clean install'
@@ -64,4 +61,4 @@
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: aaf/certservice
-    branch: master
+    branch: frankfurt
diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml
deleted file mode 100644 (file)
index 8d65de8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
-- project:
-    name: aaf-luaplugin-clm
-    project-name: 'aaf-luaplugin'
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aaf/luaplugin'
-    branch: 'master'
-    mvn-settings: 'aaf-luaplugin-settings'
-
-- project:
-    name: aaf-luaplugin-info
-    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.yaml b/jjb/aaf/aaf-sms.yaml
deleted file mode 100644 (file)
index 5997543..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
-- project:
-    name: aaf-sms
-    project-name: 'aaf-sms'
-    subproject: 'aaf-sms-client'
-    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:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-pom: 'sms-client/java/pom.xml'
-          mvn-params: '-f sms-client/java/pom.xml'
-      - '{project-name}-{stream}-docker-golang-shell-daily':
-          script:
-            !include-raw-escape: 'build-sms-docker-image.sh'
-    project: 'aaf/sms'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'aaf-sms-settings'
-    files: '**'
-    archive-artifacts: ''
-    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
diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
deleted file mode 100644 (file)
index b3a45fb..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
-- project:
-    name: aaf-sshsm
-    project-name: 'aaf-sshsm'
-    build-timeout: 120
-    project: 'aaf/sshsm'
-    jobs:
-      - gerrit-verify-c:
-         script:
-            !include-raw-escape: 'build-sshsm.sh'
-      - gerrit-docker-c-shell-daily:
-         script:
-            !include-raw-escape: 'build-sshsm-docker-images.sh'
-    stream:
-      - 'master':
-          branch: 'master'
-
-    mvn-settings: 'aaf-sshsm-settings'
-    files: '**'
-    archive-artifacts: ''
-    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 4a68af1..f17d6a2 100644 (file)
@@ -22,8 +22,8 @@
       - 'master':
           branch: 'master'
           mvn-params: '-P spring-boot-2-1'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
           mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
@@ -91,7 +91,7 @@
       - 'master':
           branch: 'master'
           distro: 'alpine'
-          mvn-params: '-P spring-boot-2-1'
+          mvn-params: '-P spring-boot-2-1,docker'
     docker_name: 'onap/aai-common-{distro}'
     docker_build_args: '-f ./Dockerfile.{distro}'
     docker_root: '$WORKSPACE/Dockerfiles/aai-common/'
index 13799a5..158df9b 100644 (file)
@@ -9,8 +9,9 @@
     name: aai-babel
     project-name: 'aai-babel'
     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
           build-node: centos7-docker-8c-8g
     project: 'aai/babel'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-babel-sonar
@@ -50,6 +55,8 @@
     mvn-settings: 'aai-babel-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 - project:
     name: aai-babel-clm
@@ -63,6 +70,8 @@
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 
 - project:
index ec4b2bd..ca9d19d 100644 (file)
@@ -20,8 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
     files: '**'
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
deleted file mode 100644 (file)
index ae853d5..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
-    name: aai-esr-gui-project-view
-    project-name: aai-esr-gui
-    views:
-      - project-view
-
-- project:
-    name: aai-esr-gui
-    project-name: 'aai-esr-gui'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - 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'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'aai-esr-gui-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: aai-esr-gui-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/esr-gui'
-    project-name: 'aai-esr-gui'
-    stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'aai-esr-gui-settings'
-
-- project:
-    name: aai-esr-gui-info
-    project-name: aai-esr-gui
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/esr-gui
-    branch: master
index 08ccd0e..039317c 100644 (file)
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/event-client'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-event-client-settings'
index 1278ed6..7a7b9cf 100644 (file)
@@ -26,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
     files: '**'
index c1cdbe4..a4fbaea 100644 (file)
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/logging-service'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
index 84e2a3e..0bb473b 100644 (file)
@@ -9,8 +9,9 @@
     name: aai-model-loader-master
     project-name: 'aai-model-loader'
     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
           build-node: centos7-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
+    mvn-version: 'mvn36'
+    java-version: openjdk11
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-model-loader-sonar
@@ -50,6 +55,8 @@
     mvn-settings: 'aai-model-loader-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-model-loader-clm
@@ -62,6 +69,8 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-model-loader-info
@@ -83,3 +92,5 @@
     mvn-clean-install: true
     project: 'aai/model-loader'
     branch: master
+    java-version: openjdk11
+    mvn-version: 'mvn36'
index 4ea6eb8..e60cd01 100644 (file)
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: '**'
     stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
 
     mvn-settings: 'aai-oom-settings'
     files: '**'
         #!/bin/bash
         set -e -o pipefail
         cd kubernetes/
-        make all
+        make HELM_BIN=helm3.3 all
     build_script: |
         #!/bin/bash
         cd kubernetes/
-        make common
-        make {helm-module}
+        make HELM_BIN=helm3.3 common
+        make HELM_BIN=helm3.3 {helm-module}
     oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
index fee95b4..77d07a3 100644 (file)
@@ -9,9 +9,12 @@
     name: aai-resources
     project-name: 'aai-resources'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-verify-java':
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          mvn-params: '-DskipTests'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
@@ -26,8 +29,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -44,7 +47,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'aai/resources'
     project-name: 'aai-resources'
     branch: 'master'
index c641d98..76be4bf 100644 (file)
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/rest-client'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
index 316c5dd..fddff15 100644 (file)
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/router-core'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-router-core-settings'
index 24c640e..bce2867 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'aai-schema-service-settings'
-    mvn-version: 'mvn35'
+    mvn-version: 'mvn36'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
 
 - project:
     name: aai-schema-service-sonar
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
     branch: 'master'
     mvn-settings: 'aai-schema-service-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
+    mvn-version: 'mvn36'
 
 - project:
     name: aai-schema-service-clm
     nexus-iq-namespace: 'onap-'
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
+    java-version: openjdk11
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-schema-service-settings'
-    mvn-version: 'mvn35'
+    mvn-version: 'mvn36'
 
 - project:
     name: aai-schema-service-info
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
deleted file mode 100644 (file)
index 1d68ea5..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
----
-- project:
-    name: aai-search-data-service-project-view
-    project-name: aai-search-data-service
-    views:
-      - project-view
-
-- project:
-    name: aai-search-data-service-master
-    project-name: 'aai-search-data-service'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - 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:
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-search-data-service-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: aai-search-data-service-searchguard
-    project-name: 'aai-search-data-service-searchguard'
-    jobs:
-      - 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:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-search-data-service-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    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: ubuntu1804-builder-4c-4g
-    project: 'aai/search-data-service'
-    project-name: 'aai-search-data-service'
-    branch: 'master'
-    mvn-settings: 'aai-search-data-service-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-search-data-service-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/search-data-service'
-    project-name: 'aai-search-data-service'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-search-data-service-settings'
-
-- project:
-    name: aai-search-data-service-info
-    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 49c9941..f1f7772 100644 (file)
@@ -9,8 +9,9 @@
     name: aai-sparky-be-master
     project-name: 'aai-sparky-be'
     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
           build-node: centos7-docker-8c-8g
     project: 'aai/sparky-be'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
     files: '**'
     archive-artifacts: ''
+    mvn-version: 'mvn36'
+    java-version: openjdk11
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-sparky-be-sonar
@@ -49,6 +54,8 @@
     mvn-settings: 'aai-sparky-be-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-sparky-be-clm
@@ -61,6 +68,8 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-sparky-be-info
index 4ac85e0..03fd1fa 100644 (file)
@@ -13,8 +13,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/sparky-fe'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-fe-settings'
index b6178bb..249c46b 100644 (file)
@@ -9,9 +9,12 @@
     name: aai-traversal-master
     project-name: 'aai-traversal'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-verify-java':
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          mvn-params: '-DskipTests'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
@@ -26,8 +29,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -44,7 +47,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'aai/traversal'
     project-name: 'aai-traversal'
     branch: 'master'
index 2fab17b..3f40d31 100644 (file)
@@ -24,8 +24,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/validation'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-validation-settings'
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
deleted file mode 100644 (file)
index 26764c6..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: appc-cdt
-    project-name: 'appc-cdt'
-    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}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'appc/cdt'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'appc-cdt-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: appc-cdt-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'appc/cdt'
-    project-name: 'appc-cdt'
-    branch: 'master'
-    mvn-settings: 'appc-cdt-settings'
-
-
-- project:
-    name: appc-cdt-info
-    project-name: appc-cdt
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: appc/cdt
-    branch: master
index 11bc579..0b3324a 100644 (file)
@@ -5,11 +5,12 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'appc'
+    disabled: true
     recipients: 'tc012c@att.com'
     stream:
       - 'master':
           branch: 'master'
     functionality:
       - 'healthcheck':
-          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
+          trigger_jobs:
     robot-options: ''
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
deleted file mode 100644 (file)
index edffd6b..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
----
-
-- project:
-    name: appc-deployment
-    project-name: 'appc-deployment'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'appc/deployment'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'appc-deployment-settings'
-    maven-version: "mvn35"
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: appc-deployment-docker
-    project-name: 'appc-deployment'
-    jobs:
-      - 'docker-java-daily':
-          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'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'appc-deployment-settings'
-    maven-version: "mvn35"
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1804-docker-8c-8g
-
-#- project:
-#    name: appc-deployment-arm64-docker
-#    project-name: 'appc-deployment-arm64'
-#    jobs:
-#      - 'docker-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#      - 'docker-version-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'appc/deployment'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'appc-deployment-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    docker-pom: 'pom.xml'
-#    mvn-profile: docker
-#    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
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
deleted file mode 100644 (file)
index c717284..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: appc-project-view
-    project-name: appc
-    views:
-      - project-view
-
-- project:
-    name: appc-parent
-    project-name: 'appc-parent'
-    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}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'appc/parent'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'appc-parent-settings'
-    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 c6c3f56..8b267fd 100644 (file)
@@ -21,7 +21,7 @@
           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
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -40,7 +44,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
 #- project:
     project-name: ccsdk-apps
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index fcb1289..80ec2bd 100644 (file)
@@ -1,16 +1,42 @@
 ---
 - project:
-    name: ccsdk-csit
+    name: ccsdk-distribution-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'ccsdk'
+      - '{project-name}-review-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          maven-versions-plugin: true
+      - '{project-name}-merge-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          maven-versions-plugin: true
+    project-name: 'ccsdk-distribution'
     recipients: 'dtimoney@att.com'
+    # project name in gerrit
+    project: 'ccsdk/distribution'
     stream:
       - 'master':
           branch: 'master'
-    functionality:
-      - 'healthcheck':
-          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
+    mvn-settings: 'ccsdk-distribution-settings'
+    robot-options: ''
+    branch: 'master'
+
+- project:
+    name: ccsdk-oran-csit
+    jobs:
+      - '{project-name}-review-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+      - '{project-name}-merge-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+    project-name: 'ccsdk-oran'
+    recipients: 'bjorn.magnusson@est.tech martin.c.yan@est.tech'
+    # project name in gerrit
+    project: 'ccsdk/oran'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    mvn-settings: 'ccsdk-oran-settings'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
new file mode 100644 (file)
index 0000000..863dedf
--- /dev/null
@@ -0,0 +1,89 @@
+---
+- project:
+    name: ccsdk-oran
+    project-name: 'ccsdk-oran'
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
+          sign-artifacts: true
+          mvn-opts: '-Ddocker.skip=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-versions-plugin: true
+          cron: '@daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    project: 'ccsdk/oran'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-oran-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: ubuntu1804-docker-8c-8g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+
+- project:
+    name: ccsdk-oran-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'ccsdk/oran'
+    project-name: 'ccsdk-oran'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-oran-settings'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: ccsdk-oran-info
+    project: ccsdk/oran
+    project-name: ccsdk-oran
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: ccsdk-oran-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: 'ccsdk/oran'
+    project-name: 'ccsdk-oran'
+    branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-oran-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
index beb0c17..becb461 100644 (file)
@@ -1,22 +1,22 @@
 ---
 - project:
-    name: ccsdk-cds
+    name: ccsdk-cds-java11
     project-name: 'ccsdk-cds'
     jobs:
-      - gerrit-maven-verify
+      - gerrit-maven-verify:
+          mvn-params: '-Ddocker.skip.push=true -P docker'
       - gerrit-maven-merge:
           cron: '@daily'
+          mvn-params: '-Ddocker.skip.push=true -P docker'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
-          maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=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':
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    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
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+
+- project:
+    name: ccsdk-cds-java8
+    project-name: 'ccsdk-cds'
+    jobs:
+      - gerrit-maven-verify:
+          mvn-params: '-Ddocker.skip.push=true -P docker'
+      - gerrit-maven-merge:
+          cron: '@daily'
+          mvn-params: '-Ddocker.skip.push=true -P docker'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
+          sign-artifacts: true
+          mvn-params: '-Dmaven.test.skip=true'
+          cron: ''
+      - gerrit-maven-docker-stage:
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-versions-plugin: true
+          cron: '@daily'
+
+    project: 'ccsdk/cds'
+    stream:
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk8
+    mvn-version: 'mvn36'
     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
@@ -38,8 +79,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-cds-info
     project-name: ccsdk-cds
     project-name: ccsdk-cds
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 353ee2d..cc87b88 100644 (file)
@@ -16,7 +16,6 @@
           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'
 
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -50,6 +53,8 @@
     project: 'ccsdk/dashboard'
     project-name: 'ccsdk-dashboard'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     build-node: centos7-redis-4c-4g
 
@@ -81,6 +90,8 @@
     project-name: ccsdk-dashboard
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 47e616b..a071890 100644 (file)
           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'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: ubuntu1804-docker-8c-8g
 
@@ -89,6 +94,8 @@
     jobs:
       - gerrit-whitesource-scan:
           java-opts: '-Xmx2048m'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 17dd0b4..dafafb3 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -27,7 +31,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     project: 'ccsdk/features'
     project-name: 'ccsdk-features'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-features-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -84,6 +91,8 @@
     project-name: ccsdk-features
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 0d3a3ee..b9de56d 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
@@ -29,7 +33,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-parent-clm
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-parent-info
     project-name: ccsdk-parent
@@ -62,6 +65,8 @@
     project-name: ccsdk-parent
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
deleted file mode 100644 (file)
index ad92332..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
----
-- project:
-    name: ccsdk-sli-adaptors
-    project-name: 'ccsdk-sli-adaptors'
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-          cron: '@daily'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          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
-
-    project: 'ccsdk/sli/adaptors'
-    stream:
-      - 'master':
-          branch: 'master'
-      - '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
-    # in the job
-    maven-deploy-properties: |
-      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-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: 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
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/sli/adaptors'
-    project-name: 'ccsdk-sli-adaptors'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'ccsdk-sli-adaptors-settings'
-    maven-version: "mvn35"
-    build-node: ubuntu1804-builder-4c-4g
-
-
-- project:
-    name: ccsdk-sli-adaptors-info
-    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
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
deleted file mode 100644 (file)
index d130cb1..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
----
-- project:
-    name: ccsdk-sli-northbound
-    project-name: 'ccsdk-sli-northbound'
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-          cron: '@daily'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          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'
-      - '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
-    # in the job
-    maven-deploy-properties: |
-      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-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: 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
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/sli/northbound'
-    project-name: 'ccsdk-sli-northbound'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'ccsdk-sli-northbound-settings'
-    maven-version: "mvn35"
-    build-node: ubuntu1804-builder-4c-4g
-
-
-- project:
-    name: ccsdk-sli-northbound-info
-    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
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
deleted file mode 100644 (file)
index 4f99ad8..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
----
-- project:
-    name: ccsdk-sli-plugins
-    project-name: 'ccsdk-sli-plugins'
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-          cron: '@daily'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          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
-
-    project: 'ccsdk/sli/plugins'
-    stream:
-      - 'master':
-          branch: 'master'
-      - '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
-    # in the job
-    maven-deploy-properties: |
-      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: 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
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/sli/plugins'
-    project-name: 'ccsdk-sli-plugins'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'ccsdk-sli-plugins-settings'
-    maven-version: "mvn35"
-
-
-- project:
-    name: ccsdk-sli-plugins-info
-    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
similarity index 63%
rename from jjb/ccsdk/sli-core.yaml
rename to jjb/ccsdk/sli.yaml
index 0fc6d6c..299a415 100644 (file)
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: ccsdk-sli-core
-    project-name: 'ccsdk-sli-core'
+    name: ccsdk-sli
+    project-name: 'ccsdk-sli'
     jobs:
       - gerrit-maven-verify
       - gerrit-maven-merge:
           build-node: centos7-builder-4c-4g
           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
 
-    project: 'ccsdk/sli/core'
+    project: 'ccsdk/sli'
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'ccsdk-sli-core-settings'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-sli-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: ''
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
 - project:
-    name: ccsdk-sli-core-sonar
+    name: ccsdk-sli-sonar
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1804-builder-4c-4g
-    project: 'ccsdk/sli/core'
-    project-name: 'ccsdk-sli-core'
+    project: 'ccsdk/sli'
+    project-name: 'ccsdk-sli'
     branch: 'master'
-    mvn-settings: 'ccsdk-sli-core-settings'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-sli-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
 
 - project:
-    name: ccsdk-sli-core-clm
+    name: ccsdk-sli-clm
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/sli/core'
-    project-name: 'ccsdk-sli-core'
+    project: 'ccsdk/sli'
+    project-name: 'ccsdk-sli'
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'ccsdk-sli-core-settings'
-    maven-version: "mvn35"
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-sli-settings'
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
-    name: ccsdk-sli-core-info
-    project-name: ccsdk-sli-core
+    name: ccsdk-sli-info
+    project-name: ccsdk-sli
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
-    project: ccsdk/sli/core
+    project: ccsdk/sli
     branch: master
 
 - project:
-    name: ccsdk-sli-core-whitesource
-    project-name: ccsdk-sli-core
+    name: ccsdk-sli-whitesource
+    project-name: ccsdk-sli
     jobs:
       - gerrit-whitesource-scan
-    mvn-settings: 'ccsdk-sli-core-settings'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-sli-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
-    project: ccsdk/sli/core
+    project: ccsdk/sli
     branch: master
index 3486a30..52ab57d 100644 (file)
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     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
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
 
-
 - project:
     name: ccsdk-utils-info
     project-name: ccsdk-utils
@@ -55,6 +58,8 @@
     project-name: ccsdk-utils
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
index 79b4853..d05996f 100644 (file)
@@ -3,6 +3,7 @@
     name: packer-builder-jobs
     jobs:
       - gerrit-packer-merge
+      - gerrit-packer-verify-build
 
     project: ci-management
     project-name: ci-management
       - centos-7
       - ubuntu-18.04
     templates: builder
+    update-cloud-image: true
 
 - project:
     name: packer-docker-jobs
     jobs:
       - gerrit-packer-merge
+      - gerrit-packer-verify-build
 
     project: ci-management
     project-name: ci-management
       - ubuntu-18.04-arm64
       - ubuntu-18.04
     templates: docker
+    update-cloud-image: true
 
 - project:
     name: packer-memcached-jobs
     jobs:
       - gerrit-packer-merge
+      - gerrit-packer-verify-build
 
     project: ci-management
     project-name: ci-management
     platforms:
       - ubuntu-18.04
     templates: memcached
+    update-cloud-image: true
 
 - project:
     name: packer-redis-jobs
     jobs:
       - gerrit-packer-merge
+      - gerrit-packer-verify-build
 
     project: ci-management
     project-name: ci-management
     platforms:
       - centos-7
     templates: redis
+    update-cloud-image: true
 
 - project:
     name: packer-helm-jobs
     jobs:
       - gerrit-packer-merge
+      - gerrit-packer-verify-build
 
     project: ci-management
     project-name: ci-management
@@ -84,3 +93,4 @@
     platforms:
       - ubuntu-18.04
     templates: helm
+    update-cloud-image: true
index 8b4d6e5..75a6a5a 100644 (file)
@@ -5,6 +5,15 @@
     views:
       - project-view
 
+- project:
+    name: ci-management-info
+    project-name: ci-management
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ci-management
+    branch: master
+
 - project:
     name: ci-management-jobs
     jobs:
@@ -17,7 +26,7 @@
     branch: 'master'
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
-    jjb-version: 2.9.1
+    jjb-version: 3.5.0
     # configure the gerrit-jjb-verify job
     build-node-label-check: true
     build-node-label-list: ""
         https://jenkins.onap.org
         https://jenkins.onap.org/sandbox
     openstack-cloud: vex
+
+- project:
+    name: openstack-update-cloud-images
+    jobs:
+      - gerrit-openstack-update-cloud-image
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: '**/*.log'
+    jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    build-node: centos7-builder-2c-1g
+    # update-cloud-image: true
+    build-timeout: 10
+
+    gerrit-user: "jenkins-$SILO"
+    gerrit-host: "gerrit.onap.org"
+    gerrit-topic: "update-cloud-image"
+    reviewers-email: "onap-jobbuilder@jenkins.onap.org"
diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml
deleted file mode 100644 (file)
index 61f7bd8..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- project:
-    name: clamp-csit
-    jobs:
-      - '{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'
-    functionality:
-      - 'APIs':
-          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
-      - 'UIs':
-          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
-    robot-options: ''
diff --git a/jjb/clamp/dashboard/clamp-dashboard.yaml b/jjb/clamp/dashboard/clamp-dashboard.yaml
deleted file mode 100644 (file)
index ce70c19..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- 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/ui/info-clamp-ui.yaml b/jjb/clamp/ui/info-clamp-ui.yaml
deleted file mode 100644 (file)
index c532356..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- 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 4d1f3de..3f182ec 100644 (file)
@@ -7,6 +7,7 @@
 
 - project:
     name: cli
+    java-version: openjdk11
     project-name: 'cli'
     jobs:
       - '{project-name}-{stream}-verify-java'
           build-node: ubuntu1804-docker-8c-8g
     project: 'cli'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+                branch: 'master'
+                java-version: openjdk11
+        - 'frankfurt':
+                branch: 'frankfurt'
+                java-version: openjdk8
     mvn-settings: 'cli-settings'
     files: '**'
     archive-artifacts: ''
@@ -58,6 +63,7 @@
 #
 - project:
     name: cli-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -76,6 +82,7 @@
 
 - project:
     name: cli-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml
new file mode 100644 (file)
index 0000000..fd3aae0
--- /dev/null
@@ -0,0 +1,82 @@
+---
+- project:
+    name: cps-tbdmt-project-view
+    project-name: cps-cps-tbdmt
+    views:
+      - project-view
+
+- project:
+    name: cps-tbdmt-info
+    project: cps/cps-tbdmt
+    project-name: cps-cps-tbdmt
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+      name: cps-tbdmt-clm
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: 'onap-'
+      project: cps/cps-tbdmt
+      project-name: cps-cps-tbdmt
+      branch: 'master'
+      mvn-settings: 'cps-cps-tbdmt-settings'
+      build-node: centos7-docker-8c-8g
+
+- project:
+      name: cps-tbdmt
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      project-name: cps-cps-tbdmt
+      project: cps/cps-tbdmt
+      mvn-snapshot-id: 'ecomp-snapshots'
+      nexus-snapshot-repo: 'snapshots'
+      jobs:
+          - gerrit-maven-verify:
+                mvn-goals: 'clean install'
+          - gerrit-maven-merge
+          - gerrit-maven-stage:
+                sign-artifacts: true
+                build-node: centos7-docker-8c-8g
+                maven-versions-plugin: true
+          - gerrit-maven-docker-stage:
+                build-node: centos7-docker-8c-8g
+                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
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'cps-cps-tbdmt-settings'
+      files: '**'
+      archive-artifacts: ''
+      build-node: centos7-docker-8c-8g
+
+- project:
+      name: cps-tbdmt-sonar
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      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-docker-8c-8g
+      project: cps/cps-tbdmt
+      project-name: cps-cps-tbdmt
+      branch: 'master'
+      mvn-settings: 'cps-cps-tbdmt-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
new file mode 100644 (file)
index 0000000..129e299
--- /dev/null
@@ -0,0 +1,95 @@
+---
+- project:
+    name: cps-cps-temporal-project-view
+    project-name: cps-cps-temporal
+    views:
+      - project-view
+
+- project:
+    name: cps-cps-temporal-info
+    project: cps/cps-temporal
+    project-name: cps-cps-temporal
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: cps-cps-temporal
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    project-name: cps-cps-temporal
+    project: cps/cps-temporal
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-merge
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: -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
+    stream:
+      - 'master':
+          branch: master
+    mvn-settings: cps-cps-temporal-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: centos7-docker-8c-8g
+
+- project:
+    name: cps-cps-temporal-clm
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: onap-
+    project: cps/cps-temporal
+    project-name: cps-cps-temporal
+    branch: master
+    mvn-settings: cps-cps-temporal-settings
+    build-node: centos7-docker-8c-8g
+
+- project:
+    name: cps-cps-temporal-sonar
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    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-docker-8c-8g
+    project: cps/cps-temporal
+    project-name: cps-cps-temporal
+    branch: master
+    mvn-settings: cps-cps-temporal-settings
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: cps-cps-temporal-whitesource
+    project-name: cps-cps-temporal
+    jobs:
+      - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: mvn36
+    mvn-settings: cps-cps-temporal-settings
+    wss-product-name: cps-cps-temporal
+    mvn-clean-install: true
+    project: cps/cps-temporal
+    branch: master
+    build-node: centos7-docker-8c-8g
diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
new file mode 100644 (file)
index 0000000..4c8a981
--- /dev/null
@@ -0,0 +1,22 @@
+---
+- project:
+      name: cps-csit
+      jobs:
+          - '{project-name}-review-verification-maven-{stream}':
+                mvn-goals: clean install
+                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
+          - '{project-name}-merge-verification-maven-{stream}':
+                mvn-goals: clean install
+                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
+      project-name: 'cps'
+      recipients: 'toine.siebelink@est.tech'
+      # project name in gerrit
+      project: 'cps'
+      stream:
+          - 'master':
+                branch: 'master'
+          - 'honolulu':
+                branch: 'honolulu'
+      mvn-settings: 'cps-settings'
+      robot-options: ''
+      branch: 'master'
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
new file mode 100644 (file)
index 0000000..cecfb79
--- /dev/null
@@ -0,0 +1,97 @@
+---
+- project:
+    name: cps-project-view
+    project-name: cps
+    views:
+      - project-view
+
+- project:
+    name: cps-info
+    project: cps
+    project-name: cps
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+      name: cps-clm
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: 'onap-'
+      project: 'cps'
+      project-name: 'cps'
+      branch: 'master'
+      mvn-settings: 'cps-settings'
+      build-node: centos7-docker-8c-8g
+
+- project:
+    name: cps
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    project-name: 'cps'
+    project: 'cps'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: "-P cps-ncmp-docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P cps-ncmp-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
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+            branch: 'honolulu'
+    mvn-settings: 'cps-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: centos7-docker-8c-8g
+
+- project:
+    name: cps-sonar
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    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-docker-8c-8g
+    project: 'cps'
+    project-name: 'cps'
+    branch: 'master'
+    mvn-settings: 'cps-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: cps-whitesource
+    project-name: cps
+    jobs:
+      - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'cps-settings'
+    wss-product-name: cps
+    mvn-clean-install: true
+    project: cps
+    branch: master
+    build-node: centos7-docker-8c-8g
index 6d3327f..f82be7b 100644 (file)
@@ -6,9 +6,11 @@
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/analytics/tca-gen2'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
deleted file mode 100644 (file)
index e0e4c05..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: dcaegen2-analytics-tca
-
-    # job template iterators
-    project-name: 'dcaegen2-analytics-tca'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    # apply to all jobs
-    project: 'dcaegen2/analytics/tca'
-    mvn-settings: 'dcaegen2-analytics-tca-settings'
-    files: '**'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-    jobs:
-      - '{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: ubuntu1804-builder-4c-4g
-    project: 'dcaegen2/analytics/tca'
-    project-name: 'dcaegen2-analytics-tca'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-analytics-tca-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-analytics-tca-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'dcaegen2/analytics/tca'
-    project-name: 'dcaegen2-analytics-tca'
-    branch: 'master'
-    build-node: ubuntu1804-builder-4c-4g
-    mvn-settings: 'dcaegen2-analytics-tca-settings'
-
-- project:
-    name: dcaegen2-analytics-tca-info
-    project-name: dcaegen2-analytics-tca
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/analytics/tca
-    branch: master
index 47c31a6..54f54db 100644 (file)
@@ -11,9 +11,7 @@
     functionality:
       - 'ManagementInterface-suite':
           trigger_jobs:
-           - '{project-name}-{stream}-docker-java-shell-daily'
       - 'Functional-suite':
           trigger_jobs:
-           - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
     branch: 'master'
index 3f4f911..d0ef104 100644 (file)
@@ -6,8 +6,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
@@ -47,6 +50,7 @@
     project: 'dcaegen2/collectors/datafile'
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -60,6 +64,7 @@
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
 
 - project:
index 3ab5a74..db6d27d 100644 (file)
@@ -6,11 +6,12 @@
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
-          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     # apply to all jobs
+    java-version: openjdk11
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
     files: '**'
index 7c72a16..141d09b 100644 (file)
@@ -2,6 +2,7 @@
 - project:
     name: dcaegen2-collectors-restconf
     project-name: 'dcaegen2-collectors-restconf'
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     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
@@ -35,6 +38,7 @@
 
 - project:
     name: dcaegen2-collectors-restconf-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -53,6 +57,7 @@
 
 - project:
     name: dcaegen2-collectors-restconf-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
@@ -65,6 +70,7 @@
 - project:
     name: dcaegen2-collectors-restconf-info
     project-name: dcaegen2-collectors-restconf
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
index c2d604a..a29412d 100644 (file)
@@ -2,28 +2,35 @@
 - project:
     name: dcaegen2-collectors-snmptrap
     project-name: 'dcaegen2-collectors-snmptrap'
-    jobs:
-      - '{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'
+    python-version: python3
+    tox-dir: '.'
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    build-node: ubuntu1804-docker-8c-8g
     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
-    # correctly defined in the job
+    jobs:
+      - '{project-name}-python-jobs'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    archive-artifacts: ''
+    container-tag-method: latest
+    nexus-iq-namespace: 'onap-'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '.*'
     maven-deploy-properties: |
       deployAtEnd=true
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+
 
 - project:
     name: dcaegen2-collectors-snmptrap-sonar
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- project:
-    name: dcaegen2-collectors-snmptrap-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/collectors/snmptrap
-    build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-collectors-snmptrap'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
-
 - project:
     name: dcaegen2-collectors-snmptrap-info
     project-name: dcaegen2-collectors-snmptrap
index 8896237..8db729a 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'ves_synchronous':
+          branch: 'ves_synchronous'
     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
@@ -55,6 +59,7 @@
 
 - project:
     name: dcaegen2-collectors-ves-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
index c5b80e4..200cf55 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     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
index 7d57150..70c49f4 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     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
index 221e0f5..a0e3d32 100644 (file)
       # build docker image
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - gerrit-release-verify
-      - gerrit-release-merge
+      - gerrit-release-verify:
+          build-node: centos7-docker-8c-8g
+      - gerrit-release-merge:
+          build-node: centos7-docker-8c-8g
     stream:
       - master:
           branch: master
-      - frankfurt:
-          branch: frankfurt
+      - guilin:
+          branch: guilin
+      - honolulu:
+          branch: honolulu
 
 - project:
     name: dcaegen2-platform-configbinding-sonar
index 0aaf8c9..4187a9b 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     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
index 1268c50..fbf33b4 100644 (file)
       - 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
-      - frankfurt:
-          branch: frankfurt
+      - guilin:
+          branch: guilin
+      - honolulu:
+          branch: honolulu
+
     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 69d3ba1..698a5cd 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     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
index de506f8..b3f2a2f 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-platform-settings'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+    name: dcaegen2-platform-mod-bpgenerator-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/platform'
+    project-name: 'dcaegen2-platform-mod-bpgenerator'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod/bpgenerator/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 5a8a623..59eaa94 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
index 73ffe09..f2858c7 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
index abea091..db490f7 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     mvn-settings: dcaegen2-platform-settings
     files: '**'
     archive-artifacts: ''
@@ -24,6 +27,7 @@
 
 - project:
     name: dcaegen2-platform-mod-runtimeapi-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -43,6 +47,7 @@
 
 - project:
     name: dcaegen2-platform-mod-runtimeapi-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
new file mode 100644 (file)
index 0000000..fe6aa15
--- /dev/null
@@ -0,0 +1,28 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-assembly
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - assembly:
+          pom: 'mod2/assembly/pom.xml'
+          pattern: 'mod2/assembly/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    maven-version: 'mvn35'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
new file mode 100644 (file)
index 0000000..0a9e77f
--- /dev/null
@@ -0,0 +1,61 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-auth-service
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - auth-service:
+          pom: 'mod2/auth-service/pom.xml'
+          pattern: 'mod2/auth-service/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    maven-version: 'mvn35'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-auth-service-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/platform'
+    project-name: 'dcaegen2-platform-mod2-auth-service'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/auth-service/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-auth-service-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-auth-service-clm
+    mvn-params: '-f mod2/auth-service/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
new file mode 100644 (file)
index 0000000..37dfd4d
--- /dev/null
@@ -0,0 +1,61 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-catalog-service
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - catalog-service:
+          pom: 'mod2/catalog-service/pom.xml'
+          pattern: 'mod2/catalog-service/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    maven-version: 'mvn35'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-catalog-service-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/platform'
+    project-name: 'dcaegen2-platform-mod2-catalog-service'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/catalog-service/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-catalog-service-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-catalog-service-clm
+    mvn-params: '-f mod2/catalog-service/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
new file mode 100644 (file)
index 0000000..fd80f8b
--- /dev/null
@@ -0,0 +1,61 @@
+---
+- project:
+    name: dcaegen2-platform-mod2-ui
+    project-name: dcaegen2-platform-mod2
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - ui:
+          pom: 'mod2/ui/pom.xml'
+          pattern: 'mod2/ui/**'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: dcaegen2-platform-settings
+    maven-version: 'mvn35'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod2-ui-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/platform'
+    project-name: 'dcaegen2-platform-mod2-ui'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod2/ui/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-platform-mod2-ui-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod2-ui-clm
+    mvn-params: '-f mod2/ui/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
deleted file mode 100644 (file)
index bf5c6c4..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
----
-- 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 af7d874..50f3ffc 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+          python-version: python3
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+          python-version: python3
     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
index 07722a5..bffea62 100644 (file)
@@ -2,27 +2,51 @@
 - project:
     name: dcaegen2-platform-policy-handler
     project-name: 'dcaegen2-platform-policy-handler'
-    jobs:
-      - '{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'
+    python-version: python3
+    tox-dir: '.'
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    build-node: ubuntu1804-docker-8c-8g
+    build-timeout: 45
     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
-    # correctly defined in the job
+    jobs:
+      - '{project-name}-python-jobs'
+      - 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
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    archive-artifacts: ''
+    nexus-iq-namespace: 'onap-'
     maven-deploy-properties: |
       deployAtEnd=true
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '.*'
+    container-tag-method: latest
+    docker-root: '.'
+    docker-name: onap/org.onap.dcaegen2.platform.policy-handler
+    docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh
+
+
 
 - project:
     name: dcaegen2-platform-policy-handler-sonar
index 4f5f997..1cbe59e 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     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
@@ -38,6 +41,7 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
+    java-version: openjdk11
     project: dcaegen2/platform/servicechange-handler
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-servicechange-handler'
diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
new file mode 100644 (file)
index 0000000..77a9468
--- /dev/null
@@ -0,0 +1,69 @@
+---
+- project:
+      name: dcaegen2-platform-ves-openapi-manager
+      project-name: 'dcaegen2-platform-ves-openapi-manager'
+      java-version: openjdk11
+      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
+          - 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/platform/ves-openapi-manager'
+      stream:
+          - 'master':
+              branch: 'master'
+          - 'honolulu':
+              branch: 'honolulu'
+      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-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: 'ubuntu1804-docker-8c-8g'
+
+- project:
+      name: dcaegen2-platform-ves-openapi-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/platform/ves-openapi-manager'
+      project-name: 'dcaegen2-platform-ves-openapi-manager'
+      branch: 'master'
+      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
+- project:
+    name: dcaegen2-platform-ves-openapi-manager-project-view
+    project-name: dcaegen2-platform-ves-openapi-manager
+    views:
+      - project-view
+
+- project:
+    name: dcaegen2-platform-ves-openapi-manager-info
+    project: dcaegen2/platform/ves-openapi-manager
+    project-name: dcaegen2-platform-ves-openapi-manager
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
index 776eea2..b336f35 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
-          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-version: 'mvn35'
     maven-deploy-properties: |
index 468b07a..a9efd72 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    maven-version: 'mvn35'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
     stream:
       - 'master':
          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           pattern: 'components/datalake-handler/**'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    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-datalake-handler-des-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler-des'
+    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/des/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
 
 - project:
     name: dcaegen2-services-datalake-handler-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
index 3c2c28c..e5ec5e6 100644 (file)
@@ -54,8 +54,8 @@
         pattern: '{src-dir}/.*'
     jobs:
       - gerrit-tox-verify:
-          stream: master
-          branch: 'master'
+          stream: all
+          branch: '*'
       - gerrit-docker-verify
       - gerrit-docker-merge:
           post_docker_build_script: |
     stream:
       - master:
           branch: master
-      - frankfurt:
-          branch: frankfurt
+      - guilin:
+          branch: guilin
+      - honolulu:
+          branch: honolulu
     views:
       - project-view:
           project-name: dcaegen2-services-pmsh
index 47fa28b..83511be 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     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
diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
new file mode 100644 (file)
index 0000000..d42b2cf
--- /dev/null
@@ -0,0 +1,87 @@
+---
+- project:
+    name: dcaegen2-services-kpi-computation-ms-verify
+    project-name: 'dcaegen2-services'
+    project: 'dcaegen2/services'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+    subproject:
+      - 'kpi-computation-ms':
+          pom: 'components/kpi-computation-ms/pom.xml'
+          pattern: 'components/kpi-computation-ms/**'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-settings: 'dcaegen2-services-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+    maven-deploy-properties: |
+      deployAtEnd=true
+
+- project:
+    name: dcaegen2-services-kpi-computation-ms-release
+    project-name: 'dcaegen2-services-kpi-computation-ms'
+    project: 'dcaegen2/services'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-pom: 'components/kpi-computation-ms/pom.xml'
+          mvn-params: '-f components/kpi-computation-ms/pom.xml'
+          pattern: 'components/kpi-computation-ms/**'
+      - 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'
+          mvn-params: '-f components/kpi-computation-ms/pom.xml'
+          pattern: 'components/kpi-computation-ms/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    java-version: openjdk11
+    mvn-settings: 'dcaegen2-services-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+    maven-deploy-properties: |
+      deployAtEnd=true
+
+- project:
+    name: dcaegen2-services-kpi-computation-ms-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/services'
+    project-name: 'dcaegen2-services-kpi-computation-ms'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
+    mvn-goals: 'clean install'
+    mvn-params: '-f components/kpi-computation-ms/pom.xml'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-services-kpi-computation-ms-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dcaegen2/services
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: 'dcaegen2-services-kpi-computation-ms-clm'
+    mvn-params: '-f components/kpi-computation-ms/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
index 6690f20..f10064d 100644 (file)
@@ -2,6 +2,7 @@
 - project:
     name: dcaegen2-services-mapper
     project-name: 'dcaegen2-services-mapper'
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -11,7 +12,7 @@
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package docker:build -DpushImage'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'dcaegen2-services-mapper-settings'
     files: '**'
     archive-artifacts: ''
@@ -32,6 +35,7 @@
 
 - project:
     name: dcaegen2-services-mapper-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -50,6 +54,7 @@
 
 - project:
     name: dcaegen2-services-mapper-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
@@ -62,6 +67,7 @@
 - project:
     name: dcaegen2-services-mapper-info
     project-name: dcaegen2-services-mapper
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
index 55c5e90..383f9e8 100755 (executable)
@@ -6,9 +6,11 @@
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
index a05d6ff..b68e769 100644 (file)
@@ -11,6 +11,7 @@
     functionality:
       - 'pmmapper':
           trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
+      - 'files-processing-config-pmmapper':
+          trigger_jobs:
     robot-options: ''
     branch: 'master'
index 051c958..9ab8eac 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
-          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-prh-settings'
     files: '**'
     archive-artifacts: ''
index d8500b8..0c686ef 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
-          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms-csit.yaml
new file mode 100644 (file)
index 0000000..8c57bea
--- /dev/null
@@ -0,0 +1,15 @@
+- project:
+    name: dcaegen2-services-slice-analysis-ms-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-services-slice-analysis-ms'
+    recipients: 'vv770d@att.com ahila.pandaram@wipro.com niranjana.y60@wipro.com'
+    stream:
+      - 'master':
+           branch: 'master'
+    functionality:
+      - 'testsuites':
+          trigger_jobs:
+            - '{project-name}-{stream}-merge-java'
+    robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
new file mode 100644 (file)
index 0000000..71374e2
--- /dev/null
@@ -0,0 +1,91 @@
+---
+- project:
+    name: dcaegen2-services-slice-analysis-ms-verify
+    project-name: 'dcaegen2-services'
+    project: 'dcaegen2/services'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+    subproject:
+      - 'slice-analysis-ms':
+          pom: 'components/slice-analysis-ms/pom.xml'
+          pattern: 'components/slice-analysis-ms/**'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-settings: 'dcaegen2-services-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+    maven-deploy-properties: |
+      deployAtEnd=true
+
+- project:
+    name: dcaegen2-services-slice-analysis-ms-release
+    project-name: 'dcaegen2-services-slice-analysis-ms'
+    project: 'dcaegen2/services'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-pom: 'components/slice-analysis-ms/pom.xml'
+          mvn-params: '-f components/slice-analysis-ms/pom.xml'
+          pattern: 'components/slice-analysis-ms/**'
+      - 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'
+          mvn-params: '-f components/slice-analysis-ms/pom.xml'
+          pattern: 'components/slice-analysis-ms/**'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-settings: 'dcaegen2-services-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: 'ubuntu1804-docker-8c-8g'
+    maven-deploy-properties: |
+      deployAtEnd=true
+
+- project:
+    name: dcaegen2-services-slice-analysis-ms-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/services'
+    project-name: 'dcaegen2-services-slice-analysis-ms'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
+    mvn-goals: 'clean install'
+    mvn-params: '-f components/slice-analysis-ms/pom.xml'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-services-slice-analysis-ms-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dcaegen2/services
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: 'dcaegen2-services-slice-analysis-ms-clm'
+    mvn-params: '-f components/slice-analysis-ms/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml
new file mode 100644 (file)
index 0000000..34b4a63
--- /dev/null
@@ -0,0 +1,15 @@
+- project:
+    name: dcaegen2-services-son-handler-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-services-son-handler'
+    recipients: 'vv770d@att.com reshmasree.chamarthi2@wipro.com niranjana.y60@wipro.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'testsuites':
+          trigger_jobs:
+            - '{project-name}-{stream}-merge-java'
+    robot-options: ''
index c400367..a13da55 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-son-handler-settings'
     files: '**'
     archive-artifacts: ''
index f0f2c74..73289f8 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     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
index f1edafc..11f333a 100644 (file)
@@ -23,8 +23,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
     functionality:
       - 'prh-testsuites'
     trigger_jobs:
index 318949a..6cc6bf7 100644 (file)
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     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
index e7bf8fb..1c27a3d 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'demo-settings'
@@ -82,3 +86,5 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
deleted file mode 100644 (file)
index 1362bc7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- project:
-    name: dmaap-buscontroller-csit
-    jobs:
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dmaap-buscontroller'
-    stream: 'master'
-    disabled: false
-    functionality:
-      - 'ssl':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
-      - 'with_mr':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
-      - 'with_dr':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
-    robot-options: ''
-    branch: 'master'
index 39a6a37..3136272 100644 (file)
@@ -9,7 +9,6 @@
     name: dmaap-buscontroller-java11
     project-name: 'dmaap-buscontroller'
     jobs:
-      - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
 - project:
-    name: dmaap-buscontroller-java8
-    project-name: 'dmaap-buscontroller'
+    name: dmaap-buscontroller-maintenance-java11
+    project-name: 'dmaap-buscontroller-maintenance'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/buscontroller'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
-    java-version: openjdk8
+    java-version: openjdk11
+    cron: ''
 
-# removed sonar job from this template because this repo only builds a docker container
-# and the 0% coverage report from Sonar was causing repeated escalations.
+- project:
+    name: dmaap-buscontroller-csit
+    jobs:
+      - '{project-name}-review-verification-maven-{stream}':
+            mvn-goals: clean install
+            mvn-params: '-P docker -DskipTests=true'
+      - '{project-name}-merge-verification-maven-{stream}':
+            mvn-goals: clean install
+            mvn-params: '-P docker'
+    project-name: 'dmaap-buscontroller'
+    recipients: 'fiachra.corcoran@est.tech'
+    project: 'dmaap/buscontroller'
+    stream:
+      - 'master':
+            branch: 'master'
+    mvn-settings: 'dmaap-buscontroller-settings'
+    robot-options: ''
+
+- project:
+    name: dmaap-buscontroller-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: 'dmaap/buscontroller'
+    project-name: 'dmaap-buscontroller'
+    branch: 'master'
+    mvn-settings: 'dmaap-buscontroller-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-buscontroller-clm
@@ -61,6 +95,7 @@
     project-name: 'dmaap-buscontroller'
     branch: 'master'
     mvn-settings: 'dmaap-buscontroller-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-buscontroller-info
diff --git a/jjb/dmaap/dmaap-csit.yaml b/jjb/dmaap/dmaap-csit.yaml
deleted file mode 100644 (file)
index 77126de..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: dmaap-csit
-    jobs:
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dmaap'
-    recipients: 'ms5838@att.com'
-    stream: 'master'
-    functionality:
-      - 'mrpubsub':
-          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
-    robot-options: ''
-    branch: 'master'
diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml
deleted file mode 100644 (file)
index 254e445..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: dmaap-datarouter-csit-ssl
-    jobs:
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dmaap-datarouter'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'ssl-dr-suite':
-          trigger_jobs:
-            - '{project-name}-maven-docker-stage-{stream}'
-    robot-options: ''
index ffd5a2d..b79f2ed 100644 (file)
@@ -1,3 +1,4 @@
+---
 - project:
     name: dmaap-datarouter-java11
     project-name: 'dmaap-datarouter'
@@ -6,6 +7,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
           mvn-goals: 'clean package -P docker docker:build docker:push'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
     archive-artifacts: ''
     java-version: openjdk11
 
-
 - project:
-    name: dmaap-datarouter-java8
-    project-name: 'dmaap-datarouter'
+    name: dmaap-datarouter-maintenance-java11
+    project-name: 'dmaap-datarouter-maintenance'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
           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:
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
-    java-version: openjdk8
+    java-version: openjdk11
+    cron: ''
+
+- project:
+    name: dmaap-datarouter-csit-ssl
+    jobs:
+      - '{project-name}-{stream}-csit-{functionality}'
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+    project-name: 'dmaap-datarouter'
+    recipients: 'fiachra.corcoran@est.tech'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'ssl-dr-suite':
+          trigger_jobs:
+            - '{project-name}-maven-docker-stage-{stream}'
+    robot-options: ''
 
 - project:
     name: dmaap-datarouter-sonar
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
deleted file mode 100644 (file)
index 4eeafa9..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
----
-- project:
-    name: dmaap-dbcapi-java11
-    project-name: 'dmaap-dbcapi'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{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: 'dmaap/dbcapi'
-    mvn-settings: 'dmaap-dbcapi-settings'
-    java-version: openjdk11
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    # 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: ''
-
-- project:
-    name: dmaap-dbcapi-java8
-    project-name: 'dmaap-dbcapi'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-    project: 'dmaap/dbcapi'
-    mvn-settings: 'dmaap-dbcapi-settings'
-    java-version: openjdk8
-    stream:
-      - 'elalto':
-          branch: 'elalto'
-    # 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: ''
-
-
-- project:
-    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: 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
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dmaap/dbcapi
-    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
diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
deleted file mode 100644 (file)
index 1b3bfa6..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
----
-
-- project:
-    name: dmaap-kafka-docker
-    project-name: 'dmaap-kafka-docker'
-    jobs:
-      - 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':
-          branch: 'master'
-    mvn-settings: 'dmaap-kafka11aaf-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
-    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
diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml
deleted file mode 100644 (file)
index 350eb03..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: dmaap-kafka
-    project-name: 'dmaap-kafka'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-    project: 'dmaap/kafka11aaf'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-kafka11aaf-settings'
-
-- project:
-    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: ubuntu1804-builder-4c-4g
-    project: 'dmaap/kafka11aaf'
-    project-name: 'dmaap-kafka'
-    branch: 'master'
-    mvn-settings: 'dmaap-kafka11aaf-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dmaap-kafka-info
-    project-name: dmaap-kafka
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dmaap/kafka11aaf
-    branch: master
index 6549204..3e7ba92 100644 (file)
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: dmaap-messagerouter-dmaapclient
-    project-name: 'dmaap-messagerouter-dmaapclient'
+    name: dmaap-messagerouter-dmaapclient-java11
+    project-name: 'dmaap-messagerouter-dmaapclient-java11'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     files: '**'
     archive-artifacts: ''
+    java-version: openjdk11
+
+- project:
+    name: dmaap-messagerouter-dmaapclient-maintenance
+    project-name: 'dmaap-messagerouter-dmaapclient-maintenance'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+    project: 'dmaap/messagerouter/dmaapclient'
+    stream:
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
+    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+    files: '**'
+    archive-artifacts: ''
+    cron: ''
 
 - project:
     name: dmaap-messagerouter-dmaapclient-sonar
@@ -36,6 +58,7 @@
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-dmaapclient-clm
@@ -46,6 +69,7 @@
     project-name: 'dmaap-messagerouter-dmaapclient'
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-dmaapclient-info
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
deleted file mode 100644 (file)
index 82c12d3..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
----
-
-- project:
-    name: dmaap-messagerouter-docker
-    project-name: 'dmaap-messagerouter-docker'
-    jobs:
-      - 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':
-          branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dmaap-messagerouter-docker-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dmaap/messagerouter/messageservice
-    project-name: 'dmaap-messagerouter-docker'
-    build-node: ubuntu1804-docker-8c-8g
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-
-- project:
-    name: dmaap-messagerouter-docker-info
-    project-name: dmaap-messagerouter-docker
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dmaap/messagerouter/messageservice
-    branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
new file mode 100644 (file)
index 0000000..42c312b
--- /dev/null
@@ -0,0 +1,72 @@
+---
+- project:
+    name: dmaap-kafka
+    project-name: 'dmaap-kafka'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - 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':
+          branch: 'master'
+    mvn-settings: 'dmaap-kafka11aaf-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: dmaap-kafka-maintenance
+    project-name: 'dmaap-kafka-maintenance'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - 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: 'dmaap/kafka11aaf'
+    stream:
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
+    mvn-settings: 'dmaap-kafka11aaf-settings'
+    files: '**'
+    archive-artifacts: ''
+    cron: ''
+
+- project:
+    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: ubuntu1804-builder-4c-4g
+    project: 'dmaap/kafka11aaf'
+    project-name: 'dmaap-kafka'
+    branch: 'master'
+    mvn-settings: 'dmaap-kafka11aaf-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-kafka-info
+    project-name: dmaap-kafka
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: dmaap/kafka11aaf
+    branch: master
index 3c0df03..9ad2d2e 100644 (file)
@@ -1,22 +1,69 @@
 ---
 - project:
-    name: dmaap-messagerouter-messageservice
-    project-name: 'dmaap-messagerouter-messageservice'
+    name: dmaap-messagerouter-messageservice-java-11
+    project-name: 'dmaap-messagerouter-messageservice-java-11'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+      - 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':
           branch: 'master'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: 'docker'
+
+- project:
+    name: dmaap-messagerouter-messageservice-maintenance
+    project-name: 'dmaap-messagerouter-messageservice-maintenance'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - 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: 'dmaap/messagerouter/messageservice'
+    stream:
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: 'docker'
+    cron: ''
+
+- project:
+    name: dmaap-csit
+    jobs:
+      - '{project-name}-{stream}-csit-{functionality}'
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+    project-name: 'dmaap'
+    recipients: 'fiachra.corcoran@est.tech'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'mrpubsub':
+          trigger_jobs:
+            - '{project-name}-maven-docker-stage-{stream}'
+    robot-options: ''
 
 - project:
     name: dmaap-messagerouter-messageservice-sonar
@@ -35,6 +82,7 @@
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-messageservice-clm
@@ -45,6 +93,7 @@
     project-name: 'dmaap-messagerouter-messageservice'
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-messageservice-info
index 331176a..1d476f9 100644 (file)
@@ -11,7 +11,6 @@
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
     project: 'dmaap/messagerouter/mirroragent'
     stream:
       - 'master':
     files: '**'
     archive-artifacts: ''
 
+- project:
+    name: dmaap-messagerouter-mirroragent-maintenance
+    project-name: 'dmaap-messagerouter-mirroragent-maintenance'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true8g
+    project: 'dmaap/messagerouter/mirroragent'
+    stream:
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+    files: '**'
+    archive-artifacts: ''
+    cron: ''
+
 - project:
     name: dmaap-messagerouter-mirroragent-sonar
     jobs:
index 2d872f7..69dee31 100644 (file)
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: dmaap-messagerouter-msgrtr
-    project-name: 'dmaap-messagerouter-msgrtr'
+    name: dmaap-messagerouter-msgrtr-java-11
+    project-name: 'dmaap-messagerouter-msgrtr-java-11'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
     project: 'dmaap/messagerouter/msgrtr'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+    java-version: openjdk11
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: dmaap-messagerouter-msgrtr
+    project-name: 'dmaap-messagerouter-msgrtr'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+    project: 'dmaap/messagerouter/msgrtr'
+    stream:
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
+    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
     files: '**'
     archive-artifacts: ''
+    cron: ''
 
 - project:
     name: dmaap-messagerouter-msgrtr-sonar
@@ -37,6 +58,7 @@
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-msgrtr-clm
@@ -47,6 +69,7 @@
     project-name: 'dmaap-messagerouter-msgrtr'
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-msgrtr-info
similarity index 62%
rename from jjb/dmaap/dmaap-zookeeper.yaml
rename to jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
index 4a0b523..3258275 100644 (file)
@@ -3,16 +3,28 @@
     name: dmaap-zookeeper
     project-name: 'dmaap-zookeeper'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - 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':
           branch: 'master'
     mvn-settings: 'dmaap-zookeeper-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: 'docker'
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
-    name: dmaap-zookeeper-docker
-    project-name: 'dmaap-zookeeper-docker'
+    name: dmaap-zookeeper-maintenance
+    project-name: 'dmaap-zookeeper-maintenance'
     jobs:
       - 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'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
     project: 'dmaap/zookeeper'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'dmaap-zookeeper-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
     build-node: ubuntu1804-docker-8c-8g
+    cron: ''
 
 - project:
     name: dmaap-zookeeper-info
index be97b29..d4e5424 100644 (file)
@@ -82,8 +82,7 @@
           mv  docs/_build/html "$WORKSPACE/archives/"
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for merging/publishing Sphinx/Restructured Text at RTD
       - shell: !include-raw: doc-post-rtd.sh
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
+      - lf-infra-publish
index c714112..f9f2cf2 100644 (file)
     rtdproject: 'onap/58810/'
     mvn-settings: 'doc-settings'
     stream:
-      - amsterdam:
-          branch: 'amsterdam'
-      - beijing:
-          branch: 'beijing'
-      - casablanca:
-          branch: 'casablanca'
-      - dublin:
-          branch: 'dublin'
-      - elalto:
-          branch: 'elalto'
+      - frankfurt:
+          branch: 'frankfurt'
 
 - project:
     name: doc-info
index 7620cca..6bda3cb 100644 (file)
@@ -67,7 +67,7 @@
 - project:
     name: externalapi-nbi-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar-prescan-script
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -82,6 +82,7 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     java-version: openjdk11
+    sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
     name: externalapi-nbi-info
index 74479f2..e29f278 100644 (file)
@@ -11,6 +11,9 @@
     build-artifact-days-to-keep: -1
     build-artifact-num-to-keep: 5
 
+    failure-notification: "releng+onap@linuxfoundation.org"
+    failure-notification-prefix: "[releng]"
+
     # lf-infra defaults
     lftools-version: <1.0.0
 
@@ -56,7 +59,7 @@
     # SonarCloud
     sonarcloud_project_organization: onap
     sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff
-    sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
+    sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.8.0.2131:sonar"
 
     # Nexus3 docker registries
     container-public-registry: nexus3.onap.org:10001
index 13afecf..0c614bf 100644 (file)
               new-normal: 1
               new-low: 1
 
-- publisher:
-    name: infra-shiplogs
-    # lf-infra macro to finish up a build.
-    #
-    # Handles the following:
-    #   - Shipping logs to Nexus logs site repository
-    #   - Cleanup workspace
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - ABORTED
-                - FAILURE
-                - NOT_BUILT
-                - SUCCESS
-                - UNSTABLE
-              build-steps:
-                - lf-infra-sysstat
-                - lf-infra-ship-logs
-          mark-unstable-if-failed: true
-      - workspace-cleanup:
-          exclude:
-            # Do not clean up *.jenkins-trigger files for jobs that use a
-            # properties file as input for triggering another build.
-            - '**/*.jenkins-trigger'
-          fail-build: false
-
-
 # SCMS
 - scm:
     name: git-scm
index eecedd4..23a554b 100644 (file)
       # Provided all steps have already passed, push the docker image
       - shell: !include-raw: ../shell/docker-push.sh
 
-- job-template:
-    name: '{project-name}-{stream}-merge-docker-cascade-trigger'
-    # Job template for Docker merge jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image. This job is triggered by the it's corresponding
-    # job that builds the artifacts from which the docker image is built from. Projects
-    # using the {project-name}-{stream}-merge-docker job should move to this job. Because
-    # the {project-name}-{stream}-merge-docker has no garanties that the docker image is built
-    # from merged artifact.
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_merge_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            BUILD_MODE=SNAPSHOT
-            DOCKERREGISTRY={docker_registry}
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
 - job-template:
     name: '{project-name}-{stream}-verify-docker'
     # Job template for Docker verify jobs
       # Execute any post build clean-up or testing
       - shell: '{post_build_script}'
 
-- job-template:
-    name: '{project-name}-{stream}-verify-docker-cascade-trigger'
-    # Job template for Docker verify jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image. This job is triggered by the it's corresponding
-    # job that builds the artifacts from which the docker image is built from. Projects
-    # using the {project-name}-{stream}-verify-docker job should move to this job. Because
-    # the {project-name}-{stream}-verify-docker has no garanties that the docker image is built
-    # from merged artifact.
-
-    ######################
-    # Default parameters #
-    ######################
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_verify_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            BUILD_MODE=SNAPSHOT
-            DOCKERREGISTRY={docker_registry}
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{stream}-release-version-docker-daily-no-sonar'
-    # Job template for Docker daily release jobs
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    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: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-    triggers:
-      # 11 AM UTC
-      - timed: '@daily'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-- job-template:
-    name: '{project-name}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger'
-    # Job template for Docker daily release job.
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template. This job is triggered by the daily build
-    # that builds the artifacts required for building the Docker image.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    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: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-merge-docker'
-    # Job template for Docker merge jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_merge_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=SNAPSHOT
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-merge-docker-cascade-trigger'
-    # Job template for Docker merge jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image. This job is triggered by the merge job
-    # that builds the artifacts required for building the Docker image.
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_merge_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=SNAPSHOT
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-verify-docker'
-    # Job template for Docker verify jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image
-
-    ######################
-    # Default parameters #
-    ######################
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_verify_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=SNAPSHOT
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-verify-docker-cascade-trigger'
-    # Job template for Docker verify jobs
-    #
-    # The purpose of this job template is to run a docker build, and potentially
-    # test validation of the docker image
-
-    ######################
-    # Default parameters #
-    ######################
-
-    <<: *docker_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *docker_verify_boiler_plate
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=SNAPSHOT
-      # Do the docker build
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar'
-    # Job template for Docker daily release jobs
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    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: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-    triggers:
-      # 11 AM UTC
-      - timed: '@daily'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger'
-    # Job template for Docker daily release jobs
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template. This job is triggered by the daily job
-    # that builds the artifacts required for building the Docker image.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    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: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-release-version-docker-no-sonar'
-    # Job template for Docker final release job
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    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: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-
-- job-template:
-    name: '{project-name}-{subproject}-{stream}-release-version-docker-cascade-trigger-no-sonar'
-    # Job template for Docker final release job
-    #
-    # The purpose of this job template is to run "docker build and docker push"
-    # for projects using this template. This job has no cascading counterpart, because the
-    # final release is moved manually to the release repo.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    <<: *docker_job_boiler_plate
-
-    docker_registry: '$DOCKER_REGISTRY:10003'
-
-    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: '{submodule-timeout}'
-          submodule-disable: '{submodule-disable}'
-          choosing-strategy: default
-
-    builders:
-      - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
-      - inject:
-          # Docker registry is purposely not using an '_' so as to not conflict
-          # with the Jenkins global env var
-          properties-content: |
-            DOCKER_ARGS={docker_build_args}
-            DOCKER_NAME={docker_name}
-            DOCKER_ROOT={docker_root}
-            DOCKER_TAG={docker_tag}
-            DOCKERREGISTRY={docker_registry}
-            BUILD_MODE=STAGING
-
-      # Do the docker build
-      - shell: !include-raw: ../shell/snapshot-strip.sh
-      - shell: !include-raw: ../shell/docker-build.sh
-      - inject:
-          # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
-      # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
-      # Provided all steps have already passed, push the docker image
-      - shell: !include-raw: ../shell/docker-push.sh
-    triggers:
-      - reverse:
-          jobs:
-            - '{parent_job}'
-          result: 'success'
-
 - job-template:
     # Job template for creating a docker manifest list
     #
               predefined-parameters: |
                 PARENT_JOB_NAME=$JOB_NAME
                 DOCKERHUB_REGISTRY=docker.io
+
+    publishers:
+      - lf-infra-publish
index 4d48b87..72004dc 100644 (file)
@@ -68,8 +68,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Golang verify jobs with subproject support
           make deploy
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
-
     scm:
       - gerrit-trigger-scm:
           refspec: ''
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
index a147e1a..4f7db33 100644 (file)
@@ -18,9 +18,8 @@
     post_build_script: ''
     pre_build_script: ''
     submodule-disable: false
-    submodule-recursive: true
     submodule-timeout: 10
-    build-timeout: 120
+    build-timeout: 240
 
     #####################
     # Job Configuration #
@@ -52,7 +51,7 @@
 # JOB TEMPLATES #
 #################
 - job-template:
-    name: '{project-name}-{stream}-verify-helm'
+    name: '{project-name}-{stream}-verify-{helm_bin}'
     # Job template for helm verify jobs
 
     <<: *helm_job_boiler_plate
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
+          helm_bin: '{helm_bin}'
           files: '{files}'
 
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN={helm_bin}" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
       - lf-infra-create-netrc:
       - inject:
           properties-content: 'HELM_MODULE={helm-module}'
       - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
       - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
       - lf-infra-create-netrc:
       - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-{stream}-stage-helm'
+    name: '{project-name}-{stream}-release-helm'
     # Job template for Helm stage jobs
 
     <<: *helm_job_boiler_plate
           submodule-recursive: '{submodule-recursive}'
 
     triggers:
-      - pollscm:
-          cron: '0 22 * * *'
       - gerrit:
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: '^stage-helm$'
+                comment-contains-value: '^release-helm$'
 
     builders:
       - lf-infra-pre-build
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
       - lf-infra-create-netrc:
           server-id: oom-helm
       - inject:
           properties-content: |
-            BUILD_TYPE=staging
+            BUILD_TYPE=release
       - shell: '{obj:post_build_script}'
       - lf-provide-maven-settings-cleanup
 
     disabled: true
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
     disabled: true
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
 
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN=helm3.5" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-
index 60f1ad6..ff021db 100644 (file)
@@ -75,8 +75,7 @@
           global-settings-type: cfp
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Java verify jobs running checkstyle at the end
@@ -93,9 +92,9 @@
 
     <<: *verify_java_defaults
     name: '{project-name}-{stream}-verify-java-checkstyle'
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
       - checkstyle-result
 
 - job-template:
           branch: '{branch}'
           files: '{obj:pattern}'
 
-- job-template:
-    # Job template for Java daily release jobs
-    #
-    # The purpose of this job template is to run:
-    # 1. maven clean deploy with Sonar scans
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-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}'
-          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 running checkstyle at the end
     # When checkstyle will be fully incorporated, it is meant to replace
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
       - checkstyle-result-daily
 
 - job-template:
           global-settings-type: cfp
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template: &merge_java_defaults
     # Job template for Java merge jobs
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - infra-wrappers:
+      - lf-infra-wrappers:
           build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
       - gerrit-trigger-patch-merged:
           properties: '{obj:mvn_properties}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Java merge jobs based on
     project-type: freestyle
     node: '{build-node}'
     disabled: '{disabled}'
+    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}'
           mvn-params: '{mvn-params}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Docker daily jobs
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template: &docker_version_java_defaults
     # Job template for building & pushing docker images
           mvn-params: '{mvn-params}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
     node: '{build-node}'
     docker-image-name: ''
     disabled: '{disabled}'
+    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}'
       - shell: !include-raw-escape: include-docker-push.sh
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Java merge jobs for SDC specific repos
 
     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}'
index 6480daa..6f3c836 100644 (file)
@@ -68,9 +68,7 @@
           tox
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
+      - lf-infra-publish
 
 - job-template:
     # Job template for docker daily jobs for 3 SCMs
           properties-file: version.properties
       - docker-login
       - shell: '{script}'
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
index 831c770..20735ae 100644 (file)
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-
+      - lf-infra-publish
 
 # vim: sw=2 ts=2 sts=2 et :
 
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for two scm and script trigger - for docker daily release
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
index 5a3c5cb..94d9d3a 100644 (file)
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          java-version: openjdk11
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
+          java-version: openjdk11
     project: 'holmes/common'
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'holmes-common-settings'
     files: '**'
     archive-artifacts: ''
@@ -45,6 +50,7 @@
     mvn-settings: 'holmes-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: holmes-common-clm
@@ -55,6 +61,7 @@
     project-name: 'holmes-common'
     branch: 'master'
     mvn-settings: 'holmes-common-settings'
+    java-version: openjdk11
 
 - project:
     name: holmes-common-info
index c27a626..2b6aeef 100644 (file)
@@ -9,15 +9,22 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          java-version: openjdk11
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
+          java-version: openjdk11
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+          java-version: openjdk11
     project: 'holmes/engine-management'
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'holmes-engine-management-settings'
     files: '**'
     archive-artifacts: ''
@@ -43,6 +50,7 @@
     mvn-settings: 'holmes-engine-management-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: holmes-engine-management-clm
@@ -53,6 +61,7 @@
     project-name: 'holmes-engine-management'
     branch: 'master'
     mvn-settings: 'holmes-engine-management-settings'
+    java-version: openjdk11
 
 - project:
     name: holmes-engine-management-info
index fee52ac..00791b1 100644 (file)
@@ -9,15 +9,22 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          java-version: openjdk11
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
+          java-version: openjdk11
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+          java-version: openjdk11
     project: 'holmes/rule-management'
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'holmes-rule-management-settings'
     files: '**'
     archive-artifacts: ''
@@ -43,6 +50,7 @@
     mvn-settings: 'holmes-rule-management-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: holmes-rule-management-clm
@@ -53,6 +61,7 @@
     project-name: 'holmes-rule-management'
     branch: 'master'
     mvn-settings: 'holmes-rule-management-settings'
+    java-version: openjdk11
 
 - project:
     name: holmes-rule-management-info
index 9ca248c..d10b0f0 100644 (file)
@@ -18,12 +18,12 @@ set -exu
 # Make sure pip itself us up-to-date.
 pip install --upgrade pip
 
-pip install --upgrade --no-binary pycparser pycparser
-pip install --upgrade pyOpenSSL==16.2.0 docker-py importlib requests scapy netifaces netaddr ipaddr simplejson demjson
-pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library,xvfb}}
+pip install --no-binary pycparser==2.20 pycparser==2.20
+pip install pyOpenSSL==16.2.0 docker-py==1.10.6 importlib==1.0.4 requests==2.25.1 scapy==2.4.4 netifaces==0.10.9 netaddr==0.8.0 ipaddr==2.2.0 simplejson==3.17.2 demjson==2.2.4
+pip install robotframework-httplibrary==0.4.2 robotframework-requests==0.8.2 robotframework-sshlibrary==3.6.0 robotframework-selenium2library==1.8.0 robotframework-xvfb==1.2.2
 
-pip install xvfbwrapper
-pip install PyVirtualDisplay
+pip install xvfbwrapper==0.2.9
+pip install PyVirtualDisplay==2.1
 
 # Print installed versions.
 pip freeze
index b315bc4..da2b798 100644 (file)
       - 'master':
           branch: 'master'
     subproject:
+      - 'aai-simulator':
+          pom: 'test/mocks/aai-simulator/pom.xml'
+          pattern: 'test/mocks/aai-simulator/**'
+          mvn-goals: 'mvn clean install -Dcheckstyle.skip'
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
           pattern: 'test/mocks/sniroemulator/**'
-      - 'mass-pnf-sim':
-          pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml'
-          pattern: 'test/mocks/mass-pnf-sim/**'
-          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
-          post-docker-verify-script: |
-              #!/bin/bash
-              set -ex # Fail build if any setup step fails
-              cd $WORKSPACE/test/mocks/mass-pnf-sim
-              tox
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/integration/integration-ietf-actn-tools.yaml b/jjb/integration/integration-ietf-actn-tools.yaml
new file mode 100644 (file)
index 0000000..304a36c
--- /dev/null
@@ -0,0 +1,51 @@
+---
+- project:
+    name: integration-ietf-actn-tools-project-view
+    project-name: integration-ietf-actn-tools
+    views:
+      - project-view
+
+- project:
+    name: integration-ietf-actn-tools-info
+    project: integration/ietf-actn-tools
+    project-name: integration-ietf-actn-tools
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-ietf-actn-tools-linters
+    project: integration/ietf-actn-tools
+    project-name: integration-ietf-actn-tools
+    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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+      - 'js':
+          tox-dir: '.'
+          tox-envs: 'js'
+          pattern: '**/*.js'
+    stream:
+      - 'master':
+          branch: 'master'
+
index 11680b6..66c8b70 100644 (file)
           default: '{html-files}'
           description: 'File name to be used by HTML publisher plugin to produce the report'
 
+- parameter:
+    name: integration-terraform-version
+    parameters:
+      - string:
+          name: TERRAFORM_VERSION
+          default: '{terraform-version}'
+          description: 'Terraform version to install on minion'
+
+- parameter:
+    name: integration-terragrunt-version
+    parameters:
+      - string:
+          name: TERRAGRUNT_VERSION
+          default: '{terragrunt-version}'
+          description: 'Terragrunt version to install on minion'
+
 - builder:
     name: integration-install-robotframework
     builders:
     builders:
       - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
 
+- builder:
+    name: integration-run-project-test
+    builders:
+      - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTOPTIONS}"
+
 - builder:
     name: integration-autorelease-fix-relativepaths
     builders:
           vagrant plugin install vagrant-libvirt
           vagrant plugin install vagrant-disksize
           vagrant plugin install vagrant-sshfs
+          vagrant plugin install vagrant-reload
           mkdir -p ~/.ssh
 
+- builder:
+   name: integration-install-terraform
+   builders:
+     - shell: |
+         #!/bin/bash
+         set -ex
+         cd /tmp
+         wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+         unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+         sudo mv terraform /usr/local/bin/
+         terraform version
+
+- builder:
+   name: integration-install-terragrunt
+   builders:
+     - shell: |
+         #!/bin/bash
+         set -ex
+         cd /tmp
+         wget -q https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64
+         sudo mv terragrunt_linux_amd64 /usr/local/bin/terragrunt
+         sudo chmod +x /usr/local/bin/terragrunt
+         terragrunt --version
+
 - builder:
     name: integration-docker-compose-logs
     builders:
     publishers:
       - robot:
           output-path: 'archives'
+          output-xml: '**/output.xml'
+          report-html: '**/report.html'
+          log-html: '**/log.html'
+          other-files: ''
+          unstable-threshold: '{unstable-if}'
+          pass-threshold: '{pass-if}'
+          only-critical: false
+
+- publisher:
+    name: integration-project-robot
+    publishers:
+      - robot:
+          output-path: 'csit/archives'
+          output-xml: '**/output.xml'
+          report-html: '**/report.html'
+          log-html: '**/log.html'
           other-files: ''
           unstable-threshold: '{unstable-if}'
           pass-threshold: '{pass-if}'
index 40a6a93..95d8fb3 100644 (file)
@@ -8,6 +8,7 @@
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
+    python-version: python3
 
     properties:
       - lf-infra-properties:
@@ -41,7 +42,7 @@
           server: '{server-name}'
           project: 'integration/csit'
           branch: '{branch}'
-          files: '**/{project-name}/**'
+          files: '*/{project-name}/**'
 
     builders:
       - lf-update-java-alternatives:
           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: 'ubuntu1804-docker-arm64-4c-2g'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
-
-    properties:
-      - lf-infra-properties:
-          project: 'integration/csit'
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: 'integration/csit'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-test-plan:
-          test-plan: 'plans/{project-name}/{functionality}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: 'integration/csit'
-          branch: '{branch}'
-          files: '**/{project-name}/**'
-
-    builders:
-      - lf-update-java-alternatives:
-          java-version: '{java-version}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-run-test
-
-    publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - lf-infra-publish
-      - email:
-          recipients: '{recipients}'
-          notify-every-unstable-build: false
-          send-to-individuals: true
-
-- job-template:
-    name: '{project-name}-{stream}-verify-csit-{functionality}-testng'
-    disabled: false
-
-    project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
-
-    properties:
-      - lf-infra-properties:
-          project: 'integration/csit'
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: 'integration/csit'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-test-plan:
-          test-plan: 'plans/{project-name}/{functionality}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-      - html-publisher-dir:
-          html-dir: '{html-dir}'
-      - html-publisher-files:
-          html-files: '{html-files}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: 'integration/csit'
-          branch: '{branch}'
-          files: '**/{project-name}/**'
-
-    builders:
-      - lf-update-java-alternatives:
-          java-version: '{java-version}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-run-test
-
-    publishers:
-      - testng:
-          pattern: archives/testng-results.xml
-          escape-test-description: true
-          escape-exception-msg: true
-          show-failed-builds: true
-          unstable-on-skipped-tests: false
-          failure-on-failed-test-config: false
-      - junit:
-          results: archives/testng-results.xml
-          health-scale-factor: 1.0
-          allow-empty-results: true
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - html-publisher:
-          allow-missing: true
-          dir: '{html-dir}'
-          files: '{html-files}'
-          keep-all: false
-          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: 'ubuntu1804-docker-arm64-4c-2g'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
-
-    properties:
-      - lf-infra-properties:
-          project: 'integration/csit'
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: 'integration/csit'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-test-plan:
-          test-plan: 'plans/{project-name}/{functionality}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-      - html-publisher-dir:
-          html-dir: '{html-dir}'
-      - html-publisher-files:
-          html-files: '{html-files}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: 'integration/csit'
-          branch: '{branch}'
-          files: '**/{project-name}/**'
-
-    builders:
-      - lf-update-java-alternatives:
-          java-version: '{java-version}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-run-test
-
-    publishers:
-      - testng:
-          pattern: archives/testng-results.xml
-          escape-test-description: true
-          escape-exception-msg: true
-          show-failed-builds: true
-          unstable-on-skipped-tests: false
-          failure-on-failed-test-config: false
-      - junit:
-          results: archives/testng-results.xml
-          health-scale-factor: 1.0
-          allow-empty-results: true
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - html-publisher:
-          allow-missing: true
-          dir: '{html-dir}'
-          files: '{html-files}'
-          keep-all: false
-          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: '{disabled}'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
+    python-version: python3
 
     properties:
       - lf-infra-properties:
           server: '{server-name}'
           project: 'integration/csit'
           branch: '{branch}'
-          files: '**/{project-name}/**'
+          files: '*/{project-name}/**'
       - timed: '@daily'
       - reverse:
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-infra-pre-build
       - lf-update-java-alternatives:
           java-version: '{java-version}'
       - integration-install-robotframework
           notify-every-unstable-build: false
           send-to-individuals: true
 
-- job-template:
-    name: '{project-name}-arm64-{stream}-csit-{functionality}'
-    disabled: false
+- verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate
+    name: verification_maven_job_boiler_plate
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    build-concurrent: false
+    build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
+    build-node: ubuntu1804-docker-8c-8g
+    build-timeout: 60
+    container-public-registry: 'nexus3.onap.org:10001'
+    git-url: "$GIT_URL/$PROJECT"
+    github-url: "https://github.com"
+    maven-versions-plugin: false
+    version-properties-file: version.properties
+    mvn-central: false
+    mvn-global-settings: global-settings
+    mvn-goals: clean deploy
+    mvn-opts: ""
+    mvn-pom: ""
+    mvn-version: mvn36
+    stream: master
+    submodule-recursive: true
+    submodule-timeout: 10
+    submodule-disable: false
+
+    disabled: '{disabled}'
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
 
     project-type: freestyle
-    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
-    recipients: ''
     java-version: 'openjdk11'
 
+    #####################
+    # Job Configuration #
+    #####################
+    concurrent: "{build-concurrent}"
     properties:
       - lf-infra-properties:
-          project: 'integration/csit'
+          project: '{project}'
           build-days-to-keep: '{build-days-to-keep}'
-
     parameters:
       - infra-parameters:
-          project: 'integration/csit'
+          project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
-      - integration-test-plan:
-          test-plan: 'plans/{project-name}/{functionality}'
+      - lf-infra-maven-parameters:
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: "{archive-artifacts}"
+          description: Artifacts to archive to the logs server.
       - integration-test-options:
           test-options: '{robot-options}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
     wrappers:
       - lf-infra-wrappers:
           build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: 'integration/csit'
-          branch: '{branch}'
-          files: '**/{project-name}/**'
-      - timed: '@daily'
-      - reverse:
-          jobs: '{obj:trigger_jobs}'
-
     builders:
+      - lf-infra-pre-build
+      - lf-jacoco-nojava-workaround
+      - lf-maven-install:
+          mvn-version: "{mvn-version}"
       - lf-update-java-alternatives:
-          java-version: '{java-version}'
+          java-version: "{java-version}"
+      - lf-infra-docker-login:
+          global-settings-file: "{mvn-global-settings}"
+          settings-file: "{mvn-settings}"
+      # must provide maven settings AFTER docker-login due to its cleanup
+      - lf-provide-maven-settings:
+          global-settings-file: "{mvn-global-settings}"
+          settings-file: "{mvn-settings}"
+      - lf-maven-versions-plugin:
+          maven-versions-plugin: "{maven-versions-plugin}"
+          version-properties-file: "{version-properties-file}"
+          mvn-version: "{mvn-version}"
+          mvn-pom: "{mvn-pom}"
+          mvn-settings: "{mvn-settings}"
+      - inject:
+          properties-content: |
+            CONTAINER_PULL_REGISTRY={container-public-registry}
+      - lf-maven-build:
+          mvn-goals: "{mvn-goals}"
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
-      - integration-run-test
-
+      - integration-run-project-test
+      - lf-provide-maven-settings-cleanup
     publishers:
-      - integration-robot:
+      - integration-project-robot:
           unstable-if: 0.0
           pass-if: 100.0
       - lf-infra-publish
           send-to-individuals: true
 
 - job-template:
-    name: '{project-name}-{stream}-csit-{functionality}-testng'
-    disabled: false
-
-    project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
+    # Job template for unified review verification jobs in
+    # project-specific CSIT flow for projects built with maven
+    #
+    # The purpose of this job template is to:
+    #  1. build local snapshot docker images with maven
+    #  2. run CSIT job with the local images
+    #  3. give a verify vote to the triggering review
+    #
 
-    properties:
-      - lf-infra-properties:
-          project: 'integration/csit'
-          build-days-to-keep: '{build-days-to-keep}'
+    name: '{project-name}-review-verification-maven-{stream}'
 
-    parameters:
-      - infra-parameters:
-          project: 'integration/csit'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-test-plan:
-          test-plan: 'plans/{project-name}/{functionality}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-      - html-publisher-dir:
-          html-dir: '{html-dir}'
-      - html-publisher-files:
-          html-files: '{html-files}'
+    <<: *verification_maven_job_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
           submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
     triggers:
-      - gerrit-trigger-patch-merged:
+      - gerrit-trigger-patch-submitted:
           server: '{server-name}'
-          project: 'integration/csit'
+          project: '{project}'
           branch: '{branch}'
-          files: '**/{project-name}/**'
-      - timed: '@daily'
-      - reverse:
-          jobs: '{obj:trigger_jobs}'
-
-    builders:
-      - lf-update-java-alternatives:
-          java-version: '{java-version}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-run-test
-
-    publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - testng:
-          pattern: archives/testng-results.xml
-          escape-test-description: true
-          escape-exception-msg: true
-          show-failed-builds: true
-          unstable-on-skipped-tests: false
-          failure-on-failed-test-config: false
-      - junit:
-          results: archives/testng-results.xml
-          health-scale-factor: 1.0
-          allow-empty-results: true
-      - html-publisher:
-          allow-missing: true
-          dir: '{html-dir}'
-          files: '{html-files}'
-          keep-all: false
-          link-to-last-build: false
-          name: ExtentReport
-      - lf-infra-publish
-      - email:
-          recipients: '{recipients}'
-          notify-every-unstable-build: false
-          send-to-individuals: true
+          files: '**'
 
 - job-template:
-    name: '{project-name}-arm64-{stream}-csit-{functionality}-testng'
-    disabled: false
+    # Job template for unified merge verification jobs in
+    # project-specific CSIT flow for projects built with maven
+    #
+    # The purpose of this job template is to:
+    #  1. build local snapshot docker images from master with maven
+    #  2. run CSIT job with the local images
+    #
 
-    project-type: freestyle
-    build-node: 'ubuntu1804-docker-arm64-4c-2g'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
-
-    properties:
-      - lf-infra-properties:
-          project: 'integration/csit'
-          build-days-to-keep: '{build-days-to-keep}'
+    name: '{project-name}-merge-verification-maven-{stream}'
 
-    parameters:
-      - infra-parameters:
-          project: 'integration/csit'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-test-plan:
-          test-plan: 'plans/{project-name}/{functionality}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-      - html-publisher-dir:
-          html-dir: '{html-dir}'
-      - html-publisher-files:
-          html-files: '{html-files}'
+    <<: *verification_maven_job_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
           submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
     triggers:
       - gerrit-trigger-patch-merged:
           server: '{server-name}'
-          project: 'integration/csit'
+          project: '{project}'
           branch: '{branch}'
-          files: '**/{project-name}/**'
-      - timed: '@daily'
-      - reverse:
-          jobs: '{obj:trigger_jobs}'
-
-    builders:
-      - lf-update-java-alternatives:
-          java-version: '{java-version}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-run-test
-
-    publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - testng:
-          pattern: archives/testng-results.xml
-          escape-test-description: true
-          escape-exception-msg: true
-          show-failed-builds: true
-          unstable-on-skipped-tests: false
-          failure-on-failed-test-config: false
-      - junit:
-          results: archives/testng-results.xml
-          health-scale-factor: 1.0
-          allow-empty-results: true
-      - html-publisher:
-          allow-missing: true
-          dir: '{html-dir}'
-          files: '{html-files}'
-          keep-all: false
-          link-to-last-build: false
-          name: ExtentReport
-      - lf-infra-publish
-      - email:
-          recipients: '{recipients}'
-          notify-every-unstable-build: false
-          send-to-individuals: true
+          files: '**'
index 9c2682d..a0fafde 100644 (file)
@@ -59,8 +59,7 @@
             - docker.push.registry=nexus3.onap.org:10003
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-verify'
       - shell: '{post-docker-verify-script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-compose-verify'
index 622d523..77be42b 100644 (file)
     name: '{project-name}-{stream}-{subproject}-tox-verify'
     id: integration-tox-verify
     description: 'Job intended for running tox'
+
+- job-template:
+    <<: *tox_verify_boilerplate
+    name: '{project-name}-{stream}-{subproject}-terraform-verify'
+    terraform-version: 0.13.2
+    terragrunt-version: 0.24.1
+    python-version: python3
+    id: integration-terraform-verify
+    description: 'Job intended for validating terraform modules'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - lf-infra-tox-parameters:
+          tox-dir: '{tox-dir}'
+          tox-envs: '{tox-envs}'
+      - integration-terraform-version:
+          terraform-version: '{terraform-version}'
+      - integration-terragrunt-version:
+          terragrunt-version: '{terragrunt-version}'
+
+    builders:
+      - integration-install-terraform
+      - integration-install-terragrunt
+      - lf-infra-tox-install:
+          python-version: '{python-version}'
+      - lf-infra-tox-run:
+          parallel: 'false'
diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml
new file mode 100644 (file)
index 0000000..0089454
--- /dev/null
@@ -0,0 +1,55 @@
+---
+- project:
+    name: integration-terraform-info
+    project: integration/terraform
+    project-name: integration-terraform
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-terraform-linters
+    project: integration/terraform
+    project-name: integration-terraform
+    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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
+
+- project:
+    name: integration-terraform-validate
+    project: integration/terraform
+    project-name: integration-terraform
+    jobs:
+      - integration-terraform-verify
+    subproject:
+      - 'openlab':
+          tox-dir: 'openlab'
+          tox-envs: 'terraform'
+          pattern: 'openlab/**'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/integration-terragrunt.yaml b/jjb/integration/integration-terragrunt.yaml
new file mode 100644 (file)
index 0000000..04391fb
--- /dev/null
@@ -0,0 +1,61 @@
+---
+- project:
+    name: integration-terragrunt-project-view
+    project-name: integration-terragrunt
+    views:
+      - project-view
+
+- project:
+    name: integration-terragrunt-info
+    project: integration/terragrunt
+    project-name: integration-terragrunt
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-terragrunt-linters
+    project: integration/terragrunt
+    project-name: integration-terragrunt
+    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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
+
+- project:
+    name: integration-terragrunt-validate
+    project: integration/terragrunt
+    project-name: integration-terragrunt
+    jobs:
+      - integration-terraform-verify
+    subproject:
+      - 'terragrunt':
+          tox-dir: '.'
+          tox-envs: 'terragrunt'
+          pattern: '**'
+    stream:
+      - 'master':
+          branch: 'master'
index 5b211d7..6296ff1 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'integration-settings'
-    build-node: 'centos7-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'test-vcpe':
           path: 'test/vcpe'
           pattern: 'test/vcpe/**'
+      - 'ran-nssmf-simulator':
+          path: 'test/mocks/ran-nssmf-simulator'
+          pattern: 'test/mocks/ran-nssmf-simulator/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
 
@@ -46,7 +47,7 @@
     name: integration-verify-golang
     project-name: 'integration'
     project: 'integration'
-    golangver: 'golang112'
+    golangver: 'golang114'
     mvn-settings: 'integration-settings'
     archive-artifacts: ''
     jobs:
diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
new file mode 100644 (file)
index 0000000..09edda6
--- /dev/null
@@ -0,0 +1,68 @@
+---
+- project:
+    name: integration-5G-core-nf-simulator-info
+    project-name: integration-5G-core-nf-simulator
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/simulators/5G-core-nf-simulator
+    branch: master
+
+- project:
+    name: integration-5G-core-nf-simulator
+    project-name: integration-5G-core-nf-simulator
+    project: integration/simulators/5G-core-nf-simulator
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'integration-simulators-5G-core-nf-simulator-settings'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+    subproject:
+      - 'AMF':
+          path: 'coresim/AMF/'
+          pattern: 'coresim/AMF/**'
+          pom: 'coresim/AMF/pom.xml'
+      - 'SMF':
+          path: 'coresim/SMF/'
+          pattern: 'coresim/SMF/**'
+          pom: 'coresim/SMF/pom.xml'
+      - 'UPF':
+          path: 'coresim/UPF/'
+          pattern: 'coresim/UPF/**'
+          pom: 'coresim/UPF/pom.xml'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java':
+          mvn-goals: 'clean install'
+
+- project:
+    name: integration-5G-core-nf-simulator-linters
+    project: integration/simulators/5G-core-nf-simulator
+    project-name: integration-5G-core-nf-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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
new file mode 100644 (file)
index 0000000..65ac363
--- /dev/null
@@ -0,0 +1,57 @@
+---
+
+- project:
+    name: integration-simulators-A1-policy-enforcement-simulator-info
+    project: integration/simulators/A1-policy-enforcement-simulator
+    project-name: integration-simulators-A1-policy-enforcement-simulator
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-simulators-A1-policy-enforcement-simulator
+    project: integration/simulators/A1-policy-enforcement-simulator
+    project-name: integration-simulators-A1-policy-enforcement-simulator
+    java-version: openjdk11
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'integration-simulators-A1-policy-enforcement-simulator-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+        - '{project-name}-{stream}-verify-java':
+            mvn-goals: 'clean install'
+
+- project:
+    name: integration-simulators-A1-policy-enforcement-simulator-linters
+    project: integration/simulators/A1-policy-enforcement-simulator
+    project-name: integration-simulators-A1-policy-enforcement-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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
new file mode 100644 (file)
index 0000000..8c77db7
--- /dev/null
@@ -0,0 +1,34 @@
+---
+- project:
+    name: integration-simulators-core-nssmf-simulator-info
+    project: integration/simulators/core-nssmf-simulator
+    project-name: integration-simulators-core-nssmf-simulator
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-simulators-core-nssmf-simulator
+    project: integration/simulators/core-nssmf-simulator
+    project-name: integration-simulators-core-nssmf-simulator
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'integration-simulators-core-nssmf-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'
diff --git a/jjb/integration/simulators/integration-masspnf-simulator.yaml b/jjb/integration/simulators/integration-masspnf-simulator.yaml
new file mode 100644 (file)
index 0000000..8121708
--- /dev/null
@@ -0,0 +1,70 @@
+---
+- project:
+    name: integration-simulators-masspnf-simulator-project-view
+    project-name: integration-simulators-masspnf-simulator
+    views:
+      - project-view
+
+- project:
+    name: integration-simulators-masspnf-simulator-info
+    project: integration/simulators/masspnf-simulator
+    project-name: integration-simulators-masspnf-simulator
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-simulators-masspnf-simulator-docker
+    project-name: integration-simulators-masspnf-simulator
+    jobs:
+      - integration-docker-merge
+      - integration-docker-verify
+    project: integration/simulators/masspnf-simulator
+    stream:
+      - 'master':
+          branch: 'master'
+    subproject:
+      - 'masspnfsim':
+          pom: 'pnf-sim-lightweight/pom.xml'
+          pattern: '**'
+          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
+          post-docker-verify-script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/
+              tox -e pytest
+    mvn-settings: 'integration-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: integration-simulators-masspnf-simulator-linters
+    project: 'integration/simulators/masspnf-simulator'
+    project-name: 'integration-simulators-masspnf-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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
index 481aca9..f426209 100644 (file)
@@ -15,7 +15,7 @@
       build-node: ubuntu1804-docker-8c-8g
       jobs:
           - '{project-name}-{stream}-verify-java':
-                mvn-goals: 'clean install'
+                mvn-goals: 'clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true'
           - '{project-name}-{stream}-merge-java':
                 mvn-goals: 'clean deploy'
           -  '{project-name}-gerrit-release-jobs':
diff --git a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
new file mode 100644 (file)
index 0000000..f31dd1d
--- /dev/null
@@ -0,0 +1,46 @@
+---
+- project:
+    name: integration-simulators-ran-nssmf-simulator-project-view
+    project-name: integration-simulators-ran-nssmf-simulator
+    views:
+      - project-view
+
+- project:
+    name: integration-simulators-ran-nssmf-simulator-info
+    project: integration/simulators/ran-nssmf-simulator
+    project-name: integration-simulators-ran-nssmf-simulator
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-simulators-ran-nssmf-simulator-linters
+    project: integration/simulators/ran-nssmf-simulator
+    project-name: integration-simulators-ran-nssmf-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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
index 895854a..4e60e9b 100644 (file)
@@ -1,4 +1,32 @@
 ---
+- project:
+      name: integration-simulators-ran-simulator
+      project-name: integration-simulators-ran-simulator
+      stream:
+          -   'master':
+                  branch: 'master'
+      project: 'integration/simulators/ran-simulator'
+      mvn-settings: 'integration-simulators-ran-simulator-settings'
+      maven-deploy-properties: |
+          deployAtEnd=true
+      archive-artifacts: ''
+      build-node: ubuntu1804-docker-8c-8g
+      jobs:
+          - '{project-name}-{stream}-verify-java':
+                mvn-goals: 'clean install'
+                pattern: 'ransim/**'
+                pom: 'ransim/pom.xml'
+          - '{project-name}-{stream}-merge-java':
+                mvn-goals: 'clean deploy'
+                pom: 'ransim/pom.xml'
+          -  '{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'
+
 - project:
     name: integration-simulators-ran-simulator-info
     project-name: integration-simulators-ran-simulator
diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
new file mode 100644 (file)
index 0000000..a64a4dc
--- /dev/null
@@ -0,0 +1,66 @@
+---
+- project:
+      name: integration-simulators-nf-simulator-pm-https-server
+      project-name: 'integration-simulators-nf-simulator-pm-https-server'
+      java-version: openjdk11
+      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
+          - 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 -P docker -DskipDockerPush=false'
+          - '{project-name}-gerrit-release-jobs':
+                build-node: centos7-docker-8c-8g
+
+      project: 'integration/simulators/nf-simulator/pm-https-server'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-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: 'ubuntu1804-docker-8c-8g'
+
+- project:
+      name: integration-simulators-nf-simulator-pm-https-server-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: 'integration/simulators/nf-simulator/pm-https-server'
+      project-name: 'integration-simulators-nf-simulator-pm-https-server'
+      branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+      name: integration-simulators-nf-simulator-pm-https-server-view
+      project-name: integration-simulators-nf-simulator-pm-https-server
+      views:
+          - project-view
+
+- project:
+      name: integration-simulators-nf-simulator-pm-https-server-info
+      project: integration/simulators/nf-simulator/pm-https-server
+      project-name: integration-simulators-nf-simulator-pm-https-server
+      build-node: centos7-builder-2c-1g
+      jobs:
+          - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
new file mode 100644 (file)
index 0000000..43e3161
--- /dev/null
@@ -0,0 +1,66 @@
+---
+- project:
+      name: integration-simulators-nf-simulator-avcn-manager
+      project-name: 'integration-simulators-nf-simulator-avcn-manager'
+      java-version: openjdk11
+      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
+          - 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 deploy -P docker -DskipDockerPush=false'
+          - '{project-name}-gerrit-release-jobs':
+                build-node: centos7-docker-8c-8g
+
+      project: 'integration/simulators/nf-simulator/avcn-manager'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-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: 'ubuntu1804-docker-8c-8g'
+
+- project:
+      name: integration-simulators-nf-simulator-avcn-manager-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: 'integration/simulators/nf-simulator/avcn-manager'
+      project-name: 'integration-simulators-nf-simulator-avcn-manager'
+      branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+      name: integration-simulators-nf-simulator-avcn-manager-view
+      project-name: integration-simulators-nf-simulator-avcn-manager
+      views:
+          - project-view
+
+- project:
+      name: integration-simulators-nf-simulator-avcn-manager-info
+      project: integration/simulators/nf-simulator/avcn-manager
+      project-name: integration-simulators-nf-simulator-avcn-manager
+      build-node: centos7-builder-2c-1g
+      jobs:
+          - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
new file mode 100644 (file)
index 0000000..1416394
--- /dev/null
@@ -0,0 +1,15 @@
+- project:
+      name: integration-simulators-nf-simulator-netconf-server-csit
+      jobs:
+          - '{project-name}-{stream}-verify-csit-{functionality}'
+          - '{project-name}-{stream}-csit-{functionality}'
+      project-name: 'integration-simulators-nf-simulator-netconf-server'
+      recipients: 'krzysztof.kuzmicki@nokia.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
+      stream:
+          - 'master':
+                branch: 'master'
+      functionality:
+          - 'testsuites':
+                trigger_jobs:
+                    - '{project-name}-{stream}-merge-java'
+      robot-options: ''
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
new file mode 100644 (file)
index 0000000..aeb03ee
--- /dev/null
@@ -0,0 +1,66 @@
+---
+
+- project:
+      name: integration-simulators-nf-simulator-netconf-server
+      project-name: 'integration-simulators-nf-simulator-netconf-server'
+      python-version: python3.8
+      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
+          - 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 -P docker -DskipDockerPush=false'
+          - '{project-name}-gerrit-release-jobs':
+                build-node: centos7-docker-8c-8g
+
+      project: 'integration/simulators/nf-simulator/netconf-server'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-netconf-server-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: 'ubuntu1804-docker-8c-8g'
+
+- project:
+      name: integration-simulators-nf-simulator-netconf-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: ubuntu1804-docker-8c-8g
+      project: 'integration/simulators/nf-simulator/netconf-server'
+      project-name: 'integration-simulators-nf-simulator-netconf-server'
+      branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+      name: integration-simulators-nf-simulator-netconf-server-view
+      project-name: integration-simulators-nf-simulator-netconf-server
+      views:
+          - project-view
+
+- project:
+      name: integration-simulators-nf-simulator-netconf-server-info
+      project: integration/simulators/nf-simulator/netconf-server
+      project-name: integration-simulators-nf-simulator-netconf-server
+      build-node: centos7-builder-2c-1g
+      jobs:
+          - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
new file mode 100644 (file)
index 0000000..e260745
--- /dev/null
@@ -0,0 +1,41 @@
+---
+- project:
+      name: integration-simulators-nf-simulator-simulator-cli
+      project-name: 'integration-simulators-nf-simulator'
+      python-version: python3
+      tox-dir: '.'
+      tox-envs: ''
+      subproject:
+          - simulator-cli:
+                path: './simulator-cli'
+                pattern: '**'
+      project: 'integration/simulators/nf-simulator'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-settings'
+      build-node: ubuntu1804-builder-4c-4g
+      jobs:
+          - '{project-name}-{stream}-{subproject}-verify-python'
+
+- project:
+      name: integration-simulators-nf-simulator-sonar
+      jobs:
+          - gerrit-tox-sonar
+      cron: '@daily'
+      build-node: ubuntu1804-builder-4c-4g
+      project: 'integration/simulators/nf-simulator'
+      project-name: 'integration-simulators-nf-simulator'
+      branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+      name: integration-simulators-nf-simulator-info
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos7-builder-2c-1g
+      project: 'integration/simulators/nf-simulator'
+      project-name: 'integration-simulators-nf-simulator'
+      branch: 'master'
diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
new file mode 100644 (file)
index 0000000..2994573
--- /dev/null
@@ -0,0 +1,66 @@
+---
+- project:
+      name: integration-simulators-nf-simulator-ves-client
+      project-name: 'integration-simulators-nf-simulator-ves-client'
+      java-version: openjdk11
+      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
+          - 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 deploy -P docker -DskipDockerPush=false'
+          - '{project-name}-gerrit-release-jobs':
+                build-node: centos7-docker-8c-8g
+
+      project: 'integration/simulators/nf-simulator/ves-client'
+      stream:
+          - 'master':
+                branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-ves-client-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: 'ubuntu1804-docker-8c-8g'
+
+- project:
+      name: integration-simulators-nf-simulator-ves-client-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: 'integration/simulators/nf-simulator/ves-client'
+      project-name: 'integration-simulators-nf-simulator-ves-client'
+      branch: 'master'
+      mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+      name: integration-simulators-nf-simulator-ves-client-view
+      project-name: integration-simulators-nf-simulator-ves-client
+      views:
+          - project-view
+
+- project:
+      name: integration-simulators-nf-simulator-ves-client-info
+      project: integration/simulators/nf-simulator/ves-client
+      project-name: integration-simulators-nf-simulator-ves-client
+      build-node: centos7-builder-2c-1g
+      jobs:
+          - gerrit-info-yaml-verify
diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
new file mode 100644 (file)
index 0000000..f61a878
--- /dev/null
@@ -0,0 +1,40 @@
+---
+- project:
+    name: integration-usecases-A1-policy-enforcement-r-apps-info
+    project: integration/usecases/A1-policy-enforcement-r-apps
+    project-name: integration-usecases-A1-policy-enforcement-r-apps
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-usecases-A1-policy-enforcement-r-apps-linters
+    project: integration/usecases/A1-policy-enforcement-r-apps
+    project-name: integration-usecases-A1-policy-enforcement-r-apps
+    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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
new file mode 100644 (file)
index 0000000..13659e6
--- /dev/null
@@ -0,0 +1,41 @@
+---
+
+- project:
+    name: integration-usecases-A1-policy-enforcement-info
+    project: integration/usecases/A1-policy-enforcement
+    project-name: integration-usecases-A1-policy-enforcement
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-usecases-A1-policy-enforcement-linters
+    project: integration/usecases/A1-policy-enforcement
+    project-name: integration-usecases-A1-policy-enforcement
+    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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
index 2065813..5ac5d8d 100644 (file)
       jobs:
           - integration-linters
       subproject:
+          - 'commit':
+                tox-dir: '.'
+                tox-envs: 'gitlint'
+                pattern: '**'
           - 'yaml':
                 tox-dir: '.'
                 tox-envs: 'yaml'
       stream:
           - 'master':
                 branch: 'master'
+          - 'frankfurt':
+                branch: 'frankfurt'
+          - 'guilin':
+                branch: 'guilin'
+          - 'honolulu':
+                branch: 'honolulu'
 
 - project:
     name: integration-xtesting-release
     project-name: 'integration-xtesting'
-    project: 'integration/docker/onap-python'
+    project: 'integration/xtesting'
     mvn-settings: 'integration-settings'
     jobs:
       - '{project-name}-gerrit-release-jobs':
           docker-root: ./smoke-usecases-robot
           docker-name: 'onap/xtesting-smoke-usecases-robot'
           docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-verify:
-          project-name: 'integration-xtesting-benchmarking'
-          docker-root: ./benchmarking
-          docker-name: 'onap/xtesting-benchmarking'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-merge:
-          project-name: 'integration-xtesting-benchmarking'
-          docker-root: ./benchmarking
-          docker-name: 'onap/xtesting-benchmarking'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-verify:
-          project-name: 'integration-xtesting-candidate-usecases'
-          docker-root: ./candidate-usecases
-          docker-name: 'onap/xtesting-candidate-usecases'
-          docker-build-args: '-f ./docker/Dockerfile'
-      - gerrit-docker-merge:
-          project-name: 'integration-xtesting-candidate-usecases'
-          docker-root: ./candidate-usecases
-          docker-name: 'onap/xtesting-candidate-usecases'
-          docker-build-args: '-f ./docker/Dockerfile'
       - gerrit-docker-verify:
           project-name: 'integration-xtesting-security'
           docker-root: ./security
       - 'master':
             branch: 'master'
             files: ''
+      - 'honolulu':
+            branch: 'honolulu'
+            files: ''
+      - 'guilin':
+            branch: 'guilin'
+            files: ''
+      - 'develop':
+            branch: 'develop'
+            files: ''
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
     build-node: ubuntu1804-docker-8c-8g
+    cron: '@daily'
+    container-tag-method: stream
index 62d07a7..fac5181 100644 (file)
@@ -16,9 +16,9 @@
     disable-job: false
     disabled: '{disable-job}'
 
-    # Runs once a week 
+    # Runs once a day
     triggers:
-      - timed: '@weekly'
+      - timed: '@daily'
 
 #   Define needed parameters for lf-infra-docker-login
     parameters:
index 8b6c391..7ef2950 100644 (file)
@@ -81,7 +81,7 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: centos7-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-settings: 'logging-analytics-settings'
     subproject:
       - 'pylog':
similarity index 52%
rename from jjb/clamp/dashboard/info-clamp-dashboard.yaml
rename to jjb/modeling/modeling-modelspec.yaml
index efff6fc..1cae6b7 100644 (file)
@@ -1,9 +1,9 @@
 ---
 - project:
-    name: clamp-dashboard-info
-    project-name: clamp-dashboard
+    name: modeling-modelspec-info
+    project-name: modeling-modelspec
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
-    project: clamp/dashboard
+    project: modeling/modelspec
     branch: master
diff --git a/jjb/multicloud/build-multicloud-azure-docker-image.sh b/jjb/multicloud/build-multicloud-azure-docker-image.sh
deleted file mode 100755 (executable)
index e4e6d8d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 ./azure/docker/*.*
-
-./azure/docker/build_image.sh
-
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
deleted file mode 100644 (file)
index da9827b..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
----
-- project:
-    name: multicloud-azure-java
-    project-name: 'multicloud-azure'
-    project: 'multicloud/azure'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-azure-settings'
-    subproject:
-      - 'azure':
-          pom: 'azure/pom.xml'
-          pattern: 'azure/**'
-    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
-      - 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: ubuntu1804-builder-4c-4g
-
-#- project:
-#    name: multicloud-azure-arm64-java
-#    project-name: 'multicloud-azure-arm64'
-#    project: 'multicloud/azure'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-azure-settings'
-#    subproject:
-#      - 'azure':
-#          pom: 'azure/pom.xml'
-#          pattern: 'azure/**'
-#    jobs:
-#      - '{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'
-#    files: '**'
-#    archive-artifacts: ''
-#    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: ubuntu1804-builder-4c-4g
-    project: 'multicloud/azure'
-    project-name: 'multicloud-azure'
-    branch: 'master'
-    mvn-settings: 'multicloud-azure-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: multicloud-azure-java-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: multicloud/azure
-    project-name: 'multicloud-azure'
-    branch: 'master'
-    mvn-settings: 'multicloud-azure-settings'
-
-- project:
-    name: multicloud-azure-info
-    project-name: multicloud-azure
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: multicloud/azure
-    branch: master
diff --git a/jjb/multicloud/multicloud-azure-python.yaml b/jjb/multicloud/multicloud-azure-python.yaml
deleted file mode 100644 (file)
index 8aec29b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
-    name: multicloud-azure-python
-    project-name: 'multicloud-azure'
-    project: 'multicloud/azure'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-azure-settings'
-    build-node: 'ubuntu1804-builder-4c-4g'
-    subproject:
-      - 'azure':
-          path: 'azure'
-          pattern: 'azure/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
index 8538713..274e4f4 100644 (file)
@@ -9,6 +9,6 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs: '{project-name}-{stream}-multivimbroker-merge-java'
+          trigger_jobs:
     robot-options: ''
     branch: 'master'
index 3233118..5f0bbfc 100644 (file)
@@ -6,6 +6,10 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
     mvn-settings: 'multicloud-framework-settings'
     subproject:
       - 'multivimbroker':
     project: 'multicloud/framework'
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
     project: multicloud/framework
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
index d81081a..113bce7 100644 (file)
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'multicloud-framework-settings'
     build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml
new file mode 100644 (file)
index 0000000..c1aa85e
--- /dev/null
@@ -0,0 +1,37 @@
+---
+
+- project:
+    name: multicloud-info
+    project-name: multicloud
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud
+    branch: master
+
+- project:
+    name: multicloud-windriver-info
+    project-name: multicloud-windriver
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud/openstack/windriver
+    branch: master
+
+- project:
+    name: multicloud-oom-info
+    project-name: multicloud-oom
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: multicloud/oom
+    branch: master
+
+- 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 dd43c95..8804725 100644 (file)
@@ -26,6 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'multicloud-k8s-settings'
     files: '**'
     archive-artifacts: ''
 #    files: '**'
 #    archive-artifacts: ''
 #    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 f6710b2..f0d38b4 100644 (file)
@@ -9,6 +9,6 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
+          trigger_jobs:
     robot-options: ''
     branch: 'master'
index 39dae5e..353b18f 100644 (file)
@@ -10,7 +10,5 @@
     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 ebae903..ea35a5e 100644 (file)
@@ -10,7 +10,5 @@
     functionality:
       - 'functionality1':
           trigger_jobs:
-            -  'multicloud-openstack-vmware-master-docker-java-version-shell-daily'
-#            -  'multicloud-openstack-vmware-arm64-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
index d11f053..20c1e19 100755 (executable)
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+echo "============== Unique docker tag: ${UNIQUE_DOCKER_TAG}"
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
index ca94fcd..ab49147 100644 (file)
@@ -1,13 +1,25 @@
----
-- project:
-    name: music-distributed-kv-store-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'music'
-    stream: 'master'
-    functionality:
-      - 'music-distributed-kv-store-test-plan':
-          trigger_jobs: 'music-distributed-kv-store-master-docker-golang-shell-daily'
-    robot-options: ''
-    branch: 'master'
+# Integration templates no longer support these 
+# job definitions; if Music CSIT needs to be restored,
+# '{project-name}-review-verification-golang-{stream}'
+# '{project-name}-merge-verification-golag-{stream}'
+# would have to be added to integration templates and 
+# applied here
+#  
+#---
+#- project:
+#    name: music-distributed-kv-store-csit
+#    jobs:
+#      - '{project-name}-{stream}-project-csit'
+#      - '{project-name}-review-verification-{stream}'
+#      - '{project-name}-merge-verification-{stream}'
+#    project-name: 'music-distributed-kv-store'
+#    project: 'music/distributed-kv-store'
+#    disabled: true
+#    stream: 'master'
+#    artifact-type: 'golang'
+#    java-version: openjdk11
+#    mvn-version: 'mvn36'
+#    mvn-settings: 'music-distributed-kv-store-settings'
+#    mvn-global-settings: global-settings
+#    robot-options: ''
+#    branch: 'master'
index d5b0308..0985d66 100644 (file)
@@ -13,6 +13,7 @@
     stream:
       - 'master':
           branch: 'master'
+    artifact-type: 'golang'
     mvn-settings: 'music-distributed-kv-store-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml
deleted file mode 100644 (file)
index 5f2c154..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: music-mdbc
-    project-name: 'music-mdbc'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-    project: 'music/mdbc'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'music-mdbc-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-
-- project:
-    name: music-mdbc-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: music/mdbc
-    project-name: 'music-mdbc'
-    branch: 'master'
-    mvn-settings: 'music-mdbc-settings'
-
-- project:
-    name: music-mdbc-info
-    project-name: music-mdbc
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: music/mdbc
-    branch: master
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
deleted file mode 100644 (file)
index 93ffe45..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- project:
-    name: music-prom
-    project-name: 'music-prom'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-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-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: 'music/prom'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'music-prom-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-
-- project:
-    name: music-prom-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: music/prom
-    project-name: 'music-prom'
-    branch: 'master'
-    mvn-settings: 'music-prom-settings'
-
-- project:
-    name: music-prom-info
-    project-name: music-prom
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: music/prom
-    branch: master
diff --git a/jjb/music/tag-music-distributed-kv-store-image-staging.sh b/jjb/music/tag-music-distributed-kv-store-image-staging.sh
new file mode 100755 (executable)
index 0000000..0c28eec
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo '=========== CALLING SCRIPT TO TAG DOCKER IMAGES AS STAGING ==========='
+echo "=========== Unique docker tag: ${UNIQUE_DOCKER_TAG}"
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./deployment/*.sh
+cd ./deployment
+./tag-docker-staging.sh
diff --git a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml
new file mode 100644 (file)
index 0000000..f694051
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+    name: oom-platform-cert-manager-project-view
+    project-name: oom-platform-cert-manager
+    views:
+      - project-view
+
+- project:
+    name: oom-platform-cert-manager-info
+    project: oom/platform/cert-manager
+    project-name: oom-platform-cert-manager
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
new file mode 100644 (file)
index 0000000..c4c388f
--- /dev/null
@@ -0,0 +1,18 @@
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
+- project:
+      name: oom-platform-cert-service-csit
+      jobs:
+          - "{project-name}-{stream}-verify-csit-{functionality}"
+          - "{project-name}-{stream}-csit-{functionality}"
+      project-name: "oom-platform-cert-service"
+      stream:
+          - "master":
+                branch: "master"
+          - "guilin":
+                branch: "guilin"
+      functionality:
+          - "certservice":
+                trigger_jobs:
+          - "postprocessor":
+                trigger_jobs:
+      robot-options: ""
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
new file mode 100644 (file)
index 0000000..d4602e3
--- /dev/null
@@ -0,0 +1,83 @@
+---
+- project:
+    name: oom-platform-cert-service-project-view
+    project-name: oom-platform-cert-service
+    views:
+      - project-view
+
+- project:
+    name: oom-platform-cert-service-info
+    project: oom/platform/cert-service
+    project-name: oom-platform-cert-service
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+      name: oom-platform-cert-service
+      project-name: 'oom-platform-cert-service'
+      stream:
+          -   'master':
+                  branch: 'master'
+                  java-version: openjdk11
+          -   'guilin':
+                  branch: 'guilin'
+                  java-version: openjdk11
+      project: 'oom/platform/cert-service'
+      mvn-settings: 'oom-platform-cert-service-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: oom-platform-cert-service-sonar
+      subproject: 'oom-platform-cert-service'
+      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: 'oom/platform/cert-service'
+      project-name: 'oom-platform-cert-service'
+      branch: 'master'
+      mvn-settings: 'oom-platform-cert-service-settings'
+      mvn-pom: 'certService/pom.xml'
+      mvn-goals: 'clean install'
+      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+      name: oom-platform-cert-service-clm
+      java-version: openjdk11
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: 'onap-'
+      project: oom/platform/cert-service
+      project-name: 'oom-platform-cert-service'
+      branch: 'master'
+      build-node: ubuntu1804-docker-8c-8g
+      mvn-settings: 'oom-platform-cert-service-settings'
diff --git a/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml b/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml
new file mode 100644 (file)
index 0000000..308dd5b
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+    name: oom-platform-keycloak-project-view
+    project-name: oom-platform-keycloak
+    views:
+      - project-view
+
+- project:
+    name: oom-platform-keycloak-info
+    project: oom/platform/keycloak
+    project-name: oom-platform-keycloak
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
diff --git a/jjb/oom-utils/oom-utils.yaml b/jjb/oom-utils/oom-utils.yaml
new file mode 100644 (file)
index 0000000..477d66e
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+    name: oom-utils-project-view
+    project-name: oom-utils
+    views:
+      - project-view
+
+- project:
+    name: oom-utils-info
+    project: oom/utils
+    project-name: oom-utils
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
index 5e96e18..71ab433 100644 (file)
@@ -8,8 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'honolulu':
+          branch: 'honolulu'
 
     jobs:
       - '{project-name}-{stream}-review':
     build-node: centos7-builder-2c-1g
     project: oom/offline-installer
     branch: master
+
+- project:
+      name: offline-installer-linters
+      project: oom/offline-installer
+      project-name: offline-installer
+      python-version: python3
+      jobs:
+          - integration-linters
+      subproject:
+          - 'py':
+              tox-dir: '.'
+              tox-envs: 'py'
+              pattern: '**/*.py'
+      stream:
+          - 'master':
+                branch: 'master'
diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml
new file mode 100644 (file)
index 0000000..b466f19
--- /dev/null
@@ -0,0 +1,67 @@
+---
+- project:
+    name: oom-consul-project-view
+    project-name: oom-consul
+    views:
+      - project-view
+
+- project:
+    name: oom-consul-info
+    project: oom/consul
+    project-name: oom-consul
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+      name: oom-consul-linters
+      project: oom/consul
+      project-name: oom-consul
+      python-version: python3
+      jobs:
+          - oom-linters
+      subproject:
+          - 'yaml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yaml'
+          - 'yml':
+                tox-dir: '.'
+                tox-envs: 'yaml'
+                pattern: '**/*.yml'
+          - 'py':
+                tox-dir: '.'
+                tox-envs: 'python'
+                pattern: '**/*.python'
+      stream:
+          - 'master':
+                branch: 'master'
+          - 'frankfurt':
+                branch: 'frankfurt'
+
+
+- project:
+   name: oom-consul-release
+   project-name: oom-consul
+   project: oom/consul
+   mvn-settings: 'oom-settings'
+   jobs:
+     - '{project-name}-gerrit-release-jobs':
+         build-node: centos7-docker-8c-8g
+
+- project:
+    name: 'oom-consul-docker'
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+    project-name: 'oom-consul'
+    project: 'oom/consul'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-name: 'onap/oom/consul'
+    docker-build-args: '-f ./Dockerfile'
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'oom-settings'
+    build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/oom/oom-helm-legacy.yaml b/jjb/oom/oom-helm-legacy.yaml
new file mode 100644 (file)
index 0000000..e70dac9
--- /dev/null
@@ -0,0 +1,84 @@
+---
+- project:
+    name: oom-legacy
+    project-name: oom-legacy
+    project: oom-legacy
+    mvn-settings: oom-settings
+    mvn-global-settings: global-settings
+    archive-artifacts: ""
+    build-node: ubuntu1804-helm-2c-1g
+    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
+    oom_build_script: |
+      #!/bin/bash
+      source helm.prop
+      set -e -o pipefail
+      cd kubernetes/
+      make HELM_BIN=$HELM_BIN all
+    subproject_build_script: |
+      #!/bin/bash
+      cd kubernetes/
+      make HELM_BIN=$HELM_BIN common
+      make HELM_BIN=$HELM_BIN {subproject}
+
+    helm_bin:
+      - helm3.5
+      - helm3.3
+
+    exclude:
+      - stream: guilin
+        helm_bin: helm3.5
+      - stream: frankfurt
+        helm_bin: helm3.5
+      - stream: frankfurt
+        helm_bin: helm3.3
+      - stream: dublin
+        helm_bin: helm3.5
+      - stream: dublin
+        helm_bin: helm3.3
+      - stream: casablanca
+        helm_bin: helm3.5
+      - stream: casablanca
+        helm_bin: helm3.3
+
+    stream:
+      - "guilin":
+          branch: "guilin"
+      - "frankfurt":
+          branch: "frankfurt"
+      - "dublin":
+          branch: "dublin"
+      - "casablanca":
+          branch: "casablanca"
+
+    subproject:
+      - "aai":
+          files: "kubernetes/aai/**"
+      - "robot":
+          files: "kubernetes/robot/**"
+
+    jobs:
+      - "{project-name}-{stream}-image-verify":
+          files: "**"
+      - "{project-name}-{stream}-verify-helm2":
+          files: "**"
+          build-timeout: 360
+      - "{project-name}-{stream}-verify-{helm_bin}":
+          build_script: "{oom_build_script}"
+          files: "**"
+          build-timeout: 360
+      - "{project-name}-{stream}-merge-helm":
+          build_script: "{oom_build_script}"
+          files: "**"
+      - "{project-name}-{stream}-release-helm":
+          build_script: "{oom_build_script}"
+          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+          files: "**"
+
+      # Below jobs disabled until future need.
+      - "{project-name}-{subproject}-{stream}-verify-helm2":
+          build_script: "{subproject_build_script}"
+      - "{project-name}-{subproject}-{stream}-merge-helm":
+          build_script: "{subproject_build_script}"
+      - "{project-name}-{stream}-update-helm-weekly":
+          build_script: "{oom_build_script}"
+          files: "**"
diff --git a/jjb/oom/oom-helm-verify-helm2.yaml b/jjb/oom/oom-helm-verify-helm2.yaml
new file mode 100644 (file)
index 0000000..f816e4c
--- /dev/null
@@ -0,0 +1,61 @@
+---
+- job-template: &helm-verify2
+    name: "{project-name}-{stream}-verify-helm2"
+    concurrent: true
+    branch: master
+    submodule-recursive: true
+    build_script: ""
+    post_build_script: ""
+    pre_build_script: ""
+    submodule-disable: false
+    submodule-timeout: 10
+
+    project-type: freestyle
+    node: "{build-node}"
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - lf-infra-parameters:
+          branch: "{branch}"
+          project: "{project}"
+          stream: "{stream}"
+          lftools-version: "{lftools-version}"
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    publishers:
+      - lf-infra-publish
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
+
+    triggers:
+      - gerrit-trigger-helm-patch-submitted:
+          status-context: "{project}-Helm-Verify"
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{files}"
+
+    builders:
+      - lf-infra-pre-build
+      - shell: !include-raw-escape: shell/helm2-repo-init.sh
+      - shell: !include-raw-escape: shell/helm2-verify.sh
+
+- job-template:
+    <<: *helm-verify2
+    name: "{project-name}-{subproject}-{stream}-verify-helm2"
+
+    builders:
+      - lf-infra-pre-build
+      - shell: !include-raw-escape: shell/helm2-repo-init.sh
+      - shell: "cd kubernetes/ ; make common ; make {subproject}"
index 4b0803c..3c1329a 100644 (file)
     project: oom
     mvn-settings: oom-settings
     mvn-global-settings: global-settings
-    archive-artifacts: ''
+    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/
-        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
+      #!/bin/bash
+      source helm.prop
+      set -e -o pipefail
+      cd kubernetes/
+      make HELM_BIN=$HELM_BIN all
     subproject_build_script: |
-        #!/bin/bash
-        cd kubernetes/
-        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}
-    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+      #!/bin/bash
+      cd kubernetes/
+      make HELM_BIN=$HELM_BIN common
+      make HELM_BIN=$HELM_BIN {subproject}
 
     stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'dublin':
-          branch: 'dublin'
-      - 'casablanca':
-          branch: 'casablanca'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
 
-    subproject:
-      - 'aaf':
-          files: 'kubernetes/aaf/**'
-      - 'aai':
-          files: 'kubernetes/aai/**'
-      - 'appc':
-          files: 'kubernetes/appc/**'
-      - 'clamp':
-          files: 'kubernetes/clamp/**'
-      - 'cli':
-          files: 'kubernetes/cli/**'
-      - 'common':
-          files: 'kubernetes/common/**'
-      - 'consul':
-          files: 'kubernetes/consul/**'
-      - 'dcaegen2':
-          files: 'kubernetes/dcaegen2/**'
-      - 'dmaap':
-          files: 'kubernetes/dmaap/**'
-      - 'esr':
-          files: 'kubernetes/esr/**'
-      - 'log':
-          files: 'kubernetes/log/**'
-      - 'msb':
-          files: 'kubernetes/msb/**'
-      - 'multicloud':
-          files: 'kubernetes/multicloud/**'
-      - 'nbi':
-          files: 'kubernetes/nbi/**'
-      - 'oof':
-          files: 'kubernetes/oof/**'
-      - 'policy':
-          files: 'kubernetes/policy/**'
-      - 'portal':
-          files: 'kubernetes/portal/**'
-      - 'readiness':
-          files: 'kubernetes/readiness/**'
-      - 'robot':
-          files: 'kubernetes/robot/**'
-      - 'sdc':
-          files: 'kubernetes/sdc/**'
-      - 'sdnc':
-          files: 'kubernetes/sdnc/**'
-      - 'sniro-emulator':
-          files: 'kubernetes/sniro-emulator/**'
-      - 'so':
-          files: 'kubernetes/so/**'
-      - 'uui':
-          files: 'kubernetes/uui/**'
-      - 'vfc':
-          files: 'kubernetes/vfc/**'
-      - 'vid':
-          files: 'kubernetes/vid/**'
-      - 'vnfsdk':
-          files: 'kubernetes/vnfsdk/**'
+    helm_bin:
+      - helm3.5
+      - helm3.3
+
+    exclude: []
+    subproject: []
 
     jobs:
-      - '{project-name}-{stream}-verify-helm':
-          build_script: '{oom_build_script}'
-          files: '**'
-      - '{project-name}-{stream}-merge-helm':
-          build_script: '{oom_build_script}'
-          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-          files: '**'
-      - '{project-name}-{stream}-stage-helm':
-          build_script: '{oom_build_script}'
+      - "{project-name}-{stream}-image-verify":
+          files: "**"
+      - "{project-name}-{stream}-verify-{helm_bin}":
+          build_script: "{oom_build_script}"
+          files: "**"
+          build-timeout: 360
+      - "{project-name}-{stream}-merge-helm":
+          build_script: "{oom_build_script}"
+          files: "**"
+      - "{project-name}-{stream}-release-helm":
+          build_script: "{oom_build_script}"
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-          files: '**'
+          files: "**"
 
       # Below jobs disabled until future need.
-      - '{project-name}-{subproject}-{stream}-verify-helm':
-          build_script: '{subproject_build_script}'
-      - '{project-name}-{subproject}-{stream}-merge-helm':
-          build_script: '{subproject_build_script}'
-      - '{project-name}-{stream}-update-helm-weekly':
-          build_script: '{oom_build_script}'
-          files: '**'
+      - "{project-name}-{subproject}-{stream}-verify-helm2":
+          build_script: "{subproject_build_script}"
+      - "{project-name}-{subproject}-{stream}-verify-helm":
+          build_script: "{subproject_build_script}"
+      - "{project-name}-{subproject}-{stream}-merge-helm":
+          build_script: "{subproject_build_script}"
+      - "{project-name}-{stream}-update-helm-weekly":
+          build_script: "{oom_build_script}"
+          files: "**"
diff --git a/jjb/oom/oom-image-verify.yaml b/jjb/oom/oom-image-verify.yaml
new file mode 100644 (file)
index 0000000..8ac6e3a
--- /dev/null
@@ -0,0 +1,53 @@
+---
+- job-template:
+    name: '{project-name}-{stream}-image-verify'
+    concurrent: true
+    branch: master
+    submodule-recursive: true
+
+    build_script: ''
+    git-url: '$GIT_URL/$PROJECT'
+    post_build_script: ''
+    pre_build_script: ''
+    submodule-disable: false
+    submodule-timeout: 10
+
+    project-type: freestyle
+    node: '{build-node}'
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: '{project}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    publishers:
+      - lf-infra-publish
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    triggers:
+      - gerrit-trigger-helm-patch-submitted:
+          status-context: '{project}-Helm-Verify'
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+
+    builders:
+      - lf-infra-pre-build
+      - shell: 'cd kubernetes; make check-for-staging-images 2>&1'
diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml
new file mode 100644 (file)
index 0000000..a3bc20e
--- /dev/null
@@ -0,0 +1,31 @@
+- project:
+    name: oom-main-linters
+    project: oom
+    project-name: oom
+    python-version: python3
+    jobs:
+      - oom-linters
+    subproject:
+      - "commit":
+          tox-dir: "."
+          tox-envs: "gitlint"
+          pattern: "**"
+      - "doc8":
+          tox-dir: "."
+          tox-envs: "doc8"
+          pattern: "docs/**"
+      - "linkcheck":
+          tox-dir: "."
+          tox-envs: "docs-linkcheck"
+          pattern: "docs/**"
+      - "sphinx":
+          tox-dir: "."
+          tox-envs: "docs"
+          pattern: "docs/**"
+    stream:
+      - "master":
+          branch: "master"
+      - "frankfurt":
+          branch: "frankfurt"
+      - "guilin":
+          branch: "guilin"
index e6f600c..5c0cffc 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch:  'frankfurt'
-      - 'elalto':
-          branch:  'elalto'
+      - 'guilin':
+          branch:  'guilin'
     mvn-settings: 'oparent-settings'
     java-version: openjdk11
     files: '**'
index 3b1de27..5c43473 100644 (file)
@@ -11,6 +11,6 @@
            branch: master
      functionality:
        - 'cmso':
-           trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'
+           trigger_jobs:
      robot-options: ''
      branch: 'master'
index 88c2384..180872c 100644 (file)
@@ -31,8 +31,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'optf-cmso-settings'
     java-version: openjdk11
 
@@ -74,8 +74,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'optf-cmso-settings'
     java-version: openjdk11
 
diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml
deleted file mode 100644 (file)
index 5f4509b..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
----
-- project:
-    name: optf-fgps-engine
-    project-name: 'optf-fgps'
-    project: 'optf/fgps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'optf-fgps-settings'
-    subproject:
-      - 'engine':
-          path: 'engine'
-          pattern: 'engine/**'
-          pom: 'pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-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: 'ubuntu1804-builder-4c-4g'
-
-- project:
-    name: optf-fgps-docker
-    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}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-fgps-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-fgps-docker-image.sh'
-          build-node: queue-docker-4c-4g
-
-- project:
-    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: ubuntu1804-builder-4c-4g
-    project: 'optf/fgps'
-    project-name: 'optf-fgps'
-    branch: 'master'
-    mvn-settings: 'optf-fgps-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: optf-fgps-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: optf/fgps
-    project-name: 'optf-fgps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'optf-fgps-settings'
-
-- project:
-    name: optf-fgps-info
-    project-name: optf-fgps
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: optf/fgps
-    branch: master
index 73b2771..5a723e4 100644 (file)
@@ -1,15 +1,17 @@
 - project:
     name: optf-has-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
+      - '{project-name}-review-verification-maven-{stream}':
+          mvn-goals: clean install
+      - '{project-name}-merge-verification-maven-{stream}':
+          mvn-goals: clean install
     project-name: optf-has
     recipients: 'snarayanan@research.att.com'
+    project: optf/has
     stream:
       - 'master':
           branch: 'master'
-    functionality:
-      - 'has':
-          trigger_jobs:
-            - '{project-name}-{stream}-conductor-docker-java-version-shell-daily'
+      - 'honolulu':
+          branch: 'honolulu'
+    mvn-settings: 'optf-has-settings'
     robot-options: ''
index 516ec84..706802b 100644 (file)
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
@@ -66,8 +66,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'optf-has-settings'
 
 - project:
index 7a9c7fc..9398122 100644 (file)
@@ -1,15 +1,17 @@
 - project:
     name: optf-osdf-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
+      - '{project-name}-review-verification-maven-{stream}':
+          mvn-goals: clean install
+      - '{project-name}-merge-verification-maven-{stream}':
+          mvn-goals: clean install
     project-name: optf-osdf
     recipients: 'snarayanan@research.att.com'
+    project: optf/osdf
     stream:
       - 'master':
           branch: 'master'
-    functionality:
-      - 'osdf':
-          trigger_jobs:
-            - '{project-name}-{stream}-osdf-docker-java-version-shell-daily'
+      - 'honolulu':
+          branch: 'honolulu'
+    mvn-settings: 'optf-osdf-settings'
     robot-options: ''
index c5a91f2..511f1fb 100644 (file)
@@ -7,8 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
@@ -67,8 +67,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'optf-osdf-settings'
 
 - project:
index 8d8321c..4b57060 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-apex-pdp-settings'
     java-version: openjdk11
     files: '**'
index 3c95796..3746aed 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-api-settings'
     java-version: openjdk11
     files: '**'
similarity index 56%
rename from jjb/clamp/clamp.yaml
rename to jjb/policy/policy-clamp.yaml
index 67b3f67..85d8d16 100644 (file)
@@ -1,51 +1,46 @@
 ---
 - project:
-    name: clamp-project-view
-    project-name: clamp
-    views:
-      - project-view
-
-- project:
-    name: clamp
-    project-name: 'clamp'
+    name: policy-clamp
+    project-name: 'policy-clamp'
     jobs:
       - gerrit-maven-stage:
-          build-node: ubuntu1804-docker-8c-8g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+          sign-artifacts: true
+          mvn-params: '-Dmaven.test.skip=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}-{stream}-verify-java':
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-16g
+      - '{project-name}-{stream}-merge-java':
+          build-node: ubuntu1804-docker-8c-16g
+          mvn-params: '-P docker'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
-    project: 'clamp'
+    project: 'policy/clamp'
     stream:
         - 'master':
               branch: 'master'
-        - 'frankfurt':
-              branch: 'frankfurt'
-        - 'elalto':
-              branch: 'elalto'
-    mvn-settings: 'clamp-settings'
+        - 'honolulu':
+              branch: 'honolulu'
+        - 'tosca-poc':
+              branch: 'tosca-poc'
+    mvn-settings: 'policy-clamp-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
-    name: clamp-sonar
+    name: policy-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}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1804-docker-8c-8g
-    project: 'clamp'
-    project-name: 'clamp'
+    project: 'policy/clamp'
+    project-name: 'policy-clamp'
     branch: 'master'
-    mvn-settings: 'clamp-settings'
+    mvn-settings: 'policy-clamp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     java-version: openjdk11
 
 - project:
-    name: clamp-clm
+    name: policy-clamp-clm
     jobs:
       - gerrit-maven-clm:
-         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
     nexus-iq-namespace: 'onap-'
-    project: 'clamp'
-    project-name: 'clamp'
+    project: 'policy/clamp'
+    project-name: 'policy-clamp'
     branch: 'master'
-    mvn-settings: 'clamp-settings'
+    mvn-settings: 'policy-clamp-settings'
     build-node: ubuntu1804-docker-8c-8g
-    build-timeout: 120
     java-version: openjdk11
 
 - project:
-    name: clamp-info
-    project-name: clamp
+    name: policy-clamp-info
+    project-name: policy-clamp
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
-    project: clamp
+    project: policy/clamp
     branch: master
index e3e0ce8..1ca5db6 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-common-settings'
     java-version: openjdk11
     files: '**'
diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
new file mode 100644 (file)
index 0000000..d188915
--- /dev/null
@@ -0,0 +1,120 @@
+- job-template:
+    name: '{project-name}-{stream}-project-csit-{functionality}'
+    disabled: '{disabled}'
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-8c-8g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+    python-version: python3
+
+    properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-options:
+          test-options: '{functionality}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-project-test
+
+    publishers:
+      - integration-project-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
+
+- job-template:
+    name: '{project-name}-{stream}-project-csit-verify-{functionality}'
+    disabled: '{disabled}'
+
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-8c-8g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+    python-version: python3
+
+    properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-options:
+          test-options: '{functionality}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**/csit/**'
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-project-test
+
+    publishers:
+      - integration-project-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
index 16025c0..7df8ae3 100644 (file)
 - project:
-    name: policy-apex-pdp-csit
+    name: policy-distribution-project-csit
+    jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-distribution'
+    recipients: 'ram_krishna.verma@bell.ca'
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    functionality:
+      - 'distribution'
+    trigger_jobs:
+      - 'policy-distribution-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
+
+- project:
+    name: policy-xacml-pdp-project-csit
+    jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-xacml-pdp'
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    functionality:
+      - 'xacml-pdp'
+    trigger_jobs:
+      - 'policy-xacml-pdp-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
+
+- project:
+    name: policy-drools-applications-project-csit
+    jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-drools-applications'
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    functionality:
+      - 'drools-applications'
+    trigger_jobs:
+      - 'policy-drools-applications-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
+
+- project:
+    name: policy-drools-pdp-project-csit
+    jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-drools-pdp'
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    functionality:
+      - 'drools-pdp'
+    trigger_jobs:
+      - 'policy-drools-pdp-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
+
+- project:
+    name: policy-apex-pdp-project-csit
+    jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-apex-pdp'
+    recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    functionality:
+      - 'apex-pdp'
+    trigger_jobs:
+      - 'policy-apex-pdp-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
+
+- project:
+    name: policy-pap-project-csit
+    jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-pap'
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    functionality:
+      - 'pap'
+    trigger_jobs:
+      - 'policy-pap-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
+
+- project:
+    name: policy-api-project-csit
+    jobs:
+      - '{project-name}-{stream}-project-csit-verify-{functionality}'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-api'
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+    functionality:
+      - 'api'
+    trigger_jobs:
+      - 'policy-api-{stream}-merge-java'
+      - 'policy-docker-{stream}-merge-java'
+
+- project:
+    name: policy-api-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'
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
     stream:
-      - 'master':
-          branch: master
-      - 'frankfurt':
-          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
-      - 'apex-pdp'
+      - 'api'
     trigger_jobs:
-      - 'policy-apex-pdp-{stream}-merge-java'
+      - 'policy-api-{stream}-merge-java'
     robot-options: ''
 
 - project:
-    name: policy-distribution-csit
+    name: policy-apex-pdp-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'ram.krishna.verma@est.tech'
+    recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
     stream:
-      - 'master':
-          branch: master
-      - 'frankfurt':
-          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
-      - 'distribution'
+      - 'apex-pdp'
     trigger_jobs:
-      - 'policy-distribution-{stream}-merge-java'
+      - 'policy-apex-pdp-{stream}-merge-java'
     robot-options: ''
 
 - project:
-    name: policy-api-csit
+    name: policy-distribution-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'ram_krishna.verma@bell.ca'
     stream:
-      - 'master':
-          branch: master
-      - 'frankfurt':
-          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
-      - 'api'
+      - 'distribution'
     trigger_jobs:
-      - 'policy-api-{stream}-merge-java'
+      - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
 
 - project:
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'ah999m@att.com'
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     stream:
-      - 'master':
-          branch: master
-      - 'frankfurt':
-          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'xacml-pdp'
     trigger_jobs:
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'jrh3@att.com ram.krishna.verma@est.tech'
+    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
     stream:
-      - 'master':
-          branch: master
-      - 'frankfurt':
-          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'pap'
     trigger_jobs:
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     stream:
-      - 'master':
-          branch: master
-      - 'frankfurt':
-          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'drools-pdp'
     trigger_jobs:
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
     stream:
-      - 'master':
-          branch: master
-      - 'frankfurt':
-          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'drools-applications'
     trigger_jobs:
index 8788f5d..f614feb 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-distribution-settings'
     java-version: openjdk11
     files: '**'
index 96e9c17..cf8b967 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'policy-docker-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: policy-docker-base-common-frankfurt
-    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 -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 -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:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
index 166f5ca..81bc61a 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-drools-applications-settings'
     java-version: openjdk11
     files: '**'
index cc056ce..c27aab8 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-drools-pdp-settings'
     java-version: openjdk11
     files: '**'
index 862c040..43f0966 100644 (file)
@@ -36,7 +36,7 @@
 - project:
     name: policy-gui-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar-prescan-script
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -51,6 +51,7 @@
     java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
     name: policy-gui-clm
index a3a7b31..c2d5b48 100644 (file)
@@ -4,7 +4,10 @@
     project-name: 'policy-models'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-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
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-models-settings'
     java-version: openjdk11
     files: '**'
index 3bf16e6..a7a7ce5 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-pap-settings'
     java-version: openjdk11
     files: '**'
index 8d803fa..2ec9cb0 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-parent-settings'
     java-version: openjdk11
     files: '**'
index 4607aec..d8abd90 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-xacml-pdp-settings'
     java-version: openjdk11
     files: '**'
index dca6674..86b4e69 100644 (file)
@@ -14,7 +14,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
           mvn-pom: 'ecomp-sdk/pom.xml'
-          mvn-params: '-f ecomp-sdk/pom.xml'
+          mvn-params: '-f ecomp-sdk/pom.xml -Dskiptests=true'
           pattern: 'ecomp-sdk/**'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
@@ -24,8 +24,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-3.2.0':
-          branch: 'release-3.2.0'
+      - 'release-3.4.0':
+          branch: 'release-3.4.0'
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''
@@ -34,7 +34,7 @@
 - project:
     name: portal-sdk-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar-prescan-script
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -49,6 +49,7 @@
     mvn-settings: 'portal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
     name: portal-sdk-clm
index 04a6374..5fd3455 100644 (file)
@@ -17,8 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-3.2.0':
-          branch: 'release-3.2.0'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''
index 325d79a..ec33772 100644 (file)
@@ -13,7 +13,6 @@
           sign-artifacts: true
           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
 
@@ -21,8 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-3.2.0':
-          branch: 'release-3.2.0'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''
@@ -32,7 +31,7 @@
 - project:
     name: portal-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar-prescan-script
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -46,6 +45,7 @@
     mvn-settings: 'portal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
     name: 'portal-coverity'
index 017218a..a4cec83 100644 (file)
@@ -24,7 +24,8 @@
           comment-contains-value: remerge$
     jobs:
       - rtdv3-global-verify
-      - rtdv3-global-merge
+      - rtdv3-global-merge:
+          build-timeout: 30
     stream:
       - master:
           branch: '*'
index fe8d56c..c4fcc36 100644 (file)
@@ -1,43 +1,29 @@
 ---
 - project:
-    name: sdc-csit
-    jobs:
-      - '{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'
-    functionality:
-      - 'sanity':
-          trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
-      - 'nightly':
-          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-      - 'uiSanity':
-          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-    robot-options: ''
-    branch: 'master'
-    html-dir: 'archives'
-    html-files: 'SDC_CI_Extent_Report.html'
-
-#- project:
-#    name: sdc-csit-arm64
-#    jobs:
-#      - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
-#      - '{project-name}-arm64-{stream}-csit-{functionality}-testng'
-#    project-name: 'sdc'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    functionality:
-#      - 'sanity':
-#          trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
-#      - 'nightly':
-#          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-#      - 'uiSanity':
-#          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-#    robot-options: ''
-#    branch: 'master'
-#    html-dir: 'archives'
-#    html-files: 'SDC_CI_Extent_Report.html'
+      name: sdc-csit
+      jobs:
+          - '{project-name}-{stream}-verify-java':
+                # this build is integration test only - CSIT (Verify 2/2)
+                mvn-goals: clean install
+                mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only'
+                build-node: 'ubuntu1804-docker-8c-16g'
+                archive-artifacts: >
+                    **/*.log
+                    **/hs_err_*.log
+                    **/target/**/feature.xml
+                    **/target/failsafe-reports/failsafe-summary.xml
+                    integration-tests/target/ExtentReport/API/*.html
+                    integration-tests/target/ExtentReport/UI/*.html
+                    integration-tests/target/ExtentReport/UI/screenshots/*.png
+      project-name: 'sdc-integration-tests'
+      # project name in gerrit
+      project: 'sdc'
+      stream:
+          - 'master':
+                branch: 'master'
+          - 'honolulu':
+                branch: 'honolulu'
+      java-version: openjdk11
+      mvn-version: 'mvn36'
+      mvn-settings: 'sdc-settings'
+      mvn-global-settings: global-settings
diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
deleted file mode 100644 (file)
index bd2f1d4..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-project-view
-    project-name: sdc-dcae-d
-    views:
-      - project-view
-
-- project:
-    name: sdc-dcae-d-ci
-    project-name: 'sdc-dcae-d-ci'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-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-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'
-    mvn-settings: 'sdc-dcae-d-ci-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-#- project:
-#    name: sdc-dcae-d-ci-arm64
-#    project-name: 'sdc-dcae-d-ci-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#         docker-pom: 'pom.xml'
-#         mvn-profile: 'docker'
-#         mvn-params: '-DskipTests=true'
-#         build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#    project: 'sdc/dcae-d/ci'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-dcae-d-ci-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-timeout: 60
-#
-- project:
-    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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/ci'
-    project-name: 'sdc-dcae-d-ci'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-ci-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-ci-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/ci
-    project-name: 'sdc-dcae-d-ci'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-ci-settings'
-
-- project:
-    name: sdc-dcae-d-ci-info
-    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
deleted file mode 100644 (file)
index a8a8f3e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- 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: ''
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
deleted file mode 100644 (file)
index 3127610..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-dt-be-main
-    project-name: 'sdc-dcae-d-dt-be-main'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-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-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'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-#- project:
-#    name: sdc-dcae-d-dt-be-main-arm64
-#    project-name: 'sdc-dcae-d-dt-be-main-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-DskipTests=true'
-#    project: 'sdc/dcae-d/dt-be-main'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    files: '**'
-#    archive-artifacts: ''
-#    build-timeout: 60
-#
-- project:
-    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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/dt-be-main'
-    project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-dt-be-main-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/dt-be-main
-    project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-
-- project:
-    name: sdc-dcae-d-dt-be-main-info
-    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
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
deleted file mode 100644 (file)
index 7180195..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-dt-be-property
-    project-name: 'sdc-dcae-d-dt-be-property'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{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'
-    mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-- project:
-    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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/dt-be-property'
-    project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-dt-be-property-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/dt-be-property
-    project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
-
-- project:
-    name: sdc-dcae-d-dt-be-property-info
-    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
diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
deleted file mode 100644 (file)
index 22117c7..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-dt
-    project-name: 'sdc-dcae-d-dt'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-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-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'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'sdc-dcae-d-dt-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-#- project:
-#    name: sdc-dcae-d-dt-arm64
-#    project-name: 'sdc-dcae-d-dt-arm64'
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'server,docker'
-#          mvn-params: '-DskipTests=true'
-#    project: 'sdc/dcae-d/dt'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-dcae-d-dt-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-timeout: 60
-#
-- project:
-    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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/dt'
-    project-name: 'sdc-dcae-d-dt'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-dt-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/dt
-    project-name: 'sdc-dcae-d-dt'
-    build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-dt-settings'
-
-- project:
-    name: sdc-dcae-d-dt-info
-    project-name: sdc-dcae-d-dt
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/dcae-d/dt
-    branch: master
diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
deleted file mode 100644 (file)
index fcd7d51..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-fe
-    project-name: 'sdc-dcae-d-fe'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-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-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'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'sdc-dcae-d-fe-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-
-#- project:
-#    name: sdc-dcae-d-fe-arm64
-#    project-name: 'sdc-dcae-d-fe-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-DskipTests=true'
-#    project: 'sdc/dcae-d/fe'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-dcae-d-fe-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-timeout: 60
-#
-- project:
-    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: ubuntu1804-builder-4c-4g
-    project: 'sdc/dcae-d/fe'
-    project-name: 'sdc-dcae-d-fe'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-fe-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-fe-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/dcae-d/fe
-    project-name: 'sdc-dcae-d-fe'
-    build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-fe-settings'
-
-- project:
-    name: sdc-dcae-d-fe-info
-    project-name: sdc-dcae-d-fe
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/dcae-d/fe
-    branch: master
diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
deleted file mode 100644 (file)
index 1165d58..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-- project:
-    name: sdc-dcae-d-tosca-lab
-    project-name: 'sdc-dcae-d-tosca-lab'
-    project: 'sdc/dcae-d/tosca-lab'
-    stream:
-      - 'master':
-          branch: 'master'
-    subproject:
-    - dcae-d-tosca-lab:
-        path: '.'
-        pattern: '**'
-    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - 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'
-
-#- project:
-#    name: sdc-dcae-d-tosca-lab-arm64
-#    project-name: 'sdc-dcae-d-tosca-lab-arm64'
-#    project: 'sdc/dcae-d/tosca-lab'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    subproject:
-#    - dcae-d-tosca-lab:
-#        path: '.'
-#        pattern: '**'
-#    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#    docker-pom: 'pom.xml'
-#    mvn-profile: 'default'
-#
-- project:
-    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: ubuntu1804-docker-8c-8g
-    project: 'sdc/dcae-d/tosca-lab'
-    project-name: 'sdc-dcae-d-tosca-lab'
-    branch: 'master'
-    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-dcae-d-tosca-lab-info
-    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-microservices.yaml b/jjb/sdc/sdc-microservices.yaml
deleted file mode 100644 (file)
index 0aad248..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
----
-- 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 ef6ff5a..f7c811c 100644 (file)
@@ -24,6 +24,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'sdc-onap-ui-angular-settings'
     files: '**'
     archive-artifacts: ''
index 7f6689f..28d0a78 100644 (file)
@@ -18,6 +18,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'sdc-onap-ui-common-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/sdc/sdc-onap-ui-react.yaml b/jjb/sdc/sdc-onap-ui-react.yaml
deleted file mode 100644 (file)
index 45b9792..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: sdc-onap-ui-react-info
-    project-name: 'sdc-onap-ui-react'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'sdc/onap-ui-react'
-    branch: 'master'
-
-- project:
-    name: sdc-onap-ui-react
-    project-name: 'sdc-onap-ui-react'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-    project: 'sdc/onap-ui-react'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-onap-ui-react-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-    maven-version: 'mvn35'
-
-- project:
-    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: ubuntu1804-builder-4c-4g
-    project: 'sdc/onap-ui-react'
-    project-name: 'sdc-onap-ui-react'
-    branch: 'master'
-    mvn-settings: 'sdc-onap-ui-react-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
index 487967d..c7e66c2 100644 (file)
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'sdc-sdc-be-common-settings'
     files: '**'
     archive-artifacts: ''
index 7250a84..c3b9ce3 100644 (file)
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
     maven-version: 'mvn35'
 
+- project:
+    name: sdc-sdc-distribution-client-integration-pairwise
+    java-version: openjdk11
+    jobs:
+       - '{project-name}-{stream}-integration-pairwise'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'sdc/sdc-distribution-client'
+    project-name: 'sdc-sdc-distribution-client'
+    stream:
+        - 'master':
+            branch: 'master'
+            java-version: openjdk11
+    mvn-settings: 'sdc-sdc-distribution-client-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+    maven-version: 'mvn35'
+    mvn-params: ' -P integration-pairwise'
+
 - project:
     name: sdc-sdc-distribution-client-sonar
     jobs:
@@ -43,6 +66,7 @@
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
+    java-version: openjdk11
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
@@ -56,6 +80,7 @@
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-distribution-client-info
index 57726b7..d83b2e5 100644 (file)
@@ -23,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
new file mode 100644 (file)
index 0000000..d8d2ba4
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+      name: sdc-sdc-helm-validator-csit
+      jobs:
+          - "{project-name}-{stream}-verify-csit-{functionality}"
+          - "{project-name}-{stream}-csit-{functionality}"
+      project-name: "sdc"
+      stream:
+          - "master":
+                branch: "master"
+      functionality:
+          - "sdc-helm-validator":
+                trigger_jobs:
+      robot-options: ""
similarity index 50%
rename from jjb/policy/policy-engine.yaml
rename to jjb/sdc/sdc-sdc-helm-validator.yaml
index 64ba91e..5b87809 100644 (file)
@@ -1,38 +1,51 @@
 ---
 - project:
-    name: policy-engine
-    project-name: 'policy-engine'
+    name: sdc-sdc-helm-validator-project-view
+    project-name: sdc-sdc-helm-validator
+    views:
+      - project-view
+
+- project:
+    name: sdc-sdc-helm-validator-info
+    project: sdc/sdc-helm-validator
+    project-name: sdc-sdc-helm-validator
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: sdc-sdc-helm-validator
+    project-name: 'sdc-sdc-helm-validator'
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: "-P docker"
+      - '{project-name}-{stream}-merge-java'
       - 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
           maven-versions-plugin: true
-          mvn-params: '-P docker  -Dmaven.test.skip=true'
+          mvn-goals: 'clean install docker:build docker:push'
           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'
+    project: 'sdc/sdc-helm-validator'
+    mvn-settings: 'sdc-sdc-helm-validator-settings'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'policy-engine-settings'
-    java-version: openjdk11
+      - 'master':
+            branch: 'master'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    build-node: ubuntu1804-docker-8c-8g
+
 
 - project:
-    name: policy-engine-sonar
+    name: sdc-sdc-helm-validator-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/engine'
-    project-name: 'policy-engine'
-    branch: 'frankfurt'
-    mvn-settings: 'policy-engine-settings'
-    java-version: openjdk11
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'sdc/sdc-helm-validator'
+    project-name: 'sdc-sdc-helm-validator'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-helm-validator-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
-    name: policy-engine-clm
-    jobs:
-      - gerrit-maven-clm:
-         build-timeout: 40
-    nexus-iq-namespace: 'onap-'
-    project: policy/engine
-    project-name: 'policy-engine'
-    branch: 'frankfurt'
-    mvn-settings: 'policy-engine-settings'
+    name: sdc-sdc-helm-validator-clm
     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: frankfurt
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'sdc/sdc-helm-validator'
+    project-name: 'sdc-sdc-helm-validator'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-helm-validator-settings'
index adaa2d5..5cdb6fc 100644 (file)
@@ -18,6 +18,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'sdc-sdc-pubsub-settings'
     files: '**'
     archive-artifacts: ''
index 51d91ee..a86d3b2 100644 (file)
@@ -22,6 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
index 9c2d057..abc5966 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
index 862447a..0fa71be 100644 (file)
@@ -1,10 +1,4 @@
 ---
-- project:
-    name: sdc-master-project-view
-    project-name: sdc-master
-    views:
-      - project-view
-
 - project:
     name: sdc-sdc-docker-project-view
     project-name: sdc-sdc-docker
     views:
       - project-view
 
+- project:
+    name: sdc-project-view
+    project-name: sdc
+    views:
+      - project-view
+
 - project:
     name: sdc
     project-name: 'sdc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          # this build is unit test only (Verify 1/2)
+          mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
+          build-node: 'ubuntu1804-docker-8c-8g'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1804-docker-v1-8c-8g'
+          build-node: 'ubuntu1804-docker-8c-16g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
+          # running everything (unit tests and integration tests in a single job for merge, as we don't need // run
+          # for merge, but still saving integration tests results and report.
+          archive-artifacts: >
+              **/*.log
+              **/hs_err_*.log
+              **/target/**/feature.xml
+              **/target/failsafe-reports/failsafe-summary.xml
+              integration-tests/target/ExtentReport/API/*.html
+              integration-tests/target/ExtentReport/UI/*.html
+              integration-tests/target/ExtentReport/UI/screenshots/*.png
       - 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/'
+          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
       - 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/'
+          mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+#     - 'frankfurt':
+#         branch: 'frankfurt'
+#         java-version: openjdk8
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-16g
     project: 'sdc'
     project-name: 'sdc'
     branch: 'master'
     mvn-settings: 'sdc-settings'
-    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+    java-version: openjdk11
+    mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
 
 - project:
-    name: sdc-clm-catalog
-    jobs:
-      - gerrit-maven-clm:
-          build-timeout: 120
-          submodule-timeout: 30
-          mvn-params: '-P catalog -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
-    nexus-iq-namespace: 'onap-'
-    project: sdc
-    project-name: 'sdc-catalog'
-    build-node: ubuntu1804-docker-8c-8g
-    branch: 'master'
-    mvn-settings: 'sdc-settings'
-
-- project:
-    name: sdc-clm-onboarding
+    name: sdc-clm
     jobs:
       - gerrit-maven-clm:
           build-timeout: 120
           submodule-timeout: 30
-          mvn-params: '-P onboarding -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
     nexus-iq-namespace: 'onap-'
     project: sdc
-    project-name: 'sdc-onboarding'
+    project-name: 'sdc'
     build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
     mvn-settings: 'sdc-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-info
     mvn-clean-install: true
     project: 'sdc'
     branch: master
+    java-version: openjdk11
index 0b04a27..4e5b1c2 100644 (file)
@@ -21,7 +21,7 @@
           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
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -41,7 +45,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     project: 'sdnc/apps'
     project-name: 'sdnc-apps'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
 
 #
 #- project:
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'
 
 - project:
index 4450a34..71f7180 100644 (file)
@@ -1,18 +1,20 @@
 ---
 - project:
-    name: sdnc-csit
+    name: sdnc-oam-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'sdnc'
+      - '{project-name}-review-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          maven-versions-plugin: true
+      - '{project-name}-merge-verification-maven-{stream}':
+          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+          maven-versions-plugin: true
+    project-name: 'sdnc-oam'
     recipients: 'dtimoney@att.com'
+    # project name in gerrit
+    project: 'sdnc/oam'
     stream:
       - 'master':
           branch: 'master'
-    functionality:
-      - 'healthcheck':
-          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
-      - 'sdnc_netconf_tls_post_deploy':
-          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
+    mvn-settings: 'sdnc-oam-settings'
     robot-options: ''
     branch: 'master'
index ee7c79d..9ba264e 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: "mvn36"
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -49,7 +53,8 @@
     branch: 'master'
     mvn-settings: 'sdnc-northbound-settings'
     mvn-goals: 'clean install'
-    maven-version: "mvn35"
+    java-version: openjdk11
+    mvn-version: "mvn36"
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
@@ -64,6 +69,8 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'sdnc-northbound-settings'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 - project:
     name: sdnc-northbound-info
index 428251a..7380359 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-version: "mvn36"
     mvn-settings: 'sdnc-oam-settings'
     maven-version: "mvn35"
     files: '**'
@@ -69,6 +71,8 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'sdnc-oam-settings'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 - project:
     name: sdnc-oam-info
diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
deleted file mode 100644 (file)
index ae86ef5..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- 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
similarity index 52%
rename from jjb/aai/aai-esr-server.yaml
rename to jjb/so/so-adapters-so-cnf-adapter.yaml
index 1c8b961..e0f1fa1 100644 (file)
@@ -1,13 +1,21 @@
 ---
 - project:
-    name: aai-esr-server-project-view
-    project-name: aai-esr-server
+    name: so-adapters-so-cnf-adapter-project-view
+    project-name: so-adapters-so-cnf-adapter
     views:
       - project-view
 
 - project:
-    name: aai-esr-server-master
-    project-name: 'aai-esr-server'
+    name: so-adapters-so-cnf-adapter-info
+    project: so/adapters/so-cnf-adapter
+    project-name: so-adapters-so-cnf-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: so-adapters-so-cnf-adapter
+    project-name: 'so-adapters-so-cnf-adapter'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
           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
+          build-node: ubuntu1804-docker-v1-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: 'aai/esr-server'
+    project: 'so/adapters/so-cnf-adapter'
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'aai-esr-server-settings'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: 'so-adapters-so-cnf-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
-    name: aai-esr-server-sonar
+    name: so-adapters-so-cnf-adapter-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'aai/esr-server'
-    project-name: 'aai-esr-server'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/adapters/so-cnf-adapter'
+    project-name: 'so-adapters-so-cnf-adapter'
     branch: 'master'
-    mvn-settings: 'aai-esr-server-settings'
+    mvn-settings: 'so-adapters-so-cnf-adapter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: aai-esr-server-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/esr-server'
-    project-name: 'aai-esr-server'
-    stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'aai-esr-server-settings'
-
-- project:
-    name: aai-esr-server-info
-    project-name: aai-esr-server
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/esr-server
-    branch: master
diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
new file mode 100644 (file)
index 0000000..86f3f21
--- /dev/null
@@ -0,0 +1,79 @@
+---
+- project:
+    name: so-adapters-so-etsi-sol003-adapter-project-view
+    project-name: so-adapters-so-etsi-sol003-adapter
+    views:
+      - project-view
+
+- project:
+    name: so-adapters-so-etsi-sol003-adapter-info
+    project: so/adapters/so-etsi-sol003-adapter
+    project-name: so-adapters-so-etsi-sol003-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: so-adapters-so-etsi-sol003-adapter
+    project-name: 'so-adapters-so-etsi-sol003-adapter'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-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: '-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/adapters/so-etsi-sol003-adapter'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-v1-8c-8g
+
+- project:
+    name: so-adapters-so-etsi-sol003-adapter-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'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/adapters/so-etsi-sol003-adapter'
+    project-name: 'so-adapters-so-etsi-sol003-adapter'
+    branch: 'master'
+    mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: so-adapters-so-etsi-sol003-adapter-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'so/adapters/so-etsi-sol003-adapter'
+    project-name: 'so-adapters-so-etsi-sol003-adapter'
+    build-node: ubuntu1804-docker-v1-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
new file mode 100644 (file)
index 0000000..2d1a8d5
--- /dev/null
@@ -0,0 +1,65 @@
+---
+- project:
+    name: so-adapters-so-etsi-sol005-adapter-project-view
+    project-name: so-adapters-so-etsi-sol005-adapter
+    views:
+      - project-view
+
+- project:
+    name: so-adapters-so-etsi-sol005-adapter-info
+    project: so/adapters/so-etsi-sol005-adapter
+    project-name: so-adapters-so-etsi-sol005-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: so-adapters-so-etsi-sol005-adapter
+    project-name: 'so-adapters-so-etsi-sol005-adapter'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-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: '-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/adapters/so-etsi-sol005-adapter'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-v1-8c-8g
+
+- project:
+    name: so-adapters-so-etsi-sol005-adapter-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'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/adapters/so-etsi-sol005-adapter'
+    project-name: 'so-adapters-so-etsi-sol005-adapter'
+    branch: 'master'
+    mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
new file mode 100644 (file)
index 0000000..a39a460
--- /dev/null
@@ -0,0 +1,65 @@
+---
+- project:
+    name: so-adapters-so-nssmf-adapter-project-view
+    project-name: so-adapters-so-nssmf-adapter
+    views:
+      - project-view
+
+- project:
+    name: so-adapters-so-nssmf-adapter-info
+    project: so/adapters/so-nssmf-adapter
+    project-name: so-adapters-so-nssmf-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: so-adapters-so-nssmf-adapter
+    project-name: 'so-adapters-so-nssmf-adapter'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-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: '-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/adapters/so-nssmf-adapter'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-v1-8c-8g
+
+- project:
+    name: so-adapters-so-nssmf-adapter-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'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/adapters/so-nssmf-adapter'
+    project-name: 'so-adapters-so-nssmf-adapter'
+    branch: 'master'
+    mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
new file mode 100644 (file)
index 0000000..2138fcf
--- /dev/null
@@ -0,0 +1,65 @@
+---
+- project:
+    name: so-adapters-so-oof-adapter-project-view
+    project-name: so-adapters-so-oof-adapter
+    views:
+      - project-view
+
+- project:
+    name: so-adapters-so-oof-adapter-info
+    project: so/adapters/so-oof-adapter
+    project-name: so-adapters-so-oof-adapter
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: so-adapters-so-oof-adapter
+    project-name: 'so-adapters-so-oof-adapter'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-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: '-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/adapters/so-oof-adapter'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: 'so-adapters-so-oof-adapter-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-v1-8c-8g
+
+- project:
+    name: so-adapters-so-oof-adapter-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'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/adapters/so-oof-adapter'
+    project-name: 'so-adapters-so-oof-adapter'
+    branch: 'master'
+    mvn-settings: 'so-adapters-so-oof-adapter-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index d976f85..d142a34 100644 (file)
@@ -1,6 +1,7 @@
 ---
 - project:
     name: so-csit
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     functionality:
-      - 'integration-testing':
-          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-      - 'integration-etsi-testing':
-          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+# integration testing suites disabled until brought up to date,
+# see https://jira.onap.org/browse/SO-3632
+#      - 'integration-testing':
+#          trigger_jobs:
+#      - 'integration-etsi-testing':
+#          trigger_jobs:
+      - 'macroflow':
+          trigger_jobs:
     robot-options: ''
index c6d9ab5..c7d7bb7 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     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
@@ -30,6 +33,7 @@
 
 - project:
     name: so-libs-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -41,6 +45,7 @@
     build-node: ubuntu1804-builder-4c-4g
     project: 'so/libs'
     project-name: 'so-libs'
+    java-version: openjdk11
     branch: 'master'
     mvn-settings: 'so-libs-settings'
     mvn-goals: 'clean install'
 
 - project:
     name: so-libs-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: so/libs
     project-name: 'so-libs'
+    java-version: openjdk11
     branch: 'master'
     mvn-settings: 'so-libs-settings'
 
 - project:
     name: so-libs-info
     project-name: so-libs
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: so/libs
     branch: master
-    branch: elalto
+    branch: guilin
diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
new file mode 100644 (file)
index 0000000..7e56144
--- /dev/null
@@ -0,0 +1,108 @@
+---
+- project:
+    name: so-so-admin-cockpit-project-view
+    project-name: so-so-admin-cockpit
+    views:
+      - project-view
+
+- project:
+    name: so-so-admin-cockpit-info
+    project: so/so-admin-cockpit
+    project-name: so-so-admin-cockpit
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: so-so-admin-cockpit
+    project-name: 'so-so-admin-cockpit'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-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: '-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/so-admin-cockpit'
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: 'so-so-admin-cockpit-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-v1-8c-8g
+
+- project:
+    name: so-so-admin-cockpit-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'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/so-admin-cockpit'
+    project-name: 'so-so-admin-cockpit'
+    branch: 'master'
+    mvn-settings: 'so-so-admin-cockpit-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: 'so-so-admin-cockpit-coverity'
+    java-version: openjdk11
+    jobs:
+      - 'onap-gerrit-maven-coverity'
+    cron: '@daily'
+    build-node: 'ubuntu1804-docker-v1-8c-8g'
+    project: 'so/so-admin-cockpit'
+    project-name: 'so-so-admin-cockpit'
+    branch: 'master'
+    mvn-settings: 'so-so-admin-cockpit-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-admin-cockpit-monitoring-workflow/so-admin-cockpit-monitoring-workflow-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-so-admin-cockpit-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'so/so-admin-cockpit'
+    project-name: 'so-so-admin-cockpit'
+    build-node: ubuntu1804-docker-v1-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'so-so-admin-cockpit-settings'
similarity index 55%
rename from jjb/aai/aai-data-router.yaml
rename to jjb/so/so-so-etsi-nfvo.yaml
index 823dab7..5a54d93 100644 (file)
@@ -1,13 +1,21 @@
 ---
 - project:
-    name: aai-data-router-project-view
-    project-name: aai-data-router
+    name: so-so-etsi-nfvo-project-view
+    project-name: so-so-etsi-nfvo
     views:
       - project-view
 
 - project:
-    name: aai-data-router-master
-    project-name: 'aai-data-router'
+    name: so-so-etsi-nfvo-info
+    project: so/so-etsi-nfvo
+    project-name: so-so-etsi-nfvo
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: so-so-etsi-nfvo
+    project-name: 'so-so-etsi-nfvo'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
           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
+          build-node: ubuntu1804-docker-v1-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: 'aai/data-router'
+    project: 'so/so-etsi-nfvo'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
       - 'master':
           branch: 'master'
-    mvn-settings: 'aai-data-router-settings'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
+    mvn-settings: 'so-so-etsi-nfvo-settings'
     files: '**'
     archive-artifacts: ''
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
-    name: aai-data-router-sonar
+    name: so-so-etsi-nfvo-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
-    project: 'aai/data-router'
-    project-name: 'aai-data-router'
+    max-git-repo-age-hours: 48
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: 'so/so-etsi-nfvo'
+    project-name: 'so-so-etsi-nfvo'
     branch: 'master'
-    mvn-settings: 'aai-data-router-settings'
+    mvn-settings: 'so-so-etsi-nfvo-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
-    name: aai-data-router-clm
+    name: so-so-etsi-nfvo-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    project: 'aai/data-router'
-    project-name: 'aai-data-router'
+    project: 'so/so-etsi-nfvo'
+    project-name: 'so-so-etsi-nfvo'
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'aai-data-router-settings'
-
-- project:
-    name: aai-data-router-info
-    project-name: aai-data-router
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/data-router
-    branch: master
+    mvn-settings: 'so-so-etsi-nfvo-settings'
index fd41484..6fae06b 100644 (file)
@@ -2,6 +2,7 @@
 - project:
     name: so-project-view
     project-name: so
+    java-version: openjdk11
     views:
       - project-view
 
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
@@ -38,6 +42,7 @@
 
 - project:
     name: so-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -57,6 +62,7 @@
 
 - project:
     name: 'so-coverity'
+    java-version: openjdk11
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
@@ -85,6 +91,7 @@
 
 - project:
     name: so-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
 - project:
     name: so-info
     project-name: so
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: so
     branch: master
-    branch: frankfurt
+    branch: guilin
+    branch: honolulu
index b1b3f54..1486ba9 100644 (file)
@@ -43,3 +43,7 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
diff --git a/jjb/testsuite/testsuite-cds-mock-odl.yaml b/jjb/testsuite/testsuite-cds-mock-odl.yaml
new file mode 100644 (file)
index 0000000..65c818c
--- /dev/null
@@ -0,0 +1,70 @@
+---
+- project:
+    name: testsuite-cds-mock-odl-project-view
+    project-name: testsuite-cds-mock-odl
+    views:
+      - project-view
+
+- project:
+    name: testsuite-cds-mock-odl-info
+    project: testsuite/cds-mock-odl
+    project-name: testsuite-cds-mock-odl
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: testsuite-cds-mock-odl-linters
+    project: 'testsuite/cds-mock-odl'
+    project-name: 'testsuite-cds-mock-odl'
+    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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
+
+- project:
+    name: 'testsuite-cds-mock-odl-docker'
+    jobs:
+      - gerrit-docker-verify:
+          project-name: 'testsuite-cds-mock-odl'
+          docker-root: .
+          docker-name: 'onap/cds-mock-odl'
+          docker-build-args: '-f ./docker/Dockerfile'
+      - gerrit-docker-merge:
+          project-name: 'testsuite-cds-mock-odl'
+          docker-root: .
+          docker-name: 'onap/cds-mock-odl'
+          docker-build-args: '-f ./docker/Dockerfile'
+    project: 'testsuite/cds-modk-odl'
+    stream:
+      - 'master':
+            branch: 'master'
+            files: ''
+    docker-root: '$WORKSPACE'
+    mvn-settings: 'testsuite-cds-mock-odl-settings'
+    build-node: ubuntu1804-docker-8c-8g
+    cron: '@daily'
+    container-tag-method: stream
diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml
new file mode 100644 (file)
index 0000000..c6bc7a3
--- /dev/null
@@ -0,0 +1,47 @@
+---
+- project:
+    name: testsuite-cds-mock-server-project-view
+    project-name: testsuite-cds-mock-server
+    views:
+      - project-view
+
+- project:
+    name: testsuite-cds-mock-server-info
+    project: testsuite/cds-mock-server
+    project-name: testsuite-cds-mock-server
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: testsuite-cds-mock-server-linters
+    project: 'testsuite/cds-mock-server'
+    project-name: 'testsuite-cds-mock-server'
+    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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
+
diff --git a/jjb/testsuite/testsuite-cds-mock-ssh.yaml b/jjb/testsuite/testsuite-cds-mock-ssh.yaml
new file mode 100644 (file)
index 0000000..9fad20f
--- /dev/null
@@ -0,0 +1,47 @@
+---
+- project:
+    name: testsuite-cds-mock-ssh-project-view
+    project-name: testsuite-cds-mock-ssh
+    views:
+      - project-view
+
+- project:
+    name: testsuite-cds-mock-ssh-info
+    project: testsuite/cds-mock-ssh
+    project-name: testsuite-cds-mock-ssh
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: testsuite-cds-mock-ssh-linters
+    project: 'testsuite/cds-mock-ssh'
+    project-name: 'testsuite-cds-mock-ssh'
+    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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
+
diff --git a/jjb/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml
new file mode 100644 (file)
index 0000000..2fef96a
--- /dev/null
@@ -0,0 +1,40 @@
+---
+- project:
+    name: testsuite-cds-info
+    project: testsuite/cds
+    project-name: testsuite-cds
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: testsuite-cds-linters
+    project: 'testsuite/cds'
+    project-name: 'testsuite-cds'
+    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'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
index 77f8cb5..e0f9c9f 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'testsuite-heatbridge-settings'
     files: '**'
     archive-artifacts: ''
index a8993e1..fd84d7e 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'testsuite-python-testing-utils-settings'
     files: '**'
     archive-artifacts: ''
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'testsuite-python-testing-utils-settings'
     build-node: 'centos7-builder-4c-4g'
     subproject:
index cb70a08..0ea7129 100644 (file)
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'testsuite-settings'
 
 - project:
           tox-dir: '.'
           tox-envs: 'json'
           pattern: '**/*.json'
-#      - 'robot':
-#          tox-dir: '.'
-#          tox-envs: 'robot'
-#          pattern: '**/*.robot'
+      - 'robot':
+          tox-dir: '.'
+          tox-envs: 'robot'
+          pattern: 'robot/testsuites/usecases/*.robot'
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
diff --git a/jjb/ubuntu-latest-nodejs.sh b/jjb/ubuntu-latest-nodejs.sh
new file mode 100644 (file)
index 0000000..04e3a10
--- /dev/null
@@ -0,0 +1,18 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2021 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 "---> ubuntu-latest-nodejs.sh"
+
+set -eufo pipefail
+
+sudo apt update
+sudo apt install -y nodejs npm
+sudo npm install -g n
+sudo n stable
index 8e70983..c9e70d8 100644 (file)
@@ -1,20 +1,4 @@
 ---
-- project:
-    name: usecases-5G-bulkpm-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecases-5G-bulkpm'
-    recipients: 'morgan.richomm@orange.com bf1936@att.com lego@est.tech'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - '5G-bulkpm':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
-    robot-options: ''
-
 - project:
     name: usecases-pnf-sw-upgrade
     jobs:
@@ -28,7 +12,6 @@
     functionality:
       - 'pnf-sw-upgrade':
           trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
 
 - project:
@@ -44,6 +27,4 @@
     functionality:
       - 'config-over-netconf':
           trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''
-
similarity index 62%
rename from jjb/music/music.yaml
rename to jjb/usecaseui/usecase-ui-nlp.yaml
index 0d15236..bb984ae 100644 (file)
@@ -1,13 +1,13 @@
 ---
-- project:
-    name: music-project-view
-    project-name: music
-    views:
-      - project-view
 
 - project:
-    name: music
-    project-name: 'music'
+    name: usecase-ui-nlp
+    project-name: 'usecase-ui-nlp'
+    project: 'usecase-ui/nlp'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'usecase-ui-nlp-settings'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
           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':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: music-sonar
+    name: usecase-ui-nlp-sonar
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1804-builder-4c-4g
-    project: 'music'
-    project-name: 'music'
+    project: 'usecase-ui/nlp'
+    project-name: 'usecase-ui-nlp'
     branch: 'master'
-    mvn-settings: 'music-settings'
+    mvn-settings: 'usecase-ui-nlp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-
 - project:
-    name: music-clm
+    name: usecase-ui-nlp-clm
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    project: music
-    project-name: 'music'
+    project: usecase-ui/nlp
+    project-name: 'usecase-ui-nlp'
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
-    mvn-settings: 'music-settings'
+    mvn-settings: 'usecase-ui-nlp-settings'
 
 - project:
-    name: music-info
-    project-name: music
+    name: usecase-ui-nlp-info
+    project-name: usecase-ui-nlp
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
-    project: music
+    project: usecase-ui/nlp
     branch: master
+
+- project:
+    name: usecase-ui-nlp-project-view
+    project-name: usecase-ui-nlp
+    views:
+      - project-view
index f878452..1db7b67 100644 (file)
@@ -2,6 +2,7 @@
 - project:
     name: vfc-nfvo-driver-svnfm-huawei
     project-name: 'vfc-nfvo-driver-svnfm-huawei'
+    java-version: openjdk11
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     stream:
       - 'master':
@@ -28,6 +29,7 @@
 
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -47,6 +49,7 @@
 
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm:
           mvn-params: '-f huawei/pom.xml'
@@ -60,6 +63,7 @@
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-info
     project-name: vfc-nfvo-driver-svnfm-huawei
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
index 6f734e5..7722ce0 100644 (file)
           branch: 'master'
     functionality:
       - 'healthCheck':
-          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+          trigger_jobs:
     robot-options: ''
-
-#- project:
-#    name: vid-csit-arm64
-#    jobs:
-#      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-#      - '{project-name}-arm64-{stream}-csit-{functionality}'
-#    project-name: 'vid'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    functionality:
-#      - 'healthCheck':
-#          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-#    robot-options: ''
index 75da082..748bb5e 100644 (file)
@@ -27,8 +27,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
@@ -53,7 +53,7 @@
 - project:
     name: vid-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar-prescan-script
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -67,6 +67,7 @@
     mvn-settings: 'vid-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
     name: vid-clm
index 69f158c..0df13c5 100644 (file)
@@ -66,5 +66,4 @@
       - lf-provide-maven-settings-cleanup
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
diff --git a/jjb/vnfsdk/generate-dosc.sh b/jjb/vnfsdk/generate-dosc.sh
new file mode 100644 (file)
index 0000000..06b00ab
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cd $WORKSPACE/csarvalidation/python/
+virtualenv -p python3 ./venv
+source ./venv/bin/activate
+pip install --upgrade pip
+pip install -r ./requirements.txt
+
+cd ./main
+export OUTPUT_DIRECTORY="$WORKSPACE/generated/active-validation-rules/Honolulu/"
+python3 ./generate_active_validation_rules_table.py
diff --git a/jjb/vnfsdk/upload-artifact.sh b/jjb/vnfsdk/upload-artifact.sh
new file mode 100644 (file)
index 0000000..f384f47
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e -o pipefail
+if [ -z "$PROJECT_ID" ]
+then
+    echo "ERROR: NO PROJECT ID ENTERED"
+    exit 1
+else
+    cd $WORKSPACE/generated/active-validation-rules/Honolulu/
+    for FILE_NAME in *.csv ; do
+        echo "-n --upload-file $FILE_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$FILE_NAME"
+        curl -n --upload-file "$FILE_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$FILE_NAME"
+    done
+    exit 0
+fi
diff --git a/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml b/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml
new file mode 100644 (file)
index 0000000..2a970b3
--- /dev/null
@@ -0,0 +1,14 @@
+- project:
+    name: vnfsdk-marketplace-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vnfsdk-marketplace'
+    recipients: 'kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'testsuites':
+          trigger_jobs:
+    robot-options: ''
diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
new file mode 100644 (file)
index 0000000..bff645b
--- /dev/null
@@ -0,0 +1,14 @@
+- project:
+    name: vnfsdk-refrepo-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vnfsdk-refrepo'
+    recipients: 'kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'testsuites':
+          trigger_jobs:
+    robot-options: ''
index d435641..ffc6c06 100644 (file)
           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':
-          branch: 'master'
+        - 'master':
+                branch: 'master'
+                java-version: openjdk11
+        - 'frankfurt':
+                branch: 'frankfurt'
+                java-version: openjdk8
     mvn-settings: 'vnfsdk-refrepo-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: vnfsdk-refrepo-arm64
-#    project-name: 'vnfsdk-refrepo-arm64'
-#    jobs:
-#      - '{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'
-#      - '{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'
-#    project: 'vnfsdk/refrepo'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'vnfsdk-refrepo-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#
 - project:
     name: vnfsdk-refrepo-sonar
     jobs:
       - gerrit-maven-sonar
+    java-version: openjdk11
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -81,6 +60,7 @@
 
 - project:
     name: vnfsdk-refrepo-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
index 3d5a602..55a0117 100644 (file)
         build-node: centos7-docker-8c-8g
     project: 'vnfsdk/validation'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+            branch: 'master'
+            java-version: openjdk11
+        - 'frankfurt':
+            branch: 'frankfurt'
+            java-version: openjdk8
     mvn-settings: 'vnfsdk-validation-settings'
     files: '**'
     archive-artifacts: ''
@@ -24,6 +28,7 @@
     name: vnfsdk-validation-sonar
     jobs:
       - gerrit-maven-sonar
+    java-version: openjdk11
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
@@ -49,6 +54,7 @@
 
 - project:
     name: vnfsdk-validation-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vnfsdk-validation-settings'
+
+- project:
+      name: vnfsdk-validation-upload-docs
+      project: 'vnfsdk/validation'
+      project-name: 'vnfsdk-requirements'
+      mvn-settings: 'vnfsdk-validation-settings'
+      mvn-global-settings: 'global-settings'
+      stream:
+          - 'master':
+                branch: 'master'
+      jobs:
+          - '{project-name}-{stream}-build-and-upload':
+                pre_script: !include-raw-escape: ./generate-dosc.sh
+                project_id: org.onap.vnfsdk.validation
+                post_script: !include-raw-escape: ./upload-artifact.sh
index da5d5cf..74b6be7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100
+Subproject commit 74b6be7301b5c407d1ccf4cf6093b3b8cd308ad7
index daecffe..479be53 100644 (file)
   vars:
     kubectl_version: 1.15.11
     helm_version: 2.16.6
+    helm3_3_version: 3.3.4
+    helm3_5_version: 3.5.1
+    chartmuseum_version: 0.12.0
 
   tasks:
     - name: 'Install kubectl {{kubectl_version}}'
       get_url:
-        url: https://storage.googleapis.com/kubernetes-release/release/v{{kubectl_version}}/bin/linux/amd64/kubectl
+        url: "https://storage.googleapis.com/kubernetes-release/release/v{{kubectl_version}}/bin/linux/amd64/kubectl"
         dest: /usr/local/bin/kubectl
         mode: 0775
       become: yes
 
     - name: 'Install Helm {{helm_version}}'
       block:
-        - name: 'Fetch tar.gz'
+        - name: 'Fetch tar.gz for {{helm_version}}'
           get_url:
-            url: http://storage.googleapis.com/kubernetes-helm/helm-v{{helm_version}}-linux-amd64.tar.gz
-            dest: /tmp/helm-v{{helm_version}}-linux-amd64.tar.gz
-        - name: 'Unarchive'
+            url: "http://storage.googleapis.com/kubernetes-helm/helm-v{{helm_version}}-linux-amd64.tar.gz"
+            dest: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz"
+        - name: 'Unarchive {{helm_version}}'
           unarchive:
-            src: /tmp/helm-v{{helm_version}}-linux-amd64.tar.gz
+            src: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz"
             dest: /tmp
             remote_src: true
           become: yes
-        - name: 'Move helm to /usr/local/bin and set as executable'
+        - name: 'Move {{helm_version}} bin to /usr/local/bin and set as executable'
           command: 'mv /tmp/linux-amd64/helm /usr/local/bin/helm'
           become: yes
-        - name: 'Check helm.'
+        - name: 'Check Helm {{helm_version}}'
           command: 'which helm'
-        - name: 'Check kubectl.'
+
+    - name: 'Install Helm 3.3 {{helm3_3_version}}'
+      block:
+        - name: 'Create directory /tmp/helm3_3'
+          file:
+            path: /tmp/helm3_3
+            state: directory
+        - name: 'Fetch tar.gz for Helm 3.3'
+          get_url:
+            url: "https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3_3
+        - name: 'Unarchive Helm 3.3'
+          unarchive:
+            src: "/tmp/helm3_3/helm-v{{helm3_3_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3_3
+            remote_src: true
+          become: yes
+        - name: 'Move Helm 3.3 bin to /usr/local/bin and set as executable'
+          command: 'mv /tmp/helm3_3/linux-amd64/helm /usr/local/bin/helm3.3'
+          become: yes
+        - name: 'Check Helm 3.3'
+          command: 'which helm3.3'
+        - name: 'Check kubectl {{kubectl_version}}'
           command: 'which kubectl'
+
+        - name: 'Install Helm 3.3'
+          shell: |
+             echo "----> Installing helm 3.3"
+             wget 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz'
+             tar -xvf 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz'
+             mv linux-amd64/helm /usr/local/bin/helm3.3
+             which helm3.3
+          become: true
+
+    - name: 'Install Helm3.5 {{helm3_5_version}}'
+      block:
+        - name: 'Create directory /tmp/helm3.5'
+          file:
+            path: /tmp/helm3.5
+            state: directory
+        - name: 'Fetch tar.gz for Helm 3.5'
+          get_url:
+            url: "https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.5
+        - name: 'Unarchive Helm 3.5'
+          unarchive:
+            src: "/tmp/helm3.5/helm-v{{helm3_5_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.5
+            remote_src: true
+          become: yes
+        - name: 'Move Helm 3.5 bin to /usr/local/bin and set as executable'
+          command: 'mv /tmp/helm3.5/linux-amd64/helm /usr/local/bin/helm3.5'
+          become: yes
+        - name: 'Check Helm 3.5'
+          command: 'which helm3.5'
+        - name: 'Check kubectl {{kubectl_version}}'
+          command: 'which kubectl'
+
+        - name: 'Install Helm 3.5'
+          shell: |
+             echo "----> Installing helm3.5"
+             wget 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
+             tar -xvf 'https://get.helm.sh/helm-v{{helm3_5_version}}-linux-amd64.tar.gz'
+             mv linux-amd64/helm /usr/local/bin/helm3.5
+             which helm3.5
+          become: true
+
+    - name: 'Install ChartMuseum {{chartmuseum_version}}'
+      block:
+        - name: 'Fetch bin for ChartMuseum'
+          get_url:
+            url: "https://s3.amazonaws.com/chartmuseum/release/v{{ chartmuseum_version }}/bin/linux/amd64/chartmuseum"
+            dest: /usr/local/bin/chartmuseum
+            mode: "0755"
+          become: yes
+        - name: 'Check ChartMuseum {{chartmuseum_version}}'
+          command: 'which chartmuseum'
index 3460981..18017b8 100644 (file)
       become: true
       when: ansible_distribution == 'Ubuntu'
 
+    - name: Install Python 3.8
+      apt:
+        name:
+          - python3.8
+          - python3.8-dev
+          - python3.8-tk
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install Python 3.9
+      apt:
+        name:
+          - python3.9
+          - python3.9-dev
+          - python3.9-tk
+          - python3.9-distutils
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
     - name: Install libssl1.0-dev dep
       apt:
         name: libssl1.0-dev
index 0948cd0..5d9b7c3 100644 (file)
       become: true
       when: ansible_distribution == 'Ubuntu'
 
+    - name: Install Python 3.8
+      apt:
+        name:
+          - python3.8
+          - python3.8-dev
+          - python3.8-tk
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install Python 3.9
+      apt:
+        name:
+          - python3.9
+          - python3.9-dev
+          - python3.9-tk
+          - python3.9-distutils
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
     - name: Install nodejs-dev libssl1.0-dev dep
       apt:
         name:
index 51a151c..93f9161 100644 (file)
@@ -14,7 +14,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - helm - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-builder-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
index 5bf1783..cd6daee 100644 (file)
@@ -14,7 +14,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "{{user `distro`}} - memcached - {{user `arch`}} - {{isotime \"20180101-1003\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
index 87caeee..b52a8ac 100644 (file)
@@ -14,7 +14,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20180101-1003\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
old mode 100644 (file)
new mode 100755 (executable)
index fb2f810..d899043
@@ -2,8 +2,9 @@
 # Ensure we fail the job if any steps fail
 set -e -o pipefail
 
-# client only init, tiller will not be installed
-helm init --client-only
-cd kubernetes/ || exit
-make repo
-cd ..
+mkdir -p ".chartstorage"
+
+chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" &> /dev/null &
+source helm.prop
+$HELM_BIN plugin install https://github.com/chartmuseum/helm-push.git
+$HELM_BIN repo add local http://localhost:6464
diff --git a/shell/helm2-repo-init.sh b/shell/helm2-repo-init.sh
new file mode 100755 (executable)
index 0000000..23bcdce
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+# Ensure we fail the job if any steps fail
+set -e -o pipefail
+
+# client only init, tiller will not be installed
+helm init --client-only --skip-refresh
+helm repo rm stable
+cd kubernetes/ || exit
+make repo
+cd ..
diff --git a/shell/helm2-verify.sh b/shell/helm2-verify.sh
new file mode 100755 (executable)
index 0000000..c652a5c
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Ensure we fail the job if any steps fail
+set -e -o pipefail
+
+cd kubernetes/
+make all
index 23c5fbd..9c511c5 100755 (executable)
@@ -20,8 +20,7 @@ for chart in "${helm_charts[@]}"; do
       curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$GIT_COMMIT/$chart"
       ;;
     'release')
-      echo "Release automation not implemented yet."
-      exit 1
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart"
         ;;
     *)
       echo "You must set BUILD_TYPE to one of (snapshot, staging, release)."