Merge "Set java11 for policy/api and policy/drools-pdp"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Tue, 14 Jan 2020 19:00:16 +0000 (19:00 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 14 Jan 2020 19:00:16 +0000 (19:00 +0000)
223 files changed:
jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
jjb/aaf/aaf-authz.yaml
jjb/aaf/aaf-cadi.yaml
jjb/aaf/aaf-luaplugin.yaml
jjb/aaf/aaf-sms.yaml
jjb/aaf/aaf-sshsm.yaml
jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-cacher.yaml
jjb/aai/aai-chameleon.yaml [deleted file]
jjb/aai/aai-data-router.yaml
jjb/aai/aai-esr-gui.yaml
jjb/aai/aai-esr-server.yaml
jjb/aai/aai-event-client.yaml
jjb/aai/aai-gallifrey.yaml [deleted file]
jjb/aai/aai-graphadmin.yaml
jjb/aai/aai-graphgraph.yaml
jjb/aai/aai-logging-service.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-rest-client.yaml
jjb/aai/aai-router-core-service.yaml
jjb/aai/aai-schema-service.yaml
jjb/aai/aai-search-data-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-sparky-fe.yaml
jjb/aai/aai-traversal.yaml
jjb/aai/aai-validation.yaml
jjb/appc/appc-cdt.yaml
jjb/appc/appc-deployment.yaml
jjb/appc/appc-master.yaml
jjb/appc/appc-parent.yaml
jjb/ccsdk/apps.yaml
jjb/ccsdk/cds.yaml
jjb/ccsdk/dashboard.yaml
jjb/ccsdk/distribution.yaml
jjb/ccsdk/features.yaml
jjb/ccsdk/parent.yaml
jjb/ccsdk/platform-plugins.yaml
jjb/ccsdk/sli-adaptors.yaml
jjb/ccsdk/sli-core.yaml
jjb/ccsdk/sli-northbound.yaml
jjb/ccsdk/sli-plugins.yaml
jjb/ccsdk/utils.yaml
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/clamp/clamp.yaml
jjb/clamp/dashboard/info-clamp-dashboard.yaml
jjb/clamp/ui/info-clamp-ui.yaml
jjb/cli/cli.yaml
jjb/dcaegen2/dcaegen2-analytics-flink.yaml
jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-analytics-tca.yaml
jjb/dcaegen2/dcaegen2-analytics.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-collectors.yaml
jjb/dcaegen2/dcaegen2-deployments.yaml
jjb/dcaegen2/dcaegen2-platform-adapter.yaml
jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
jjb/dcaegen2/dcaegen2-platform-cli.yaml [deleted file]
jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml [moved from jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml with 51% similarity]
jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-mod.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml [new file with mode: 0644]
jjb/dcaegen2/dcaegen2-platform-plugins.yaml
jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
jjb/dcaegen2/dcaegen2-platform.yaml
jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
jjb/dcaegen2/dcaegen2-services-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml
jjb/dcaegen2/dcaegen2-services-prh.yaml
jjb/dcaegen2/dcaegen2-services-sdk.yaml
jjb/dcaegen2/dcaegen2-services-son-handler.yaml
jjb/dcaegen2/dcaegen2-services.yaml
jjb/dcaegen2/dcaegen2-utils.yaml
jjb/dcaegen2/dcaegen2.yaml
jjb/demo/demo.yaml
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-dbcapi.yaml
jjb/dmaap/dmaap-kafka-docker.yaml
jjb/dmaap/dmaap-kafka.yaml
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-docker.yaml
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
jjb/dmaap/dmaap-zookeeper.yaml
jjb/doc/doc.yaml
jjb/externalapi/externalapi-nbi.yaml
jjb/global-defaults.yaml
jjb/holmes/holmes-common.yaml
jjb/holmes/holmes-engine-mgt.yaml
jjb/holmes/holmes-rule-mgt.yaml
jjb/integration/docker/info-integration-docker.yaml [new file with mode: 0644]
jjb/integration/integration-csit.yaml
jjb/integration/integration.yaml
jjb/integration/xtesting/info-integration-xtesting.yaml
jjb/lf-infra-releasedockerhub.yaml [new file with mode: 0644]
jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
jjb/logging-analytics/logging-analytics.yaml
jjb/modeling/modeling-etsicatalog.yaml
jjb/msb/msb-apigateway.yaml
jjb/msb/msb-discovery.yaml
jjb/msb/msb-java-sdk.yaml
jjb/msb/msb-swagger-sdk.yaml
jjb/multicloud/build-multicloud-openstack-docker-image.sh
jjb/multicloud/multicloud-azure-java.yaml
jjb/multicloud/multicloud-framework-java.yaml
jjb/multicloud/multicloud-framework.yaml
jjb/multicloud/multicloud-k8s.yaml
jjb/multicloud/multicloud-openstack-hpa-csit.yaml [new file with mode: 0644]
jjb/multicloud/multicloud-openstack-vmware-java.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/music/music-distributed-kv-store.yaml
jjb/music/music-mdbc.yaml
jjb/music/music-prom.yaml
jjb/music/music.yaml
jjb/oom/offline-installer.yaml
jjb/oom/oom-oneclick-config.yaml
jjb/oom/oom-registrator.yaml
jjb/oparent/oparent.yaml
jjb/optf/optf-cmso.yaml
jjb/optf/optf-fgps.yaml
jjb/optf/optf-has-csit.yaml [new file with mode: 0644]
jjb/optf/optf-has.yaml
jjb/optf/optf-osdf-csit.yaml [new file with mode: 0644]
jjb/optf/optf-osdf.yaml
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-docker-base-common.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-engine.yaml
jjb/policy/policy-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.yaml
jjb/sdc/sdc-dcae-d-ci.yaml
jjb/sdc/sdc-dcae-d-dt-be-main.yaml
jjb/sdc/sdc-dcae-d-dt-be-property.yaml
jjb/sdc/sdc-dcae-d-dt.yaml
jjb/sdc/sdc-dcae-d-fe.yaml
jjb/sdc/sdc-dcae-d-tosca-lab.yaml
jjb/sdc/sdc-microservices.yaml
jjb/sdc/sdc-onap-ui-angular.yaml
jjb/sdc/sdc-onap-ui-common.yaml
jjb/sdc/sdc-onap-ui-react.yaml
jjb/sdc/sdc-sdc-be-common.yaml
jjb/sdc/sdc-sdc-distribution-client.yaml
jjb/sdc/sdc-sdc-docker-base.yaml
jjb/sdc/sdc-sdc-pubsub.yaml
jjb/sdc/sdc-sdc-tosca.yaml
jjb/sdc/sdc-sdc-workflow-designer.yaml
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-northbound.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/sdnc/sdnc-oom.yaml
jjb/so/so-libs.yaml
jjb/so/so.yaml
jjb/testsuite/testsuite-heatbridge.yaml
jjb/testsuite/testsuite-python-testing-utils.yaml
jjb/testsuite/testsuite.yaml
jjb/usecaseui/usecase-ui-server.yaml
jjb/usecaseui/usecase-ui.yaml
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
jjb/vfc/vfc-gvnfm-vnfres-java.yaml
jjb/vfc/vfc-nfvo-catalog.yaml
jjb/vfc/vfc-nfvo-db.yaml
jjb/vfc/vfc-nfvo-driver-ems-java.yaml
jjb/vfc/vfc-nfvo-driver-sfc.yaml
jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
jjb/vfc/vfc-nfvo-multivimproxy.yaml
jjb/vfc/vfc-nfvo-resmanagement.yaml
jjb/vfc/vfc-nfvo-wfengine-java.yaml
jjb/vid/vid.yaml
jjb/vnfrqts/vnfrqts-epics.yaml
jjb/vnfrqts/vnfrqts-guidelines.yaml
jjb/vnfrqts/vnfrqts-requirements.yaml
jjb/vnfrqts/vnfrqts-testcases.yaml
jjb/vnfrqts/vnfrqts-usecases.yaml
jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
jjb/vnfsdk/vnfsdk-functest.yaml
jjb/vnfsdk/vnfsdk-lctest.yaml
jjb/vnfsdk/vnfsdk-model.yaml
jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
jjb/vnfsdk/vnfsdk-refrepo.yaml
jjb/vnfsdk/vnfsdk-validation.yaml
jjb/vnfsdk/vnfsdk-ves-agent.yaml
jjb/vvp/vvp-documentation.yaml
packer/provision/local-builder.yaml
packer/provision/local-docker.yaml
packer/provision/redis.yaml
shell/docker-ts-tag-override.sh [new file with mode: 0755]
shell/run_releasedockerhub.sh [new file with mode: 0644]

index 88b7dc1..791a9b6 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS 7 - redis -  - 260980909-9003
+IMAGE_NAME=CentOS 7 - redis -  - 70180101-1009
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v2-highcpu-4
index fb5c8a7..7b73388 100644 (file)
@@ -64,7 +64,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aaf/authz'
@@ -89,5 +89,6 @@
     project-name: aaf-authz
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/authz
     branch: master
index 8ce0512..65fb395 100644 (file)
@@ -25,7 +25,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aaf/cadi'
@@ -61,7 +61,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aaf/cadi'
@@ -97,7 +97,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aaf/cadi'
     project-name: aaf-cadi
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/cadi
     branch: master
index 8733823..20bf1c8 100644 (file)
@@ -14,5 +14,6 @@
     project-name: aaf-luaplugin
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/luaplugin
     branch: master
index 999fc03..a69daaf 100644 (file)
@@ -31,5 +31,6 @@
     project-name: aaf-sms
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/sms
     branch: master
index 31e7006..1178902 100644 (file)
@@ -25,5 +25,6 @@
     project-name: aaf-sshsm
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/sshsm
     branch: master
index ff9c5f8..a21f0c9 100644 (file)
@@ -37,7 +37,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
@@ -67,6 +67,7 @@
     project-name: aai-aai-common
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/aai-common
     branch: master
 
index 1b9fd76..9f3efcd 100644 (file)
@@ -41,7 +41,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/babel'
@@ -70,5 +70,6 @@
     project-name: aai-babel
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/babel
     branch: master
index 5995634..a578d49 100644 (file)
@@ -36,7 +36,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/cacher'
@@ -66,5 +66,6 @@
     project-name: aai-cacher
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/cacher
     branch: master
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
deleted file mode 100644 (file)
index 4b10074..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- project:
-    name: aai-chameleon-project-view
-    project-name: aai-chameleon
-    views:
-      - project-view
-
-- project:
-    name: aai-chameleon
-    project-name: 'aai-chameleon'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          build-node: ubuntu1604-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/chameleon'
-    stream:
-      - 'elalto':
-          branch: 'elalto'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-chameleon-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: aai-chameleon-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/chameleon'
-    project-name: 'aai-chameleon'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-chameleon-settings'
-
-- project:
-    name: aai-chameleon-info
-    project-name: aai-chameleon
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/chameleon
-    branch: master
index 8f5ff60..ee20e92 100644 (file)
@@ -40,7 +40,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/data-router'
@@ -67,5 +67,6 @@
     project-name: aai-data-router
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/data-router
     branch: master
index c32692d..ef1a858 100644 (file)
@@ -52,5 +52,6 @@
     project-name: aai-esr-gui
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/esr-gui
     branch: master
index 016c804..952eebe 100644 (file)
@@ -43,7 +43,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/esr-server'
@@ -70,5 +70,6 @@
     project-name: aai-esr-server
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/esr-server
     branch: master
index db026cf..327eced 100644 (file)
@@ -35,7 +35,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/event-client'
@@ -62,5 +62,6 @@
     project-name: aai-event-client
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/event-client
     branch: master
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
deleted file mode 100644 (file)
index cbce3ed..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- project:
-    name: aai-gallifrey
-    project-name: 'aai-gallifrey'
-    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: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          build-node: ubuntu1604-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/gallifrey'
-    stream:
-      - 'elalto':
-          branch: 'elalto'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gallifrey-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: aai-gallifrey-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/gallifrey'
-    project-name: 'aai-gallifrey'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gallifrey-settings'
-
-- project:
-    name: aai-gallifrey-info
-    project-name: aai-gallifrey
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/gallifrey
-    branch: master
index 2accf99..0fb84cd 100644 (file)
@@ -42,7 +42,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/graphadmin'
@@ -71,5 +71,6 @@
     project-name: aai-graphadmin
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/graphadmin
     branch: master
index 67b3b94..68f6940 100644 (file)
@@ -37,6 +37,7 @@
     project-name: aai-graphgraph
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/graphgraph
     branch: master
 
@@ -48,7 +49,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/graphgraph'
index 22a6628..1c0dc70 100644 (file)
@@ -35,7 +35,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/logging-service'
@@ -62,5 +62,6 @@
     project-name: aai-logging-service
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/logging-service
     branch: master
index e6eca29..25f4782 100644 (file)
@@ -41,7 +41,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/model-loader'
@@ -68,6 +68,7 @@
     project-name: aai-model-loader
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/model-loader
     branch: master
 
index 9dac98e..0aa2168 100644 (file)
@@ -42,7 +42,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/resources'
@@ -71,6 +71,7 @@
     project-name: aai-resources
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/resources
     branch: master
 
index b7ee329..ffe1633 100644 (file)
@@ -35,7 +35,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/rest-client'
@@ -62,5 +62,6 @@
     project-name: aai-rest-client
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/rest-client
     branch: master
index e4eaab9..9cb614e 100644 (file)
@@ -35,7 +35,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/router-core'
@@ -62,5 +62,6 @@
     project-name: aai-router-core
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/router-core
     branch: master
index 0361dbb..9351c85 100644 (file)
@@ -42,7 +42,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/schema-service'
@@ -71,5 +71,6 @@
     project-name: aai-schema-service
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/schema-service
     branch: master
index b8d3353..a780e9c 100644 (file)
@@ -59,7 +59,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/search-data-service'
@@ -86,6 +86,7 @@
     project-name: aai-search-data-service
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/search-data-service
     branch: master
 
index 1408733..c27ea71 100644 (file)
@@ -40,7 +40,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/sparky-be'
@@ -67,6 +67,7 @@
     project-name: aai-sparky-be
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/sparky-be
     branch: master
 
index 9283edf..63596ee 100644 (file)
@@ -26,6 +26,7 @@
     project-name: aai-sparky-fe
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/sparky-fe
     branch: master
 
@@ -37,7 +38,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/sparky-fe'
index cd58d6a..e359715 100644 (file)
@@ -42,7 +42,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/traversal'
@@ -71,5 +71,6 @@
     project-name: aai-traversal
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/traversal
     branch: master
index db0ec41..a755f5e 100644 (file)
@@ -41,7 +41,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/validation'
@@ -69,5 +69,6 @@
     project-name: aai-validation
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aai/validation
     branch: master
index ffd1a87..d52ef08 100644 (file)
@@ -39,5 +39,6 @@
     project-name: appc-cdt
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc/cdt
     branch: master
index e16c110..1a569c0 100644 (file)
@@ -69,5 +69,6 @@
     project-name: appc-deployment
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc/deployment
     branch: master
index 1730afd..9f17454 100644 (file)
@@ -38,7 +38,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-8c-8g
     project: 'appc'
@@ -69,5 +69,6 @@
     project-name: appc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc
     branch: master
index b8f6d88..0ff2d48 100644 (file)
@@ -33,5 +33,6 @@
     project-name: appc-parent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc/parent
     branch: master
index e1ddf76..174f529 100644 (file)
@@ -9,12 +9,13 @@
     name: ccsdk-apps
     project-name: 'ccsdk-apps'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          mvn-params: '-P dependency-list'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          cron: ''
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -40,6 +41,8 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-apps-sonar
@@ -49,7 +52,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'ccsdk/apps'
@@ -96,6 +99,7 @@
     project-name: ccsdk-apps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/apps
     branch: master
 
index cc4c33d..7e6645d 100644 (file)
@@ -3,13 +3,14 @@
     name: ccsdk-cds
     project-name: 'ccsdk-cds'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          mvn-params: '-P dependency-list'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
           maven-versions-plugin: true
+          cron: ''
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -17,6 +18,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
           maven-versions-plugin: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -36,6 +38,8 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-cds-sonar
@@ -45,7 +49,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'ccsdk/cds'
@@ -76,6 +80,7 @@
     project-name: ccsdk-cds
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/cds
     branch: master
 
index 298afa2..8b01af9 100644 (file)
@@ -3,10 +3,12 @@
     name: ccsdk-dashboard
     project-name: 'ccsdk-dashboard'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -25,6 +27,8 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-dashboard-sonar
@@ -34,7 +38,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'ccsdk/dashboard'
@@ -62,6 +66,7 @@
     project-name: ccsdk-dashboard
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/dashboard
     branch: master
 
index eb72293..8e9c9ac 100644 (file)
@@ -3,13 +3,14 @@
     name: ccsdk-distribution
     project-name: 'ccsdk-distribution'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          mvn-params: '-P dependency-list'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
           maven-versions-plugin: true
+          cron: ''
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -17,6 +18,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
           maven-versions-plugin: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'ccsdk/distribution'
@@ -34,6 +36,8 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-docker-8c-8g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 
 #- project:
@@ -72,6 +76,7 @@
     project-name: ccsdk-distribution
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/distribution
     branch: master
 
index 1b5abba..37f13ef 100644 (file)
@@ -3,12 +3,13 @@
     name: ccsdk-features
     project-name: 'ccsdk-features'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          mvn-params: '-P dependency-list'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-features-sonar
@@ -40,7 +43,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'ccsdk/features'
@@ -70,6 +73,7 @@
     project-name: ccsdk-features
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/features
     branch: master
 
index 38ed199..a6ff815 100644 (file)
@@ -6,7 +6,6 @@
       - gerrit-maven-verify
       - gerrit-maven-merge:
           cron: '@daily'
-          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
@@ -54,6 +53,7 @@
     project-name: ccsdk-parent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/parent
     branch: master
 
index e344e88..9ee1504 100644 (file)
@@ -3,11 +3,13 @@
     name: ccsdk-platform-plugins
     project-name: 'ccsdk-platform-plugins'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -26,6 +28,8 @@
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-platform-plugins-sonar
@@ -35,7 +39,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'ccsdk/platform/plugins'
@@ -64,6 +68,7 @@
     project-name: ccsdk-platform-plugins
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/platform/plugins
     branch: master
 
index c274881..7e83f00 100644 (file)
@@ -3,12 +3,13 @@
     name: ccsdk-sli-adaptors
     project-name: 'ccsdk-sli-adaptors'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          mvn-params: '-P dependency-list'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -30,6 +31,8 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-sli-adaptors-sonar
@@ -39,7 +42,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'ccsdk/sli/adaptors'
@@ -70,6 +73,7 @@
     project-name: ccsdk-sli-adaptors
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/sli/adaptors
     branch: master
 
index b84d3ae..73d5b0b 100644 (file)
@@ -3,12 +3,13 @@
     name: ccsdk-sli-core
     project-name: 'ccsdk-sli-core'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          mvn-params: '-P dependency-list'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -30,6 +31,8 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-sli-core-sonar
@@ -39,7 +42,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'ccsdk/sli/core'
@@ -70,6 +73,7 @@
     project-name: ccsdk-sli-core
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/sli/core
     branch: master
 
index ebcc368..cbd12c4 100644 (file)
@@ -3,11 +3,12 @@
     name: ccsdk-sli-northbound
     project-name: 'ccsdk-sli-northbound'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          mvn-params: '-P dependency-list'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -30,6 +31,8 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-sli-northbound-sonar
@@ -39,7 +42,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'ccsdk/sli/northbound'
@@ -70,6 +73,7 @@
     project-name: ccsdk-sli-northbound
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/sli/northbound
     branch: master
 
index 4eec8b2..0997bff 100644 (file)
@@ -3,12 +3,13 @@
     name: ccsdk-sli-plugins
     project-name: 'ccsdk-sli-plugins'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          mvn-params: '-P dependency-list'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -30,6 +31,8 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-sli-plugins-sonar
@@ -39,7 +42,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'ccsdk/sli/plugins'
@@ -69,6 +72,7 @@
     project-name: ccsdk-sli-plugins
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/sli/plugins
     branch: master
 
index 03350a8..3486a30 100644 (file)
@@ -3,11 +3,13 @@
     name: ccsdk-utils
     project-name: 'ccsdk-utils'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -23,6 +25,8 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-utils-clm
@@ -42,6 +46,7 @@
     project-name: ccsdk-utils
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/utils
     branch: master
 
index 8b96a2a..7d3fd78 100644 (file)
@@ -16,6 +16,7 @@
       - centos-7
       - ubuntu-16.04
       - ubuntu-16.04-arm64
+      - ubuntu-18.04
     templates: builder
 
 - project:
index c2f2d5f..79a39f6 100644 (file)
     jobs:
       - gerrit-maven-sonar:
           mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-docker-8c-8g
     project: 'clamp'
@@ -73,5 +78,6 @@
     project-name: clamp
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: clamp
     branch: master
index 273b341..efff6fc 100644 (file)
@@ -4,5 +4,6 @@
     project-name: clamp-dashboard
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: clamp/dashboard
     branch: master
index 64fa743..c532356 100644 (file)
@@ -4,5 +4,6 @@
     project-name: clamp-ui
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: clamp/ui
     branch: master
index 25b06a8..c21ae21 100644 (file)
@@ -64,7 +64,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'cli'
@@ -90,5 +90,6 @@
     project-name: cli
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: cli
     branch: master
index c98abc9..9d76d41 100644 (file)
@@ -4,5 +4,6 @@
     project-name: dcaegen2-analytics-flink
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/analytics/flink
     branch: master
index f5d60d8..7dba3af 100644 (file)
@@ -48,5 +48,6 @@
     project-name: dcaegen2-analytics-pnda
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/analytics/pnda
     branch: master
index 2a4ef29..c3b7ed1 100644 (file)
@@ -55,5 +55,6 @@
     project-name: dcaegen2-analytics-tca-gen2
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/analytics/tca-gen2
     branch: master
index 1ba7b15..21f605f 100644 (file)
@@ -57,5 +57,6 @@
     project-name: dcaegen2-analytics-tca
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/analytics/tca
     branch: master
index 452bd56..80ac689 100644 (file)
@@ -4,5 +4,6 @@
     project-name: dcaegen2-analytics
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/analytics
     branch: master
index ad771b7..89eb6b6 100644 (file)
@@ -62,5 +62,6 @@
     project-name: dcaegen2-collectors-datafile
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/datafile
     branch: master
index e2d6300..ab4e9f5 100644 (file)
@@ -6,6 +6,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
       - 'elalto':
           branch: 'elalto'
     # apply to all jobs
@@ -36,6 +37,7 @@
 
 - project:
     name: dcaegen2-collectors-hv-ves-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     build-node: ubuntu1604-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
 
+
 - project:
     name: dcaegen2-collectors-hv-ves-info
     project-name: dcaegen2-collectors-hv-ves
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/hv-ves
     branch: master
index 189de7a..90f26ef 100644 (file)
@@ -60,5 +60,6 @@
     project-name: dcaegen2-collectors-restconf
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/restconf
     branch: master
index 0ef35e6..02be8dd 100644 (file)
@@ -50,5 +50,6 @@
     project-name: dcaegen2-collectors-snmptrap
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/snmptrap
     branch: master
index fc12da4..d507433 100644 (file)
@@ -34,6 +34,7 @@
 
 - project:
     name: dcaegen2-collectors-ves-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     cron: '@daily'
@@ -61,5 +62,6 @@
     project-name: dcaegen2-collectors-ves
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/ves
     branch: master
index 35e2592..b695e9e 100644 (file)
@@ -4,5 +4,6 @@
     project-name: dcaegen2-collectors
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors
     branch: master
index cb0f944..b707826 100644 (file)
@@ -6,7 +6,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/deployments'
     stream:
       - 'master':
@@ -40,5 +41,6 @@
     project-name: dcaegen2-deployments
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/deployments
     branch: master
index bb0a9f7..a203a75 100644 (file)
     name: dcaegen2-platform-aoadapter
     # root of docker build
     docker-root: adapter/acumos
+    # tag override
+    docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh
     # image name
-    docker-name: '{name}'
+    docker-name: 'onap/{name}'
     stream:
       - master:
             branch: master
     jobs:
       - gerrit-tox-sonar
     cron: '@daily'
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-aoadapter-clm
+    docker-root: adapter/acumos
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project-name: 'dcaegen2-platform-aoadapter-clm'
+    mvn-params: '-f adapter/acumos/pom.xml'
+    branch: 'master'
+
index 2f50063..c00ded6 100644 (file)
@@ -39,5 +39,6 @@
     project-name: dcaegen2-platform-blueprints
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/blueprints
     branch: master
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
deleted file mode 100644 (file)
index 613ef12..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-cli
-    project-name: 'dcaegen2-platform-cli'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/cli'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'dcaegen2-platform-cli-settings'
-    # due to a strange macro / variable translation problem this needs
-    # to be passed as a string block to properly get the properties
-    # correctly defined in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
-    name: dcaegen2-platform-cli-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/platform/cli'
-    project-name: 'dcaegen2-platform-cli'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-cli-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-cli-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/cli
-    build-node: ubuntu1604-docker-8c-8g
-    project-name: 'dcaegen2-platform-cli'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-cli-settings'
-
-- project:
-    name: dcaegen2-platform-cli-info
-    project-name: dcaegen2-platform-cli
-    jobs:
-      - gerrit-info-yaml-verify
-    project: dcaegen2/platform/cli
-    branch: master
index 7b89b1a..670b71d 100644 (file)
@@ -52,3 +52,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
index 3851bb6..68d4f96 100644 (file)
@@ -6,7 +6,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/platform/deployment-handler'
     stream:
       - 'master':
@@ -39,5 +40,6 @@
     project-name: dcaegen2-platform-deployment-handler
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/deployment-handler
     branch: master
index 9b3a387..f1a67cd 100644 (file)
@@ -62,5 +62,6 @@
     project-name: dcaegen2-platform-inventory-api
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/inventory-api
     branch: master
@@ -1,8 +1,8 @@
 ---
 - project:
-    name: dcaegen2-platform-cli-bp-gen
-    project: 'dcaegen2/platform/cli'
-    project-name: 'dcaegen2-platform-cli'
+    name: dcaegen2-platform-mod-bpgenerator
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-          version-properties-file: 'blueprint-generator/version.properties'
-          mvn-pom: 'blueprint-generator/pom.xml'
-          mvn-params: '-f blueprint-generator/pom.xml'
-          pattern: 'blueprint-generator/**'
+          version-properties-file: 'mod/bpgenerator/version.properties'
+          mvn-pom: 'mod/bpgenerator/pom.xml'
+          mvn-params: '-f mod/bpgenerator/pom.xml'
+          pattern: 'mod/bpgenerator/**'
     subproject:
-      - 'blueprint-gen':
-          pom: 'blueprint-generator/pom.xml'
-          pattern: 'blueprint-generator/**'
+      - 'bpgenerator':
+          pom: 'mod/bpgenerator/pom.xml'
+          pattern: 'mod/bpgenerator/**'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'dcaegen2-platform-cli-settings'
+    mvn-settings: 'dcaegen2-platform-settings'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
new file mode 100644 (file)
index 0000000..2402dd0
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: dcaegen2-platform-mod-designtool
+    project-name: dcaegen2-platform-mod
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - designtool:
+          pom: 'mod/designtool/pom.xml'
+          pattern: 'mod/designtool/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-8c-8g
+
+
+- project:
+    name: dcaegen2-platform-mod-designtool-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dcaegen2/platform
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-platform-mod-designtool'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml
new file mode 100644 (file)
index 0000000..1210edb
--- /dev/null
@@ -0,0 +1,45 @@
+---
+# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-distributorapi
+    # root of docker build
+    docker-root: mod/distributorapi
+    # image name
+    docker-name: '{name}'
+    stream:
+      - master:
+            branch: master
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcagen2-platform-mod-distributorapi-verify
+    docker-root: mod/distributorapi
+    stream:
+      - all:
+            branch: '*'
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-distributorapi-sonar
+    docker-root: mod/distributorapi
+    branch: master
+    jobs:
+      - gerrit-tox-sonar
+    cron: '@daily'
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-distributorapi-clm
+    docker-root: mod/distributorapi
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project-name: 'dcaegen2-platform-mod-distributorapi-clm'
+    mvn-params: '-f mod/distributorapi/pom.xml'
+    branch: 'master'
index e476fbf..d94cb27 100644 (file)
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
 
+- project:
+    name: dcaegen2-platform-mod-genprocessor-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform-mod-genprocessor'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-params: '-f mod/genprocessor/pom.xml'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: dcaegen2-platform-mod-genprocessor-clm
     jobs:
@@ -31,3 +45,4 @@
     mvn-params: '-f mod/genprocessor/pom.xml'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-settings'
+
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml
new file mode 100644 (file)
index 0000000..ca63a42
--- /dev/null
@@ -0,0 +1,45 @@
+---
+# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-onboardingapi
+    # root of docker build
+    docker-root: mod/onboardingapi
+    # image name
+    docker-name: '{name}'
+    stream:
+      - master:
+            branch: master
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcagen2-platform-mod-onboardingapi-verify
+    docker-root: mod/onboardingapi
+    stream:
+      - all:
+            branch: '*'
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-onboardingapi-sonar
+    docker-root: mod/onboardingapi
+    branch: master
+    jobs:
+      - gerrit-tox-sonar
+    cron: '@daily'
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-onboardingapi-clm
+    docker-root: mod/onboardingapi
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project-name: 'dcaegen2-platform-mod-onboardingapi-clm'
+    mvn-params: '-f mod/onboardingapi/pom.xml'
+    branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod.yaml b/jjb/dcaegen2/dcaegen2-platform-mod.yaml
new file mode 100644 (file)
index 0000000..1baf6c0
--- /dev/null
@@ -0,0 +1,8 @@
+---
+
+- project:
+    name: dcaegen2-platform-mod-project-view
+    project-name: dcaegen2-platform-mod
+    views:
+      - project-view
+
diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml
new file mode 100644 (file)
index 0000000..fa64115
--- /dev/null
@@ -0,0 +1,45 @@
+---
+# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-oti-event-handler
+    # root of docker build
+    docker-root: oti/event-handler
+    # image name
+    docker-name: '{name}'
+    stream:
+      - master:
+            branch: master
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcagen2-platform-oti-event-handler-verify
+    docker-root: oti/event-handler
+    stream:
+      - all:
+            branch: '*'
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-oti-event-handler-sonar
+    docker-root: oti/event-handler
+    branch: master
+    jobs:
+      - gerrit-tox-sonar
+    cron: '@daily'
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-oti-event-handler-clm
+    docker-root: oti/event-handler
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project-name: 'dcaegen2-platform-oti-event-handler-clm'
+    mvn-params: '-f oti/event-handler/pom.xml'
+    branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
new file mode 100644 (file)
index 0000000..d295171
--- /dev/null
@@ -0,0 +1,80 @@
+---
+- 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: ubuntu1604-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: ubuntu1604-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: 'ubuntu1604-docker-8c-8g'
+
+- project:
+    name: dcaegen2-platform-oti-event-proc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    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: ubuntu1604-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 ce9fb46..5d57fd1 100644 (file)
@@ -52,5 +52,6 @@
     project-name: dcaegen2-platform-plugins
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/plugins
     branch: master
index a93fd57..7ceef5e 100644 (file)
@@ -6,7 +6,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dcaegen2/platform/policy-handler'
     stream:
       - 'master':
@@ -50,5 +51,6 @@
     project-name: dcaegen2-platform-policy-handler
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/policy-handler
     branch: master
index 2f0ec21..81c9b13 100644 (file)
@@ -50,5 +50,6 @@
     project-name: dcaegen2-platform-servicechange-handler
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/servicechange-handler
     branch: master
index a07253a..fa8af0d 100644 (file)
@@ -4,5 +4,6 @@
     project-name: dcaegen2-platform
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform
     branch: master
index 44f8155..81c70d1 100644 (file)
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
 
-#- project:
-#    name: dcaegen2-services-datalake-handler-release
-#    project: 'dcaegen2/services'
-#    project-name: 'dcaegen2-services-datalake-handler'
-#    jobs:
-#      - gerrit-maven-stage:
-#          sign-artifacts: true
-#          build-node: centos7-builder-4c-4g
-#          maven-versions-plugin: true
-#          mvn-pom: 'components/datalake-handler/pom.xml'
-#          mvn-params: '-f components/datalake-handler/pom.xml'
-#          version-properties-file: 'components/datalake-handler/version.properties'
-#          pattern: 'components/datalake-handler/**'
-#      - gerrit-maven-docker-stage:
-#          build-node: ubuntu1604-docker-8c-8g
-#          mvn-goals: 'clean package docker:build -DpushImage -f components/datalake-handler/pom.xml'
-#          container-public-registry: 'nexus3.onap.org:10001'
-#          container-staging-registry: 'nexus3.onap.org:10003'
-#          pattern: 'components/datalake-handler/**'
+- project:
+    name: dcaegen2-services-datalake-handler-release
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-datalake-handler'
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'components/datalake-handler/pom.xml'
+          mvn-params: '-f components/datalake-handler/pom.xml'
+          version-properties-file: 'components/datalake-handler/version.properties'
+          pattern: 'components/datalake-handler/**'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
-          branch: 'master'
+         branch: 'master'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
index ff7f9ae..b8ff328 100644 (file)
@@ -50,5 +50,6 @@
     project-name: dcaegen2-services-heartbeat
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/heartbeat
     branch: master
index d2774a1..e82cf47 100644 (file)
@@ -59,5 +59,6 @@
     project-name: dcaegen2-services-mapper
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/mapper
     branch: master
index dc6eac1..0bde5de 100644 (file)
@@ -62,5 +62,6 @@
     project-name: dcaegen2-services-pm-mapper
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/pm-mapper
     branch: master
index 7839270..7a84545 100644 (file)
@@ -1,75 +1,81 @@
 ---
+- dcaegen2_services_common: &dcaegen2_services_common
+    # values apply to all dcaegen2_services docker projects
+    name: dcaegen2-services-docker-common
+    project: dcaegen2/services
+    # maven settings file has docker credentials
+    mvn-settings: dcaegen2-services-settings
+    # use host network to clone from our gerrit
+    container-tag-method: latest
+    build-node: ubuntu1604-docker-8c-8g
+    # jenkins job name prefix
+    project-name: '{name}'
+    tox-dir: '{docker-root}'
+    # build only on relevant changes
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '{docker-root}/.*'
+
 - project:
+    <<: *dcaegen2_services_common
+    name: dcaegen2-services-pmsh
+    # root of docker build
+    docker-root: components/pm-subscription-handler
+    # tag override
+    # Following is dependent on merge https://gerrit.onap.org/r/#/c/ci-management/+/99313/
+    # docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
+    # image name
+    docker-name: 'onap/{name}'
+    stream:
+      - master:
+            branch: master
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
+
+- project:
+    <<: *dcaegen2_services_common
+    name: dcaegen2-services-pmsh-verify
+    docker-root: components/pm-subscription-handler
+    stream:
+      - all:
+            branch: '*'
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *dcaegen2_services_common
+    name: dcaegen2-services-pmsh-sonar
+    docker-root: components/pm-subscription-handler
+    branch: master
+    jobs:
+      - gerrit-tox-sonar
+    cron: '@daily'
+
+- project:
+    <<: *dcaegen2_services_common
+    docker-root: components/pm-subscription-handler
     name: dcaegen2-services-pmsh-release
-    project: dcaegen2/services
     project-name: dcaegen2-services-pmsh-release
     jobs:
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
-          maven-versions-plugin: true
-          version-properties-file: 'components/pm-subscription-handler/version.properties'
-          mvn-pom: 'components/pm-subscription-handler/pom.xml'
-          mvn-goals: 'clean deploy -f components/pm-subscription-handler/pom.xml'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'components/pm-subscription-handler/**'
       - '{project-name}-gerrit-release-jobs':
               build-node: centos7-docker-8c-8g
     stream:
       - 'master':
           branch: master
-    mvn-settings: dcaegen2-services-settings
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
 
 - project:
-    name: dcaegen2-services-pmsh
-    project: dcaegen2/services
-    project-name: dcaegen2-services
-    tox-dir: components/pm-subscription-handler/
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'components/pm-subscription-handler/**'
-    subproject:
-      - 'pmsh':
-          pom: 'components/pm-subscription-handler/pom.xml'
-          pattern: 'components/pm-subscription-handler/**'
-    mvn-settings: dcaegen2-services-settings
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-    # used by tox-install.sh to specify the interpreter used to install tox
-    python-version: python3
+    <<: *dcaegen2_services_common
+    name: dcaegen2-services-pmsh-clm
+    docker-root: components/pm-subscription-handler
     jobs:
-      # clm and tox
-      - '{project-name}-python-jobs'
-      # build docker image
-      - '{project-name}-{stream}-{subproject}-merge-java'
-    stream:
-      - master:
-          branch: master
-
-- project:
-    name: dcaegen2-services-pmsh-sonar
-    python-version: python3
-    tox-dir: components/pm-subscription-handler/
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'components/pm-subscription-handler/**'
-    jobs:
-      - gerrit-tox-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: dcaegen2/services
-    project-name: dcaegen2-services-pmsh
-    branch: master
-    mvn-settings: dcaegen2-services-settings
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project-name: 'dcaegen2-services-pmsh-clm'
     mvn-params: '-f components/pm-subscription-handler/pom.xml'
-    mvn-goals: 'clean test'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    branch: 'master'
 
index cb9130f..4073a9f 100644 (file)
@@ -20,6 +20,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
       - 'elalto':
           branch: 'elalto'
     mvn-settings: 'dcaegen2-services-prh-settings'
@@ -35,6 +36,7 @@
       - gerrit-maven-sonar
     cron: '@daily'
     build-node: ubuntu1604-docker-8c-8g
+    java-version: openjdk11
     project: 'dcaegen2/services/prh'
     project-name: 'dcaegen2-services-prh'
     branch: 'master'
@@ -49,6 +51,7 @@
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/prh
     build-node: ubuntu1604-docker-8c-8g
+    java-version: openjdk11
     project-name: 'dcaegen2-services-prh'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-prh-settings'
@@ -58,5 +61,6 @@
     project-name: dcaegen2-services-prh
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/prh
     branch: master
index 5d3e2e2..5cbb321 100644 (file)
@@ -16,6 +16,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
       - 'elalto':
           branch: 'elalto'
     mvn-settings: 'dcaegen2-services-sdk-settings'
@@ -27,6 +28,7 @@
 
 - project:
     name: dcaegen2-services-sdk-integration-pairwise
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-integration-pairwise':
           build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
@@ -41,6 +43,7 @@
 
 - project:
     name: dcaegen2-services-sdk-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     cron: '@daily'
@@ -54,6 +57,7 @@
 
 - project:
     name: dcaegen2-services-sdk-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
@@ -68,5 +72,6 @@
     project-name: dcaegen2-services-sdk
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/sdk
     branch: master
index 0f8dc19..99055a7 100644 (file)
@@ -59,5 +59,6 @@
     project-name: dcaegen2-services-son-handler
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services/son-handler
     branch: master
index 3b5179e..81bcd8a 100644 (file)
@@ -4,5 +4,6 @@
     project-name: dcaegen2-services
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/services
     branch: master
index 666b217..84fe787 100644 (file)
@@ -52,6 +52,7 @@
     project-name: dcaegen2-utils
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/utils
     branch: master
 
index c0c19f1..dd0b0cc 100644 (file)
@@ -43,5 +43,6 @@
     project-name: dcaegen2
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2
     branch: master
index 49eea28..5c4028e 100644 (file)
     name: demo-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'demo'
@@ -46,5 +51,6 @@
     project-name: demo
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: demo
     branch: master
index 57f4a1a..d24124f 100644 (file)
@@ -16,6 +16,8 @@
           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-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dmaap/buscontroller'
     stream:
@@ -44,5 +46,6 @@
     project-name: dmaap-buscontroller
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/buscontroller
     branch: master
index 3905b02..8fbd19f 100644 (file)
@@ -50,5 +50,6 @@
     project-name: dmaap-datarouter
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/datarouter
     branch: master
index a3f690b..f9785b9 100644 (file)
@@ -9,6 +9,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dmaap/dbcapi'
     mvn-settings: 'dmaap-dbcapi-settings'
@@ -54,5 +56,6 @@
     project-name: dmaap-dbcapi
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/dbcapi
     branch: master
index c131b89..e610e47 100644 (file)
@@ -26,5 +26,6 @@
     project-name: dmaap-kafka-docker
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/kafka11aaf
     branch: master
index 7b1573c..bc42004 100644 (file)
@@ -29,5 +29,6 @@
     project-name: dmaap-kafka
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/kafka11aaf
     branch: master
index 3bad3bc..9c932b4 100644 (file)
@@ -47,5 +47,6 @@
     project-name: dmaap-messagerouter-dmaapclient
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/dmaapclient
     branch: master
index d55e92b..d044ba1 100644 (file)
@@ -37,5 +37,6 @@
     project-name: dmaap-messagerouter-docker
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/messageservice
     branch: master
index c64a9b5..aef8067 100644 (file)
@@ -46,5 +46,6 @@
     project-name: dmaap-messagerouter-messageservice
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/messageservice
     branch: master
index 6e297e8..09633d9 100644 (file)
@@ -48,5 +48,6 @@
     project-name: dmaap-messagerouter-mirroragent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/mirroragent
     branch: master
index 8eff9f6..9127fca 100644 (file)
@@ -48,5 +48,6 @@
     project-name: dmaap-messagerouter-msgrtr
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/messagerouter/msgrtr
     branch: master
index 0b275f4..3b18d08 100644 (file)
@@ -36,5 +36,6 @@
     project-name: dmaap-zookeeper
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/zookeeper
     branch: master
index c91b6c4..f03cce0 100644 (file)
@@ -36,5 +36,6 @@
     project-name: doc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: doc
     branch: master
index 4c69d4c..ebf695c 100644 (file)
       - 'master':
           branch: 'master'
     mvn-settings: 'externalapi-nbi-settings'
+    java-version: openjdk11
 
 - project:
     name: externalapi-nbi-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'externalapi/nbi'
     mvn-settings: 'externalapi-nbi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: externalapi-nbi-info
     project-name: externalapi-nbi
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: externalapi/nbi
     branch: master
index 7698bf5..1590d01 100644 (file)
@@ -56,6 +56,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"
 
     # Nexus3 docker registries
     container-public-registry: nexus3.onap.org:10001
index 4e7908e..d950825 100644 (file)
@@ -55,5 +55,6 @@
     project-name: holmes-common
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: holmes/common
     branch: master
index 4e6ca57..0788584 100644 (file)
@@ -53,5 +53,6 @@
     project-name: holmes-engine-management
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: holmes/engine-management
     branch: master
index 4735bd2..5f1bae2 100644 (file)
@@ -53,5 +53,6 @@
     project-name: holmes-rule-management
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: holmes/rule-management
     branch: master
diff --git a/jjb/integration/docker/info-integration-docker.yaml b/jjb/integration/docker/info-integration-docker.yaml
new file mode 100644 (file)
index 0000000..071f816
--- /dev/null
@@ -0,0 +1,9 @@
+---
+- project:
+    name: integration-docker-onap-java11-info
+    project-name: integration-docker-onap-java11
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/docker/onap-java11
+    branch: master
index 5a0eedd..38c848d 100644 (file)
       - 'vCPE':
           trigger_jobs:
     robot-options: ''
+
+- project:
+    name: integration-csit-info
+    project-name: integration-csit
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/csit
+    branch: master
index 401eecf..de18753 100644 (file)
@@ -10,5 +10,6 @@
     project-name: integration
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: integration
     branch: master
index 3f45e1d..babd9f6 100644 (file)
@@ -4,5 +4,6 @@
     project-name: integration-xtesting
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: integration/xtesting
     branch: master
diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
new file mode 100644 (file)
index 0000000..ca2ea85
--- /dev/null
@@ -0,0 +1,68 @@
+---
+- builder:
+    name: lf-onap-releasedockerhub-macro
+    builders:
+      - shell: !include-raw-escape:
+        - ../shell/run_releasedockerhub.sh
+        ##- ../shell/run_releasedockerhub.sh "{org} {summary} {verbose} {copy}"
+
+
+- job:
+    name: lf-onap-release-docker-hub
+    build-timeout: 90
+
+    project-type: freestyle
+    node: ubuntu1604-docker-8c-8g                           ## Probably don't need this much
+    disable-job: false
+    disabled: '{disable-job}'
+
+    # Runs once a week 
+    triggers:
+      - timed: '@weekly'
+
+#   Define needed parameters for lf-infra-docker-login
+    parameters:
+      - string:
+          name: DOCKER_REGISTRY
+          default: 'nexus3.onap.org'
+      - string:
+          name: REGISTRY_PORTS
+          default: '10002'
+      - string:
+          name: DOCKERHUB_REGISTRY
+          default: 'docker.io'
+
+#   Define needed parameters for lf-onap-releasedockerhub-macro
+      - string:
+          name: RELEASEDOCKERHUB_ORG
+          default: 'onap'
+          description: ''
+      - string:
+          name: RELEASEDOCKERHUB_REPO
+          default: ''
+          description: 'Only match repos that contains this string'
+      - string:
+          name: RELEASEDOCKERHUB_EXACT
+          default: ''
+          description: 'Repo has to exactly match RELEASEDOCKERHUB_REPO '
+      - string:
+          name: RELEASEDOCKERHUB_SUMMARY
+          default: 'Yes'
+          description: 'Provides a brief statistic summary of what it found, and what it should do. Activate with Yes'
+      - string:
+          name: RELEASEDOCKERHUB_VERBOSE
+          default: ''
+          description: 'Provides a verbose output of the operations. Activate with Yes'
+      - string:
+          name: RELEASEDOCKERHUB_COPY
+          default: 'Yes'
+          description: 'If a copy operation should be done from Nexus3 to docker hub. Activate with Yes'
+
+
+    builders:
+      - lf-infra-pre-build                                  ## shell/python-tools-install.sh
+      - lf-infra-docker-login:
+          global-settings-file: 'global-settings'
+          settings-file: 'onap-releasedockerhub-authz-settings'
+      - lf-onap-releasedockerhub-macro:
+
index 4069552..8c19c2a 100644 (file)
@@ -65,6 +65,7 @@
     project-name: 'logging-analytics-pomba-pomba-aai-context-builder'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-aai-context-builder'
     branch: 'master'
 
index f8d94e7..ac73c5c 100644 (file)
@@ -37,6 +37,7 @@
     project-name: 'logging-analytics-pomba-pomba-audit-common'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-audit-common'
     branch: 'master'
 
index 938d5f9..6735358 100644 (file)
@@ -45,6 +45,7 @@
     project-name: 'logging-analytics-pomba-pomba-context-aggregator'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-context-aggregator'
     branch: 'master'
 
index 8c077fa..56bd157 100644 (file)
@@ -65,6 +65,7 @@
     project-name: 'logging-analytics-pomba-pomba-network-discovery-context-builder'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-network-discovery-context-builder'
     branch: 'master'
 
index 21491c3..ddc3ac9 100644 (file)
@@ -63,6 +63,7 @@
     project-name: 'logging-analytics-pomba-pomba-sdc-context-builder'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-sdc-context-builder'
     branch: 'master'
 
index 3765a33..e3fce2a 100644 (file)
@@ -60,6 +60,7 @@
     project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics/pomba/pomba-sdnc-context-builder'
     branch: 'master'
 
index 08cf976..9ff1348 100644 (file)
     project-name: 'logging-analytics'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'logging-analytics'
     branch: 'master'
 
index 2c04e23..0d8e74d 100644 (file)
@@ -59,5 +59,6 @@
     project-name: modeling-etsicatalog
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: modeling/etsicatalog
     branch: master
index ec98862..cc07972 100644 (file)
     name: msb-apigateway-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'msb/apigateway'
@@ -78,5 +83,6 @@
     project-name: msb-apigateway
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: msb/apigateway
     branch: master
index 3e2fe17..67eca0a 100644 (file)
     name: msb-discovery-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'msb/discovery'
@@ -71,5 +76,6 @@
     project-name: msb-discovery
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: msb/discovery
     branch: master
index 4367193..9e37e17 100644 (file)
     name: msb-java-sdk-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'msb/java-sdk'
@@ -46,5 +51,6 @@
     project-name: msb-java-sdk
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: msb/java-sdk
     branch: master
index 8e5a1ce..2f0c3e9 100644 (file)
     name: msb-swagger-sdk-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'msb/swagger-sdk'
@@ -46,5 +51,6 @@
     project-name: msb-swagger-sdk
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: msb/swagger-sdk
     branch: master
index 8d8b72e..472325a 100755 (executable)
@@ -10,9 +10,11 @@ chmod 755 ./pike/docker/*.*
 chmod 755 ./starlingx/docker/*.*
 #chmod 755 ./lenovo/docker/*.*
 chmod 755 ./fcaps/docker/*.*
+chmod 755 ./hpa/docker/*.*
 
 ./windriver/docker/build_image.sh
 ./pike/docker/build_image.sh
 ./starlingx/docker/build_image.sh
 #./lenovo/docker/build_image.sh
 ./fcaps/docker/build_image.sh
+./hpa/docker/build_image.sh
index 7ac4fca..270a557 100644 (file)
     name: multicloud-azure-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/azure'
@@ -81,5 +86,6 @@
     project-name: multicloud-azure
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/azure
     branch: master
index 388f94c..1883da9 100644 (file)
     name: multicloud-framework-multivimbroker-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/framework'
     name: multicloud-framework-artifactbroker-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/framework'
index 859637e..cec2f67 100644 (file)
@@ -3,5 +3,6 @@
     project-name: multicloud-framework
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/framework
     branch: master
index e9f18ed..f8cf56f 100644 (file)
@@ -55,5 +55,6 @@
     project-name: multicloud-k8s
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/k8s
     branch: master
diff --git a/jjb/multicloud/multicloud-openstack-hpa-csit.yaml b/jjb/multicloud/multicloud-openstack-hpa-csit.yaml
new file mode 100644 (file)
index 0000000..3972d69
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+    name: multicloud-openstack-hpa-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'multicloud-hpa'
+    recipients: 'haibin.huang@intel.com'
+    stream: 'master'
+    functionality:
+      - 'functionality1':
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'
index c297872..ba897bc 100644 (file)
     name: multicloud-openstack-vmware-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/openstack/vmware'
@@ -84,5 +89,6 @@
     project-name: multicloud-openstack-vmware
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/openstack/vmware
     branch: master
index da9605f..f588024 100644 (file)
 #          path: 'lenovo'
 #          pattern: 'share/**'
 #          pom: 'lenovo/pom.xml'
+      - 'hpa':
+          path: 'hpa'
+          pattern: 'hpa/**'
+          pom: 'hpa/pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
     name: multicloud-openstack-windriver-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/openstack'
     name: multicloud-openstack-pike-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/openstack'
     name: multicloud-openstack-starlingx-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/openstack'
     name: multicloud-openstack-fcaps-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'multicloud/openstack'
 #    name: multicloud-openstack-lenovo-sonar
 #    jobs:
 #      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
 #    cron: '@daily'
 #    build-node: ubuntu1604-builder-4c-4g
 #    project: 'multicloud/openstack'
 #    mvn-goals: 'clean install'
 #    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: multicloud-openstack-hpa-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack-hpa'
+    branch: 'master'
+    mvn-params: '-f hpa/pom.xml'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: multicloud-openstack-info
     project-name: multicloud-openstack
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/openstack
     branch: master
index 261c94a..2f60151 100644 (file)
@@ -23,5 +23,6 @@
     project-name: music-distributed-kv-store
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: music/distributed-kv-store
     branch: master
index 273efcf..25773fb 100644 (file)
@@ -34,5 +34,6 @@
     project-name: music-mdbc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: music/mdbc
     branch: master
index 0349f9b..295a49e 100644 (file)
@@ -42,5 +42,6 @@
     project-name: music-prom
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: music/prom
     branch: master
index a4ac621..6827f50 100644 (file)
@@ -42,7 +42,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'music'
@@ -68,5 +68,6 @@
     project-name: music
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: music
     branch: master
index a2933fb..edd2a33 100644 (file)
@@ -20,5 +20,6 @@
     project-name: offline-installer
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: oom/offline-installer
     branch: master
index 2daca91..1455f7f 100644 (file)
@@ -53,5 +53,6 @@
     project-name: oomconfig
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: oom
     branch: master
index 5dc9d30..4b5a3b3 100644 (file)
@@ -40,5 +40,6 @@
     project-name: oom-registrator
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: oom/registrator
     branch: master
index 61ebb75..fd76da2 100644 (file)
@@ -45,5 +45,6 @@
     project-name: oparent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: oparent
     branch: master
index 3bee2b1..56a07c8 100644 (file)
@@ -49,7 +49,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: 'H 11 * * *'
     build-node: ubuntu1604-docker-8c-8g
     project: 'optf/cmso'
@@ -80,5 +80,6 @@
     project-name: optf-cmso
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: optf/cmso
     branch: master
index 7c5718a..9f3db13 100644 (file)
@@ -89,7 +89,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'optf/fgps'
     project-name: optf-fgps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: optf/fgps
     branch: master
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
new file mode 100644 (file)
index 0000000..b1eeba6
--- /dev/null
@@ -0,0 +1,14 @@
+- project:
+    name: optf-has-csit
+    jobs:
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: optf-has
+    recipients: 'snarayanan@research.att.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'testsuites':
+          trigger_jobs:
+            - '{project-name}-{stream}-conductor-docker-java-version-shell-daily'
+    robot-options: ''
index f08d7f9..b94af56 100644 (file)
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
@@ -45,8 +45,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
@@ -77,7 +77,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'optf/has'
@@ -97,8 +97,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-has-settings'
 
 - project:
     project-name: optf-has
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: optf/has
     branch: master
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
new file mode 100644 (file)
index 0000000..de079c3
--- /dev/null
@@ -0,0 +1,14 @@
+- project:
+    name: optf-osdf-csit
+    jobs:
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: optf-osdf
+    recipients: 'snarayanan@research.att.com'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'testsuites':
+          trigger_jobs:
+            - '{project-name}-{stream}-osdf-docker-java-version-shell-daily'
+    robot-options: ''
index d5bcf23..4e600f3 100644 (file)
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
           pattern: '**'
           pom: 'pom.xml'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-python':
+          build-node: ubuntu1604-builder-4c-4g
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          build-node: ubuntu1604-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
@@ -43,8 +45,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
@@ -75,7 +77,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'optf/osdf'
@@ -96,8 +98,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-osdf-settings'
 
 - project:
     project-name: optf-osdf
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: optf/osdf
     branch: master
index 67d3474..8edc0e9 100644 (file)
@@ -44,7 +44,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/apex-pdp'
@@ -69,5 +69,6 @@
     project-name: policy-apex-pdp
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/apex-pdp
     branch: master
index 2e1167d..534e476 100644 (file)
@@ -39,7 +39,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/api'
@@ -66,5 +66,6 @@
     project-name: policy-api
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/api
     branch: master
index 3ac5b25..1499e00 100644 (file)
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/common'
     project-name: 'policy-common'
     branch: 'master'
     mvn-settings: 'policy-common-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-common'
     branch: 'master'
     mvn-settings: 'policy-common-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-common-info
     project-name: policy-common
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/common
     branch: master
index c4ae3aa..222f256 100644 (file)
@@ -38,7 +38,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/distribution'
@@ -63,5 +63,6 @@
     project-name: policy-distribution
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/distribution
     branch: master
index 63daef9..d5c9d25 100644 (file)
@@ -99,5 +99,6 @@
     project-name: policy-docker
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/docker
     branch: master
index 8949ed8..1296e07 100644 (file)
@@ -38,7 +38,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/drools-applications'
     project-name: 'policy-drools-applications'
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
+    build-node: ubuntu1604-docker-8c-8g
 
 - project:
     name: policy-drools-applications-info
     project-name: policy-drools-applications
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/drools-applications
     branch: master
index 050854e..25b45e0 100644 (file)
@@ -39,7 +39,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/drools-pdp'
@@ -67,5 +67,6 @@
     project-name: policy-drools-pdp
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/drools-pdp
     branch: master
index 8822cec..e0a0b72 100644 (file)
@@ -38,7 +38,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/engine'
@@ -46,7 +46,7 @@
     branch: 'master'
     mvn-settings: 'policy-engine-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
 
 - project:
     name: policy-engine-clm
@@ -65,5 +65,6 @@
     project-name: policy-engine
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/engine
     branch: master
index 1325ddb..8b85b6e 100644 (file)
@@ -17,6 +17,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-models-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/models'
     project-name: 'policy-models'
     branch: 'master'
     mvn-settings: 'policy-models-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
     project-name: 'policy-models'
     branch: 'master'
     mvn-settings: 'policy-models-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-models-info
     project-name: policy-models
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/models
     branch: master
index 2502b8f..97dc567 100644 (file)
@@ -39,7 +39,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/pap'
@@ -66,5 +66,6 @@
     project-name: policy-pap
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/pap
     branch: master
index dca2452..013bc3e 100644 (file)
     project-name: 'policy-parent'
     branch: 'master'
     mvn-settings: 'policy-parent-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-parent-info
     project-name: policy-parent
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/parent
     branch: master
index b8b993c..0915bf0 100644 (file)
@@ -39,7 +39,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'policy/xacml-pdp'
@@ -66,5 +66,6 @@
     project-name: policy-xacml-pdp
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/xacml-pdp
     branch: master
index c01fd31..43b56a9 100644 (file)
@@ -39,7 +39,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'portal/sdk'
@@ -67,5 +67,6 @@
     project-name: portal-sdk
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: portal/sdk
     branch: master
index 5bc1697..7edb47b 100644 (file)
@@ -32,7 +32,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'portal'
@@ -93,5 +93,6 @@
     project-name: portal
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: portal
     branch: master
index a754408..109d6fe 100644 (file)
@@ -77,5 +77,6 @@
     project-name: sdc-dcae-d-ci
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/ci
     branch: master
index 7b86851..b215db3 100644 (file)
@@ -72,5 +72,6 @@
     project-name: sdc-dcae-d-dt-be-main
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/dt-be-main
     branch: master
index 39f1c09..79e34f9 100644 (file)
@@ -47,5 +47,6 @@
     project-name: sdc-dcae-d-dt-be-property
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/dt-be-property
     branch: master
index a334d75..b65e393 100644 (file)
@@ -75,5 +75,6 @@
     project-name: sdc-dcae-d-dt
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/dt
     branch: master
index 8e4149d..843fc75 100644 (file)
@@ -74,5 +74,6 @@
     project-name: sdc-dcae-d-fe
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/fe
     branch: master
index 71c7dbe..8a77f32 100644 (file)
@@ -61,5 +61,6 @@
     project-name: sdc-dcae-d-tosca-lab
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/dcae-d/tosca-lab
     branch: master
index 8f3fcf4..1ece29f 100644 (file)
@@ -64,5 +64,6 @@
     project-name: sdc-microservices
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/microservices
     branch: master
index c897042..cf298ff 100644 (file)
@@ -10,6 +10,7 @@
     project-name: 'sdc-onap-ui-angular'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'sdc/onap-ui-angular'
     branch: 'master'
 
index a614c91..4e6b417 100644 (file)
@@ -4,6 +4,7 @@
     project-name: 'sdc-onap-ui-common'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'sdc/onap-ui-common'
     branch: 'master'
 
index 8705f02..c7e7f3a 100644 (file)
@@ -4,6 +4,7 @@
     project-name: 'sdc-onap-ui-react'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'sdc/onap-ui-react'
     branch: 'master'
 
index 5b7955c..5db7878 100644 (file)
@@ -58,5 +58,6 @@
     project-name: sdc-sdc-be-common
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-be-common
     branch: master
index c7a3424..bccd5c7 100644 (file)
@@ -57,5 +57,6 @@
     project-name: sdc-sdc-distribution-client
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-distribution-client
     branch: master
index e53c4b0..1c718ac 100644 (file)
@@ -47,5 +47,6 @@
     project-name: sdc-sdc-docker-base
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-docker-base
     branch: master
index f94773a..1122dc9 100644 (file)
@@ -4,6 +4,7 @@
     project-name: 'sdc-sdc-pubsub'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'sdc/sdc-pubsub'
     branch: 'master'
 
index 98725b8..5daaa48 100644 (file)
@@ -57,5 +57,6 @@
     project-name: sdc-sdc-tosca
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-tosca
     branch: master
index c66789a..f636147 100644 (file)
@@ -84,5 +84,6 @@
     project-name: sdc-sdc-workflow-designer
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-workflow-designer
     branch: master
index 2498e11..76c89d0 100644 (file)
     project-name: sdc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc
     branch: master
 
index 2de80e0..f796934 100644 (file)
@@ -9,17 +9,20 @@
     name: sdnc-apps
     project-name: 'sdnc-apps'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
+          cron: ''
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -42,6 +45,8 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: sdnc-apps-sonar
@@ -51,7 +56,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdnc/apps'
     project-name: sdnc-apps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/apps
     branch: master
index 507d044..7c7094f 100644 (file)
@@ -3,11 +3,13 @@
     name: sdnc-northbound
     project-name: 'sdnc-northbound'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -30,6 +32,8 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: sdnc-northbound-sonar
@@ -39,7 +43,7 @@
     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"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdnc/northbound'
@@ -68,5 +72,6 @@
     project-name: sdnc-northbound
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/northbound
     branch: master
index d748105..38c6061 100644 (file)
@@ -4,12 +4,14 @@
     name: sdnc-oam
     project-name: 'sdnc-oam'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          cron: ''
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -17,6 +19,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
           maven-versions-plugin: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'sdnc/oam'
@@ -32,6 +35,8 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 #
 #- project:
@@ -69,5 +74,6 @@
     project-name: sdnc-oam
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/oam
     branch: master
index 5d2be71..1a02f8f 100644 (file)
@@ -38,5 +38,6 @@
     project-name: sdnc-oom
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/oom
     branch: master
index 8ad44cb..1a6bdc4 100644 (file)
     name: so-libs-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'so/libs'
@@ -54,6 +59,7 @@
     project-name: so-libs
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: so/libs
     branch: master
     branch: elalto
index 9d7d894..323bca4 100644 (file)
     name: so-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
     build-node: ubuntu1604-builder-4c-4g
@@ -94,6 +99,7 @@
     project-name: so
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: so
     branch: master
     branch: elalto
index 12f33fa..2c46a15 100644 (file)
@@ -41,5 +41,6 @@
     project-name: testsuite-heatbridge
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: testsuite/heatbridge
     branch: master
index f9b756b..a8993e1 100644 (file)
@@ -48,5 +48,6 @@
     project-name: testsuite-python-testing-utils
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: testsuite/python-testing-utils
     branch: master
index e85a0c4..fd32c94 100644 (file)
@@ -53,5 +53,6 @@
     project-name: testsuite
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: testsuite
     branch: master
index b705594..601c5e5 100644 (file)
@@ -53,5 +53,6 @@
     project-name: usecase-ui-server
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: usecase-ui/server
     branch: master
index 1e034bf..ee8356b 100644 (file)
@@ -45,5 +45,6 @@
     project-name: usecase-ui
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: usecase-ui
     branch: master
index 1442e89..9d49b44 100644 (file)
@@ -66,5 +66,6 @@
     project-name: vfc-gvnfm-vnflcm
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/gvnfm/vnflcm
     branch: master
index 799a18e..d688bcc 100644 (file)
@@ -60,5 +60,6 @@
     project-name: vfc-gvnfm-vnfmgr
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/gvnfm/vnfmgr
     branch: master
index fdb61ec..e27e3c6 100644 (file)
@@ -61,5 +61,6 @@
     project-name: vfc-gvnfm-vnfres
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/gvnfm/vnfres
     branch: master
index 317f8ad..6e2e934 100644 (file)
@@ -61,5 +61,6 @@
     project-name: vfc-nfvo-catalog
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/catalog
     branch: master
index b6ba9e9..87c4907 100644 (file)
@@ -30,5 +30,6 @@
     project-name: vfc-nfvo-db
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/db
     branch: master
index 9ca9178..7bf8cfb 100644 (file)
@@ -58,5 +58,6 @@
     project-name: vfc-nfvo-driver-ems
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/ems
     branch: master
index aa4e8c6..1696ea5 100644 (file)
@@ -60,5 +60,6 @@
     project-name: vfc-nfvo-driver-sfc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/sfc
     branch: master
index 6bb4318..80680bd 100644 (file)
@@ -55,5 +55,6 @@
     project-name: vfc-nfvo-driver-svnfm-huawei
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/vnfm/svnfm
     branch: master
index 6b836dd..a818758 100644 (file)
@@ -63,5 +63,6 @@
     project-name: vfc-nfvo-driver-vnfm-gvnfm
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/vnfm/gvnfm
     branch: master
index 2ce9b1c..d97ec98 100644 (file)
@@ -28,5 +28,6 @@
     project-name: vfc-nfvo-driver-svnfm-root
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/driver/vnfm/svnfm
     branch: master
index 0feca60..30e6678 100644 (file)
@@ -55,5 +55,6 @@
     project-name: vfc-nfvo-lcm
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/lcm
     branch: master
index c5de861..dec3110 100644 (file)
@@ -51,5 +51,6 @@
     project-name: vfc-nfvo-multivimproxy
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/multivimproxy
     branch: master
index b377c03..2370d35 100644 (file)
@@ -51,5 +51,6 @@
     project-name: vfc-nfvo-resmanagement
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/resmanagement
     branch: master
index 1f89eae..ae679b5 100644 (file)
     project-name: vfc-nfvo-wfengine
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vfc/nfvo/wfengine
     branch: master
index b0845fd..cc8ba89 100644 (file)
     name: vid-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vid'
@@ -79,5 +84,6 @@
     project-name: vid
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: vid
     branch: master
index 4c83e8f..f38f4d8 100644 (file)
@@ -10,6 +10,7 @@
     project: 'vnfrqts/epics'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-epics'
     branch: 'master'
     mvn-settings: 'vnfrqts-epics-settings'
index a8f5ece..dbd30a7 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfrqts/guidelines'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-guidelines'
     branch: 'master'
     mvn-settings: 'vnfrqts-guidelines-settings'
index 7bb260e..e026fb4 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfrqts/requirements'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-requirements'
     branch: 'master'
     mvn-settings: 'vnfrqts-requirements-settings'
index 83fb50e..a06e7ed 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfrqts/testcases'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-testcases'
     branch: 'master'
     mvn-settings: 'vnfrqts-testcases-settings'
index 0fdceb2..5070867 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfrqts/usecases'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: 'vnfrqts-usecases'
     branch: 'master'
     mvn-settings: 'vnfrqts-usecases-settings'
index 499bfae..8ce93b7 100644 (file)
@@ -68,6 +68,7 @@
     name: vnfsdk-dovetail-integration-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
index 30a1de5..3a29d41 100644 (file)
     name: vnfsdk-functest-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vnfsdk/functest'
@@ -36,6 +41,7 @@
     name: vnfsdk-functest-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/functest'
     project-name: 'vnfsdk-functest'
     branch: 'master'
index e77fa78..e2e365c 100644 (file)
@@ -15,6 +15,7 @@
     name: vnfsdk-lctest-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/lctest'
     project-name: 'vnfsdk-lctest'
     branch: 'master'
index 71808ea..90763d2 100644 (file)
@@ -4,6 +4,7 @@
     project: 'vnfsdk/model'
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project-name: vnfsdk-model
     branch: master
     mvn-settings: vnfsdk-model-settings
index cc516a1..7b2a773 100644 (file)
@@ -37,6 +37,7 @@
     name: vnfsdk-pkgtools-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/pkgtools'
     project-name: 'vnfsdk-pkgtools'
     branch: 'master'
index db4954b..d94f8cb 100644 (file)
     name: vnfsdk-refrepo-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vnfsdk/refrepo'
@@ -70,6 +75,7 @@
     name: vnfsdk-refrepo-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
index 1709243..d6a48cd 100644 (file)
     name: vnfsdk-validation-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vnfsdk/validation'
@@ -35,6 +40,7 @@
     name: vnfsdk-validation-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
index 8bcbd0b..b0a6a2c 100644 (file)
           make-opts: -j6
           stream: master
           build-node: centos7-builder-4c-4g
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'vnfsdk/ves-agent'
@@ -62,6 +67,7 @@
     name: vnfsdk-ves-agent-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/ves-agent'
     project-name: 'vnfsdk-ves-agent'
     branch: 'master'
index 338c79b..b0516ce 100644 (file)
@@ -7,3 +7,4 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
index 10c3c40..c156150 100644 (file)
@@ -6,12 +6,6 @@
   become_method: sudo
 
   tasks:
-    - apt_repository:
-        repo: ppa:jonathonf/python-3.6
-        state: present
-      become: true
-      when: ansible_distribution == 'Ubuntu'
-
     - apt_repository:
         repo: ppa:deadsnakes/ppa
         state: present
index c3c9f17..7b9f9c0 100644 (file)
         state: present
       become: true
 
-    - apt_repository:
-        repo: ppa:jonathonf/python-3.6
-        state: present
-      become: true
-      when: ansible_distribution == 'Ubuntu'
-
     - apt_repository:
         repo: ppa:deadsnakes/ppa
         state: present
index 495566c..5c45962 100644 (file)
       service:
         name: redis
         state: started
-      become: true
\ No newline at end of file
+      become: true
+
+    - name: Install Python 3.6 and packages
+      yum:
+        name:
+          - python36u
+          - python36u-libs
+          - python36u-devel
+        state: latest
+      become: true
diff --git a/shell/docker-ts-tag-override.sh b/shell/docker-ts-tag-override.sh
new file mode 100755 (executable)
index 0000000..e14d2e5
--- /dev/null
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# ================================================================================
+# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
+set -feu -o pipefail
+
+echo "--> docker-ts-tag-override.sh"
+
+# Get project version from pom.xml
+version=`xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" $DOCKER_ROOT/pom.xml`
+echo "INFO: version from pom file $version"
+
+# Some pom has -SNAPSHOT or -STAGING under pom version, remove all text
+version="${version//[^0-9.]/}"
+
+# Get build TS for specifying in the tag
+timestamp=$(date +%C%y%m%dT%H%M%SZ)
+
+# Following the https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process
+# IndependentVersioningandReleaseProcess-StandardizedDockerTagging
+# ONAP Tag requirement :  {imagename}:{semver}-SNAPSHOT-{timestamp}Z (from CIMAN-132)
+
+if [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+  tag="${version}-SNAPSHOT-${timestamp}"
+else
+  # Default to latest tag with TS if not conforming to semantic versioning
+  echo "WARN: version not complaint to sem-ver; tag defaulted to latest"
+  version=latest
+  tag="${version}-${timestamp}"
+fi
+
+echo "INFO: docker tag is $tag"
+
+# Write DOCKER_IMAGE_TAG information to a file so it can be
+# injected into the environment for following steps
+echo "DOCKER_IMAGE_TAG=$tag" >> "$WORKSPACE/env_docker_inject.txt"
diff --git a/shell/run_releasedockerhub.sh b/shell/run_releasedockerhub.sh
new file mode 100644 (file)
index 0000000..42771af
--- /dev/null
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+echo "---> run_releasedockerhub.sh"
+# Ensure we fail the job if any steps fail
+# Disable 'globbing'
+set -euf -o pipefail
+
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-activate-venv lftools
+
+if [ ! -v RELEASEDOCKERHUB_ORG ]
+then
+  echo "RELEASEDOCKERHUB_ORG is not defined. For onap set it to 'onap'"
+  exit 1
+fi
+
+cmd_str="--org $RELEASEDOCKERHUB_ORG"
+if [ -v RELEASEDOCKERHUB_SUMMARY ]
+then
+    cmd_str+=" --summary"
+fi
+if [ -v RELEASEDOCKERHUB_VERBOSE ]
+then
+    cmd_str+=" --verbose"
+fi
+if [ -v RELEASEDOCKERHUB_REPO ]
+then
+    cmd_str+=" --repo $RELEASEDOCKERHUB_REPO"
+fi
+if [ -v RELEASEDOCKERHUB_EXACT ]
+then
+    cmd_str+=" --exact"
+fi
+
+
+if [ -v RELEASEDOCKERHUB_COPY ]
+then
+    cmd_str+=" --copy"
+fi
+
+echo "cmd_str = >>$cmd_str<<"
+
+# Run the releasedockerhub command in lftools
+lftools nexus docker releasedockerhub  $cmd_str