summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/aaf/aaf-authz.yaml2
-rw-r--r--jjb/aai/aai-aai-common.yaml2
-rw-r--r--jjb/aai/aai-babel.yaml2
-rw-r--r--jjb/aai/aai-cacher.yaml2
-rw-r--r--jjb/aai/aai-chameleon.yaml2
-rw-r--r--jjb/aai/aai-champ.yaml2
-rw-r--r--jjb/aai/aai-data-router.yaml2
-rw-r--r--jjb/aai/aai-esr-gui.yaml2
-rw-r--r--jjb/aai/aai-esr-server.yaml2
-rw-r--r--jjb/aai/aai-event-client.yaml2
-rw-r--r--jjb/aai/aai-gallifrey.yaml2
-rw-r--r--jjb/aai/aai-gizmo.yaml2
-rw-r--r--jjb/aai/aai-graphadmin.yaml2
-rw-r--r--jjb/aai/aai-graphgraph.yaml4
-rw-r--r--jjb/aai/aai-logging-service.yaml2
-rw-r--r--jjb/aai/aai-model-loader.yaml2
-rw-r--r--jjb/aai/aai-resources.yaml2
-rw-r--r--jjb/aai/aai-rest-client.yaml2
-rw-r--r--jjb/aai/aai-router-core-service.yaml2
-rw-r--r--jjb/aai/aai-schema-service.yaml2
-rw-r--r--jjb/aai/aai-search-data-service.yaml2
-rw-r--r--jjb/aai/aai-sparky-be.yaml2
-rw-r--r--jjb/aai/aai-sparky-fe.yaml2
-rw-r--r--jjb/aai/aai-spike.yaml2
-rw-r--r--jjb/aai/aai-traversal.yaml2
-rw-r--r--jjb/aai/aai-validation.yaml2
-rw-r--r--jjb/appc/appc-cdt.yaml2
-rw-r--r--jjb/appc/appc-master.yaml2
-rw-r--r--jjb/appc/appc-parent.yaml2
-rw-r--r--jjb/ccsdk/apps.yaml2
-rw-r--r--jjb/ccsdk/cds.yaml2
-rw-r--r--jjb/ccsdk/dashboard.yaml2
-rw-r--r--jjb/ccsdk/distribution.yaml2
-rw-r--r--jjb/ccsdk/features.yaml5
-rw-r--r--jjb/ccsdk/parent.yaml2
-rw-r--r--jjb/ccsdk/platform-plugins.yaml2
-rw-r--r--jjb/ccsdk/sli-adaptors.yaml2
-rw-r--r--jjb/ccsdk/sli-core.yaml2
-rw-r--r--jjb/ccsdk/sli-northbound.yaml2
-rw-r--r--jjb/ccsdk/sli-plugins.yaml2
-rw-r--r--jjb/ccsdk/utils.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics-tca.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-datafile.yaml6
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml4
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-restconf.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-ves.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-deployments.yaml4
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-configbinding.yaml4
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml4
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml6
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml6
-rw-r--r--jjb/dcaegen2/dcaegen2-services-mapper.yaml4
-rw-r--r--jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml6
-rw-r--r--jjb/dcaegen2/dcaegen2-services-prh.yaml4
-rw-r--r--jjb/dcaegen2/dcaegen2-services-son-handler.yaml4
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-mirroragent.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-msgrtr.yaml2
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml2
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml2
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml2
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml2
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml2
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml2
-rw-r--r--jjb/logging-analytics/logging-analytics.yaml2
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-java.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml2
-rw-r--r--jjb/music/music.yaml2
-rw-r--r--jjb/oparent/oparent.yaml2
-rw-r--r--jjb/optf/optf-cmso.yaml2
-rw-r--r--jjb/optf/optf-has.yaml2
-rw-r--r--jjb/optf/optf-osdf.yaml2
-rw-r--r--jjb/policy/policy-apex-pdp.yaml2
-rw-r--r--jjb/policy/policy-api.yaml2
-rw-r--r--jjb/policy/policy-common.yaml2
-rw-r--r--jjb/policy/policy-distribution.yaml4
-rw-r--r--jjb/policy/policy-docker-base-common.yaml4
-rw-r--r--jjb/policy/policy-drools-applications.yaml2
-rw-r--r--jjb/policy/policy-drools-pdp.yaml2
-rw-r--r--jjb/policy/policy-engine.yaml4
-rw-r--r--jjb/policy/policy-models.yaml2
-rw-r--r--jjb/policy/policy-pap.yaml2
-rw-r--r--jjb/policy/policy-parent.yaml2
-rw-r--r--jjb/policy/policy-xacml-pdp.yaml2
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml2
-rw-r--r--jjb/sdc/sdc-jtosca.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml2
-rw-r--r--jjb/sdnc/sdnc-apps.yaml4
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml4
-rw-r--r--jjb/sdnc/sdnc-oam.yaml4
-rw-r--r--jjb/so/so-libs.yaml2
-rw-r--r--jjb/so/so.yaml2
-rw-r--r--jjb/testsuite/testsuite-heatbridge.yaml2
-rw-r--r--jjb/testsuite/testsuite-python-testing-utils.yaml4
-rw-r--r--jjb/testsuite/testsuite.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-db.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh75
-rw-r--r--jjb/vnfsdk/vnfsdk-ves-agent.yaml17
109 files changed, 239 insertions, 116 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index efad52617..5531462a6 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -16,7 +16,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker'
build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 13a1c5c5a..51fec3710 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -15,7 +15,7 @@
build-node: ubuntu1604-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/aai-common'
stream:
- 'master':
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 71e05e0c3..10a433be4 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/babel'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index fa5f487eb..eaf3e8ff2 100644
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -15,7 +15,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/cacher'
stream:
- 'master':
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index 031e3f0b2..c20c2f903 100644
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/chameleon'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index ac7a91118..b6a029f41 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/champ'
stream:
- 'master':
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index eb918b2bd..1270de422 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/data-router'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index 2c0df6f8a..c32692dc8 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/esr-gui'
stream:
- 'master':
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 695d3cc3f..2c9d99674 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/esr-server'
stream:
- 'master':
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 4c373c011..662966de8 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/event-client'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
index 2a3593dce..7799d91d8 100644
--- a/jjb/aai/aai-gallifrey.yaml
+++ b/jjb/aai/aai-gallifrey.yaml
@@ -15,7 +15,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/gallifrey'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 170971ea3..b22b9058e 100644
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/gizmo'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 5c08eea11..71ab03a5d 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/graphadmin'
stream:
- 'master':
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index fb6f87b99..ea34ec824 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -18,11 +18,13 @@
mvn-params: '-Dmaven.test.skip=true'
build-node: ubuntu1604-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/graphgraph'
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'aai-graphgraph-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index a15128d35..bd17d2503 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/logging-service'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 86505f4c5..626216949 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/model-loader'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 959d441dc..0477982d0 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/resources'
stream:
- 'master':
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index d2871b3c0..568218c7c 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/rest-client'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index da8c56828..1b2b68f21 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/router-core'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 77a9c6f29..9252e4d53 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/schema-service'
stream:
- 'master':
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 0e630c1c4..945f6dcdc 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/search-data-service'
docker-image-name: 'onap/search-data-service'
stream:
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index a1a68d6d2..6835f73ad 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/sparky-be'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index e17dcaf5e..c24f517ce 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -10,7 +10,7 @@
build-node: ubuntu1604-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/sparky-fe'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index d1a19abe6..48e920639 100644
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/spike'
stream:
- 'elalto':
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 33934c680..4453c46fb 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/traversal'
stream:
- 'master':
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index 779f91616..1168c32d8 100644
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -21,7 +21,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'aai/validation'
stream:
- 'elalto':
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 9378e74a9..2f12135b4 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -10,7 +10,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'appc/cdt'
stream:
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 3d16d2298..76226987b 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -18,7 +18,7 @@
- '{project-name}-{stream}-release-version-java-daily':
build-node: ubuntu1604-builder-8c-8g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'appc'
stream:
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index fa63bb231..7a931c0ef 100644
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -16,7 +16,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'appc/parent'
stream:
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index b62663133..c62fb3b7d 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -21,7 +21,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/apps'
stream:
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index d158624e8..885329c2c 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -17,7 +17,7 @@
maven-version: "mvn35"
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/cds'
stream:
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 1236fcda2..cdb6f2a82 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -8,7 +8,7 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/dashboard'
stream:
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 8aa65bb0c..e837a7fa9 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -17,7 +17,7 @@
maven-version: "mvn35"
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/distribution'
stream:
- 'master':
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 4c7c331b9..fbbab16ee 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -9,7 +9,7 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/features'
stream:
@@ -17,6 +17,8 @@
branch: 'master'
- 'elalto':
branch: 'elalto'
+ - 'elalto-fluorine':
+ branch: 'elalto-fluorine'
mvn-settings: 'ccsdk-features-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
@@ -26,6 +28,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
build-node: ubuntu1604-builder-4c-4g
- project:
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 05af05d0e..cd04db752 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -11,7 +11,7 @@
sign-artifacts: true
cron: ''
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index e9b6ebd1e..ab6497673 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -9,7 +9,7 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/platform/plugins'
stream:
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 256efac97..bb05ee387 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -9,7 +9,7 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/sli/adaptors'
stream:
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 7cdc27120..a6415b6d1 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -9,7 +9,7 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/sli/core'
stream:
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 3715e1b7e..54de27aff 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -8,7 +8,7 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
sign-artifacts: true
project: 'ccsdk/sli/northbound'
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 60161b002..e08c8d0e7 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -9,7 +9,7 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/sli/plugins'
stream:
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index ca72bea15..03350a881 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -9,7 +9,7 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'ccsdk/utils'
stream:
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index bbccbc2b9..2a4ef2953 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -19,7 +19,7 @@
- '{project-name}-{stream}-merge-java':
mvn-goals: 'clean install'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
mvn-goals: 'clean deploy docker:build -DpushImage'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index 230df5e87..1ba7b1599 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -21,7 +21,7 @@
mvn-params: '-DskipTests=true'
- '{project-name}-{stream}-merge-java'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 35ac5eea4..ad771b773 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,8 @@
stream:
- 'master':
branch: 'master'
- - 'el-alto':
- branch: 'el-alto'
+ - 'elalto':
+ branch: 'elalto'
# apply to all jobs
project: 'dcaegen2/collectors/datafile'
mvn-settings: 'dcaegen2-collectors-datafile-settings'
@@ -22,7 +22,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 716f29ff6..e2d63007f 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
# apply to all jobs
project: 'dcaegen2/collectors/hv-ves'
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
@@ -20,7 +22,7 @@
- '{project-name}-{stream}-merge-java':
mvn-goals: 'clean deploy'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 2f80211ca..189de7a32 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -15,7 +15,7 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImageTag'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'dcaegen2/collectors/restconf'
stream:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 76efa4f85..4f51f2bf7 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -15,7 +15,7 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImageTag'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'dcaegen2/collectors/ves'
stream:
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index d8f4460af..cb0f944a3 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -11,8 +11,8 @@
stream:
- 'master':
branch: 'master'
- - 'el-alto':
- branch: 'el-alto'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'dcaegen2-deployments-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
index f378ea0f8..38bb84e4a 100644
--- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml
@@ -7,7 +7,7 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index dd788fa71..7b89b1aae 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -26,8 +26,8 @@
stream:
- master:
branch: master
- - el-alto:
- branch: el-alto
+ - elalto:
+ branch: elalto
- project:
name: dcaegen2-platform-configbinding-sonar
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index 77c4efc08..3851bb6fc 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -11,8 +11,8 @@
stream:
- 'master':
branch: 'master'
- - 'el-alto':
- branch: 'el-alto'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 45502a842..9b3a387fb 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -10,7 +10,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
@@ -21,8 +21,8 @@
stream:
- 'master':
branch: 'master'
- - 'el-alto':
- branch: 'el-alto'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'dcaegen2-platform-inventory-api-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index 3472d79f5..2f0ec21c0 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -10,7 +10,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
@@ -21,8 +21,8 @@
stream:
- 'master':
branch: 'master'
- - 'el-alto':
- branch: 'el-alto'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
# due to a strange macro / variable translation problem this needs
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 4fa3ff572..d2774a134 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -15,12 +15,14 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'dcaegen2/services/mapper'
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'dcaegen2-services-mapper-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 83f047c21..dc6eac1a3 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,8 +6,8 @@
stream:
- 'master':
branch: 'master'
- - 'el-alto':
- branch: 'el-alto'
+ - 'elalto':
+ branch: 'elalto'
# apply to all jobs
project: 'dcaegen2/services/pm-mapper'
mvn-settings: 'dcaegen2-services-pm-mapper-settings'
@@ -26,7 +26,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 3786b7d9b..cb9130f59 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -15,11 +15,13 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build docker:push'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'dcaegen2/services/prh'
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'dcaegen2-services-prh-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index d0b00c02e..0f8dc19ef 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -15,12 +15,14 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-goals: 'clean package docker:build -DpushImageTag'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'dcaegen2/services/son-handler'
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'dcaegen2-services-son-handler-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index dd4a4e47d..aa58fee97 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -14,7 +14,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'dmaap/datarouter'
stream:
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 0f5da070e..6e297e8c4 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'dmaap/messagerouter/mirroragent'
stream:
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 3ef84fa0a..8eff9f67d 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'dmaap/messagerouter/msgrtr'
stream:
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index beb1f63bc..4069552fb 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@ -16,7 +16,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: logging-analytics/pomba/pomba-aai-context-builder
stream:
- 'master':
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
index 0677cb027..f8d94e75a 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: logging-analytics/pomba/pomba-audit-common
stream:
- 'master':
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
index 6fdd62310..938d5f963 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@ -16,7 +16,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: logging-analytics/pomba/pomba-context-aggregator
stream:
- 'master':
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index 1c5a6dc52..8c077fa04 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@ -16,7 +16,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: logging-analytics/pomba/pomba-network-discovery-context-builder
stream:
- 'master':
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
index f88604382..21491c303 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
@@ -16,7 +16,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: logging-analytics/pomba/pomba-sdc-context-builder
stream:
- 'master':
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index f9147b58a..3765a33b9 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@ -16,7 +16,7 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: logging-analytics/pomba/pomba-sdnc-context-builder
stream:
- 'master':
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 8f962187f..bead4e5d8 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'logging-analytics'
stream:
- 'master':
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 6fd0ccfb1..388f94c30 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -31,7 +31,7 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 1f86f8523..c29787214 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -28,7 +28,7 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index f87132498..42d26721e 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -66,7 +66,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-memcached-4c-4g'
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index abf404f0b..5bbaae3ca 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -22,7 +22,7 @@
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -P docker'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'music'
stream:
- 'master':
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index f13cbb301..b4d3ca797 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'oparent'
stream:
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index db919c0a0..bc22c1569 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -25,7 +25,7 @@
maven-properties: |
cmso.registry=$
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
build-node: ubuntu1604-docker-8c-8g
project: 'optf/cmso'
stream:
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 831988da7..8fc49df1b 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -24,7 +24,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-builder-4c-4g'
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index a5f5e413e..b5b4dc5bd 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -23,7 +23,7 @@
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-builder-4c-4g'
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 5f515986e..6823ed92f 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -25,7 +25,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/apex-pdp'
stream:
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 39785efa5..ea20cea04 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -19,7 +19,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/api'
stream:
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 2b7d045e1..d908b072a 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/common'
stream:
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 4c2c03e62..7209baff1 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -19,12 +19,14 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/distribution'
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'policy-distribution-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 42f7f6bef..4113bfd0a 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -16,7 +16,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/docker'
stream:
@@ -73,7 +73,7 @@
build-node: ubuntu1604-docker-8c-8g
- '{project-name}-multiarch-docker-stage-{stream}'
# - '{project-name}-gerrit-release-jobs':
-# build-node: centos7-builder-4c-4g
+# build-node: centos7-docker-8c-8g
project: 'policy/docker'
stream:
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 730376330..47f27ffac 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -19,7 +19,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/drools-applications'
stream:
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 440e6407e..b1ddf3452 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -19,7 +19,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/drools-pdp'
stream:
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 32651a792..bbdcbcff2 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -19,12 +19,14 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/engine'
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'policy-engine-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index aa6fb9600..f60572a17 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/models'
stream:
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 6a8b08835..65ff979eb 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -19,7 +19,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/pap'
stream:
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 2f82d7724..ef6891cce 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/parent'
stream:
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index c723fff4c..11d2f496a 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -19,7 +19,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'policy/xacml-pdp'
stream:
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 91eb0fe2a..f15dfc0d5 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -19,7 +19,7 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'portal/sdk'
stream:
- 'master':
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 4088aeba9..806b1cc68 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'sdc/jtosca'
stream:
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 3ad86fc8a..c7a3424ab 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'sdc/sdc-distribution-client'
stream:
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 78c898662..98725b895 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -16,7 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'sdc/sdc-tosca'
stream:
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 7a2c2a71e..edb5b90a8 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -21,12 +21,14 @@
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-version: "mvn35"
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'sdnc/apps'
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
- 'elalto-fluorine':
branch: 'elalto-fluorine'
mvn-settings: 'sdnc-apps-settings'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 8363700da..d7d816d5f 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -9,12 +9,14 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'sdnc/northbound'
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
- 'elalto-fluorine':
branch: 'elalto-fluorine'
mvn-settings: 'sdnc-northbound-settings'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 73b58dd92..d74810537 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -18,11 +18,13 @@
maven-version: "mvn35"
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'sdnc/oam'
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
- 'elalto-fluorine':
branch: 'elalto-fluorine'
mvn-settings: 'sdnc-oam-settings'
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 09e9c2243..977d397fe 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -10,7 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'so/libs'
stream:
- 'master':
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 6ff962e91..21e9c643e 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -22,7 +22,7 @@
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
project: 'so'
stream:
- 'master':
diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml
index 20ba913b7..47c727cb6 100644
--- a/jjb/testsuite/testsuite-heatbridge.yaml
+++ b/jjb/testsuite/testsuite-heatbridge.yaml
@@ -15,6 +15,8 @@
branch: 'master'
- 'dublin':
branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'testsuite-heatbridge-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index feade9fcd..f9b756bee 100644
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -16,6 +16,8 @@
branch: 'master'
- 'dublin':
branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'testsuite-python-testing-utils-settings'
files: '**'
archive-artifacts: ''
@@ -30,6 +32,8 @@
branch: 'master'
- 'dublin':
branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'testsuite-python-testing-utils-settings'
build-node: 'centos7-builder-4c-4g'
subproject:
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 0b1e6cb14..0bde8c1a8 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -35,6 +35,8 @@
branch: 'master'
- 'dublin':
branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'testsuite-settings'
- project:
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 0030c0f03..1442e89eb 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -31,7 +31,7 @@
!include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: centos7-redis-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index f9d8f72b6..799a18ec8 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -25,7 +25,7 @@
!include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index fe6587ce7..fdb61ec57 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -26,7 +26,7 @@
!include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index ef69fbcdd..317f8ad66 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -27,7 +27,7 @@
!include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: centos7-redis-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 034177e77..b6ba9e9e6 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -22,7 +22,7 @@
!include-raw-escape: 'build-nfvo-db-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
- project:
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 4a47a2a29..6b836dd9e 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -28,7 +28,7 @@
!include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index 349b532b6..0b121e172 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -21,7 +21,7 @@
mvn-pom: 'zte/vmanager/pom.xml'
mvn-params: '-f zte/vmanager/pom.xml'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 2fe88456d..0feca60ee 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -21,7 +21,7 @@
!include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
build-node: ubuntu1604-docker-8c-8g
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-builder-4c-4g
+ build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: centos7-redis-4c-4g
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh b/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh
new file mode 100644
index 000000000..4a2a76a21
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+set -x
+
+#3rd party
+cmake_build_type=RELEASE
+LEVELDB_VER=1.22
+THRIFT_VER=0.12.0
+JSON_VER=3.5.0
+SPDLOG_VER=1.3.1
+
+sudo yum install -y cppcheck bison libcurl-devel; yum clean all
+sudo pip install gcovr
+
+#cmake
+cd /tmp/
+wget https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Linux-x86_64.tar.gz
+tar xzvf cmake*.tar.gz
+sudo rpm -e cmake
+sudo ln -s $(pwd)/cmake-3.15.3-Linux-x86_64/bin/cmake /usr/bin/cmake
+
+#leveldb
+cd /tmp
+curl -o leveldb.zip https://codeload.github.com/google/leveldb/zip/$LEVELDB_VER
+unzip leveldb.zip
+rm leveldb.zip
+mv leveldb-$LEVELDB_VER leveldb
+mkdir leveldb/_build
+cd leveldb/_build;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DCMAKE_POSITION_INDEPENDENT_CODE=ON; make -j 10; sudo make install
+
+#json
+cd /tmp
+curl -o json.zip https://codeload.github.com/nlohmann/json/zip/v$JSON_VER
+unzip json.zip
+rm json.zip
+mv json-$JSON_VER json
+cd json;mkdir _build
+cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DJSON_BuildTests=OFF;make -j 10;sudo make install
+
+#spdlog
+cd /tmp
+curl -o spdlog.zip https://codeload.github.com/gabime/spdlog/zip/v$SPDLOG_VER
+unzip spdlog.zip
+rm spdlog.zip
+mv spdlog-$SPDLOG_VER spdlog
+cd spdlog;mkdir _build
+cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DSPDLOG_BUILD_EXAMPLES=OFF -DSPDLOG_BUILD_BENCH=OFF -DSPDLOG_BUILD_TESTS=OFF; make -j 10; sudo make install
+
+#thrift
+cd /tmp
+curl -o thrift.zip https://codeload.github.com/apache/thrift/zip/v$THRIFT_VER
+unzip thrift.zip
+rm thrift.zip
+mv thrift-$THRIFT_VER thrift
+cd thrift;mkdir _build
+cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DBUILD_PYTHON=OFF -DBUILD_JAVA=OFF -DBUILD_C_GLIB=OFF -DWITH_LIBEVENT=OFF -DWITH_ZLIB=OFF -DWITH_OPENSSL=OFF -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON;make -j 10;sudo make install
+
+#verify/sonar
+if [[ "${JOB_NAME}" == "vnfsdk-ves-agent-cmake-sonar" ]]; then
+echo "sonar"
+mkdir -p ${BUILD_DIR}
+cppcheck --enable=all --inconclusive --xml --xml-version=2 --output-file=${BUILD_DIR}/cppcheck.xml .
+
+cd ${BUILD_DIR}
+cat >> sonar-project.properties <<EOF
+sonar.cfamily.gcov.reportsPath=${BUILD_DIR}/coverage
+sonar.cppcheck.reportPath=${BUILD_DIR}/cppcheck.xml
+sonar.exclusions=**/gen-cpp/**/*,**/build/**/*
+sonar.projectBaseDir=${WORKSPACE}/veslibrary/ves_cpplibrary
+sonar.cfamily.threads=4
+EOF
+
+ls ${BUILD_DIR}/sonar-project.properties
+cat ${BUILD_DIR}/sonar-project.properties
+
+fi
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index 6611f5e9b..9be28e091 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -11,6 +11,12 @@
mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - 'gerrit-cmake-verify':
+ build-timeout: 30
+ pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh
+ build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build
+ make-opts: -j6
+ build-node: centos7-builder-4c-4g
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
@@ -31,6 +37,17 @@
name: vnfsdk-ves-agent-sonar
jobs:
- gerrit-maven-sonar
+ - gerrit-cmake-sonar:
+ build-timeout: 60
+ pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh
+ build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build
+ cmake-opts: '-DENABLE_COVERAGE=on -DCOVERAGE_DIR=coverage'
+ sonarcloud-api-token: 35a499f7050cdc8df24bcee4eb205f64e0d8c42a
+ sonarcloud-organization: vnfsdk-ves-agent-vescpplibrary
+ sonarcloud-project-key: org.onap.vnfsdk.ves-agent:cpplib
+ make-opts: -j6
+ stream: master
+ build-node: centos7-builder-4c-4g
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/ves-agent'