summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/aaf/aaf-authz.yaml2
-rw-r--r--jjb/aaf/aaf-cadi.yaml2
-rw-r--r--jjb/aaf/aaf-inno.yaml2
-rw-r--r--jjb/aaf/aaf-sms.yaml2
-rw-r--r--jjb/aaf/aaf-sshsm.yaml2
-rw-r--r--jjb/aai/aai-aai-common.yaml4
-rw-r--r--jjb/aai/aai-aai-config.yaml2
-rw-r--r--jjb/aai/aai-aai-data.yaml2
-rw-r--r--jjb/aai/aai-babel.yaml4
-rw-r--r--jjb/aai/aai-champ.yaml4
-rw-r--r--jjb/aai/aai-data-router.yaml2
-rw-r--r--jjb/aai/aai-eis.yaml2
-rw-r--r--jjb/aai/aai-esr-gui.yaml2
-rw-r--r--jjb/aai/aai-esr-server.yaml4
-rw-r--r--jjb/aai/aai-event-client.yaml2
-rw-r--r--jjb/aai/aai-gap.yaml2
-rw-r--r--jjb/aai/aai-gizmo.yaml4
-rw-r--r--jjb/aai/aai-graphadmin.yaml2
-rw-r--r--jjb/aai/aai-graphgraph.yaml2
-rw-r--r--jjb/aai/aai-logging-service.yaml2
-rw-r--r--jjb/aai/aai-model-loader.yaml4
-rw-r--r--jjb/aai/aai-resources.yaml4
-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-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-tabular-data-service.yaml2
-rw-r--r--jjb/aai/aai-test-config.yaml2
-rw-r--r--jjb/aai/aai-traversal.yaml4
-rw-r--r--jjb/appc/appc-cdt.yaml2
-rw-r--r--jjb/appc/appc-deployment.yaml2
-rw-r--r--jjb/appc/appc-master.yaml10
-rw-r--r--jjb/ccsdk/dashboard.yaml2
-rw-r--r--jjb/ccsdk/platform-nbapi.yaml2
-rw-r--r--jjb/ccsdk/platform-plugins.yaml2
-rw-r--r--jjb/ccsdk/sli-adaptors.yaml4
-rw-r--r--jjb/ccsdk/sli-core.yaml4
-rw-r--r--jjb/ccsdk/sli-northbound.yaml4
-rw-r--r--jjb/ccsdk/sli-plugins.yaml2
-rw-r--r--jjb/ccsdk/storage-pgaas.yaml2
-rw-r--r--jjb/ci-management/ci-management.yaml6
-rw-r--r--jjb/cli/cli.yaml4
-rw-r--r--jjb/dcaegen2/apod-analytics.yaml4
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-ves.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-cli.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-configbinding.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-plugins.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-services-heartbeat.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-utils.yaml4
-rw-r--r--jjb/demo/demo.yaml2
-rw-r--r--jjb/dmaap/dmaap-buscontroller.yaml2
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml2
-rw-r--r--jjb/dmaap/dmaap-dbcapi.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-mirroragent.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-msgrtr.yaml2
-rw-r--r--jjb/doc/doc.yaml2
-rw-r--r--jjb/global-defaults.yaml2
-rw-r--r--jjb/holmes/holmes-common.yaml4
-rw-r--r--jjb/holmes/holmes-dsa.yaml4
-rw-r--r--jjb/holmes/holmes-engine-mgt.yaml4
-rw-r--r--jjb/holmes/holmes-rule-mgt.yaml4
-rw-r--r--jjb/integration/integration-devtool.yaml2
-rw-r--r--jjb/integration/integration-docker.yaml2
-rw-r--r--jjb/integration/integration-seccom.yaml2
-rw-r--r--jjb/integration/integration.yaml2
-rw-r--r--jjb/lab/lab-templates.yaml2
-rw-r--r--jjb/logging-analytics/logging-analytics.yaml8
-rw-r--r--jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml2
-rw-r--r--jjb/modeling/modeling-toscaparsers-nfvparser.yaml2
-rw-r--r--jjb/msb/msb-apigateway.yaml4
-rw-r--r--jjb/msb/msb-discovery.yaml4
-rw-r--r--jjb/msb/msb-java-sdk.yaml4
-rw-r--r--jjb/msb/msb-swagger-sdk.yaml4
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml4
-rw-r--r--jjb/multicloud/multicloud-framework-python.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-java.yaml4
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-python.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml6
-rw-r--r--jjb/music/music-distributed-kv-store.yaml2
-rw-r--r--jjb/music/music.yaml4
-rw-r--r--jjb/oom/oom-registrator.yaml2
-rw-r--r--jjb/oparent/oparent.yaml2
-rw-r--r--jjb/optf/optf-has.yaml4
-rw-r--r--jjb/optf/optf-osdf.yaml4
-rw-r--r--jjb/policy/policy-common.yaml4
-rw-r--r--jjb/policy/policy-docker.yaml2
-rw-r--r--jjb/policy/policy-drools-applications.yaml4
-rw-r--r--jjb/policy/policy-drools-pdp.yaml4
-rw-r--r--jjb/policy/policy-engine.yaml4
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml4
-rw-r--r--jjb/portal/portal.yaml4
-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-docker-base.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml4
-rw-r--r--jjb/sdc/sdc.yaml4
-rw-r--r--jjb/sdnc/sdnc-features.yaml2
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml4
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
-rw-r--r--jjb/so/so-libs.yaml2
-rw-r--r--jjb/so/so.yaml4
-rw-r--r--jjb/testsuite/testsuite-heatbridge-master.yaml2
-rw-r--r--jjb/testsuite/testsuite-properties.yaml2
-rw-r--r--jjb/ui/ui-dmaapbc.yaml4
-rw-r--r--jjb/usecaseui/usecase-ui-server.yaml4
-rw-r--r--jjb/usecaseui/usecase-ui.yaml4
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml4
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml4
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-python.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml6
-rw-r--r--jjb/vid/vid.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-ice-python.yaml6
-rw-r--r--jjb/vnfsdk/vnfsdk-pkgtools-python.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-validation.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-ves-agent.yaml4
-rw-r--r--jjb/vvp/vvp-cms.yaml4
-rw-r--r--jjb/vvp/vvp-devkit.yaml2
-rw-r--r--jjb/vvp/vvp-documentation.yaml2
-rw-r--r--jjb/vvp/vvp-engagementmgr.yaml4
-rw-r--r--jjb/vvp/vvp-gitlab.yaml2
-rw-r--r--jjb/vvp/vvp-image-scanner.yaml4
-rw-r--r--jjb/vvp/vvp-jenkins.yaml4
-rw-r--r--jjb/vvp/vvp-portal.yaml2
-rw-r--r--jjb/vvp/vvp-postgresql.yaml2
-rw-r--r--jjb/vvp/vvp-test-engine.yaml4
-rw-r--r--jjb/vvp/vvp-validation-scripts.yaml4
151 files changed, 230 insertions, 230 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 5d5774894..4850eda79 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aaf/authz'
project-name: 'aaf-authz'
branch: 'master'
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 5752db13b..8943f5cd8 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -19,7 +19,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aaf/cadi'
project-name: 'aaf-cadi'
branch: 'master'
diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml
index a5a900281..0620e1fb6 100644
--- a/jjb/aaf/aaf-inno.yaml
+++ b/jjb/aaf/aaf-inno.yaml
@@ -19,7 +19,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aaf/inno'
project-name: 'aaf-inno'
branch: 'master'
diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index 81aea7400..d09783478 100644
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -14,4 +14,4 @@
mvn-settings: 'aaf-sms-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
index 5908627f6..4bab94692 100644
--- a/jjb/aaf/aaf-sshsm.yaml
+++ b/jjb/aaf/aaf-sshsm.yaml
@@ -16,4 +16,4 @@
mvn-settings: 'aaf-sshsm-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 4fc047e89..326394ec6 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -15,13 +15,13 @@
mvn-settings: 'aai-aai-common-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: aai-aai-common-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/aai-common'
project-name: 'aai-aai-common'
branch: 'master'
diff --git a/jjb/aai/aai-aai-config.yaml b/jjb/aai/aai-aai-config.yaml
index 12a4039c3..52cf5f350 100644
--- a/jjb/aai/aai-aai-config.yaml
+++ b/jjb/aai/aai-aai-config.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'aai-aai-config-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-aai-data.yaml b/jjb/aai/aai-aai-data.yaml
index ad95f6add..e012c0579 100644
--- a/jjb/aai/aai-aai-data.yaml
+++ b/jjb/aai/aai-aai-data.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'aai-aai-data-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index d7e121909..ed68d30e7 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -19,13 +19,13 @@
mvn-settings: 'aai-babel-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: aai-babel-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/babel'
project-name: 'aai-babel'
branch: 'master'
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index 0c1c2e5df..89bab1b41 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -19,13 +19,13 @@
mvn-settings: 'aai-champ-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: aai-champ-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/champ'
project-name: 'aai-champ'
branch: 'master'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index b4ceb6fa7..962645769 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/data-router'
project-name: 'aai-data-router'
branch: 'master'
diff --git a/jjb/aai/aai-eis.yaml b/jjb/aai/aai-eis.yaml
index cfb93fee6..66f20e50a 100644
--- a/jjb/aai/aai-eis.yaml
+++ b/jjb/aai/aai-eis.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'aai-eis-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index f8324c4ca..335c2756e 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -18,5 +18,5 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 113b2d97a..a55501797 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -18,13 +18,13 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: aai-esr-server-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/esr-server'
project-name: 'aai-esr-server'
branch: 'master'
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 6133cbeb6..31b8cf187 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -22,7 +22,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/event-client'
project-name: 'aai-event-client'
branch: 'master'
diff --git a/jjb/aai/aai-gap.yaml b/jjb/aai/aai-gap.yaml
index 320bdd68a..4854bd0b2 100644
--- a/jjb/aai/aai-gap.yaml
+++ b/jjb/aai/aai-gap.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'aai-gap-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index f08c61f72..be73ff987 100644
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -17,13 +17,13 @@
mvn-settings: 'aai-gizmo-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: aai-gizmo-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/gizmo'
project-name: 'aai-gizmo'
branch: 'master'
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 69b1daf61..bd45414f5 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'aai-graphadmin-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 548d1a2fb..5e5ef5262 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'aai-graphgraph-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index f6a15d905..b41e89072 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -21,7 +21,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/logging-service'
project-name: 'aai-logging-service'
branch: 'master'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index e13635477..62a00bf1b 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -20,13 +20,13 @@
mvn-settings: 'aai-model-loader-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: aai-model-loader-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/model-loader'
project-name: 'aai-model-loader'
branch: 'master'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 5c6aac42b..47be5ec27 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -19,13 +19,13 @@
mvn-settings: 'aai-resources-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: aai-resources-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/resources'
project-name: 'aai-resources'
branch: 'master'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 2f3d96a4e..fd2462a07 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -20,7 +20,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/rest-client'
project-name: 'aai-rest-client'
branch: 'master'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 35fc82f7e..758235aed 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -20,7 +20,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/router-core'
project-name: 'aai-router-core'
branch: 'master'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 8273ba3e0..2661a313f 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/search-data-service'
project-name: 'aai-search-data-service'
branch: 'master'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 3901d438e..fa851d820 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/sparky-be'
project-name: 'aai-sparky-be'
branch: 'master'
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 47e7f6f4e..414765fea 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -2,7 +2,7 @@
- project:
name: sparky-fe
project-name: 'aai-sparky-fe'
- build-node: 'centos7-basebuild-4c-4g'
+ build-node: 'centos7-builder-4c-4g'
jobs:
- gerrit-maven-clm:
- '{project-name}-{stream}-verify-java'
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index 4dd6e413e..cd2497150 100644
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'aai-spike-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-tabular-data-service.yaml b/jjb/aai/aai-tabular-data-service.yaml
index 3e7c1922e..d673f83be 100644
--- a/jjb/aai/aai-tabular-data-service.yaml
+++ b/jjb/aai/aai-tabular-data-service.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'aai-tabular-data-service-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-test-config.yaml b/jjb/aai/aai-test-config.yaml
index dfdb22bf2..19cf2b41c 100644
--- a/jjb/aai/aai-test-config.yaml
+++ b/jjb/aai/aai-test-config.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'aai-test-config-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index a0c15cb21..7c3de1b82 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -19,13 +19,13 @@
mvn-settings: 'aai-traversal-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: aai-traversal-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'aai/traversal'
project-name: 'aai-traversal'
branch: 'master'
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 22e57e368..ea973d3cb 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -14,4 +14,4 @@
mvn-settings: 'appc-cdt-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 2d4852f9c..c3f9edcc8 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -21,4 +21,4 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index e18d9ea9f..1fd6e20e1 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -6,11 +6,11 @@
- gerrit-maven-clm:
mvn-params: '-DskipTests'
build-timeout: 30
- build-node: ubuntu1604-basebuild-8c-8g
+ build-node: ubuntu1604-builder-8c-8g
- '{project-name}-{stream}-verify-java':
- build-node: ubuntu1604-basebuild-8c-8g
+ build-node: ubuntu1604-builder-8c-8g
- '{project-name}-{stream}-merge-java':
- build-node: ubuntu1604-basebuild-8c-8g
+ build-node: ubuntu1604-builder-8c-8g
- '{project-name}-{stream}-release-version-java-daily'
project: 'appc'
@@ -20,13 +20,13 @@
mvn-settings: 'appc-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: appc-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-8c-8g
+ build-node: ubuntu1604-builder-8c-8g
project: 'appc'
project-name: 'appc'
branch: 'master'
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index d3ceafeec..f28d88145 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/dashboard'
project-name: 'ccsdk-dashboard'
branch: 'master'
diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml
index 471ca3483..9075905bf 100644
--- a/jjb/ccsdk/platform-nbapi.yaml
+++ b/jjb/ccsdk/platform-nbapi.yaml
@@ -25,7 +25,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/platform/nbapi'
project-name: 'ccsdk-platform-nbapi'
branch: 'master'
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index 1616aec59..d2e1c849a 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -25,7 +25,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/platform/plugins'
project-name: 'ccsdk-platform-plugins'
branch: 'master'
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 87cf52c95..7692fee84 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -20,13 +20,13 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: ccsdk-sli-adaptors-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/sli/adaptors'
project-name: 'ccsdk-sli-adaptors'
branch: 'master'
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 032fc0cd5..ebfc3718c 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -20,13 +20,13 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: ccsdk-sli-core-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/sli/core'
project-name: 'ccsdk-sli-core'
branch: 'master'
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 155d0ad31..58b787c45 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -20,13 +20,13 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: ccsdk-sli-northbound-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/sli/northbound'
project-name: 'ccsdk-sli-northbound'
branch: 'master'
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index e1a9bc8c5..50210d545 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -25,7 +25,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/sli/plugins'
project-name: 'ccsdk-sli-plugins'
branch: 'master'
diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml
index 3485ded25..d55781e1c 100644
--- a/jjb/ccsdk/storage-pgaas.yaml
+++ b/jjb/ccsdk/storage-pgaas.yaml
@@ -25,7 +25,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'ccsdk/storage/pgaas'
project-name: 'ccsdk-storage-pgaas'
branch: 'master'
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 56a6c585b..528639e7d 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -9,7 +9,7 @@
archive-artifacts: '**/*.log'
branch: 'master'
build-timeout: '60'
- build-node: 'centos7-basebuild-2c-1g'
+ build-node: 'centos7-builder-2c-1g'
jjb-version: 2.0.0
- project:
@@ -21,12 +21,12 @@
project-name: 'ci-management'
branch: master
archive-artifacts: '**/*.log'
- build-node: 'centos7-basebuild-2c-1g'
+ build-node: 'centos7-builder-2c-1g'
platforms:
- centos
- ubuntu-16.04
templates:
- - basebuild
+ - builder
- docker
- memcached
- redis
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index ca3b36ff2..ef6fc0c39 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -20,13 +20,13 @@
mvn-settings: 'cli-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: cli-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'cli'
project-name: 'cli'
branch: 'master'
diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index 10f104602..d3fa0874b 100644
--- a/jjb/dcaegen2/apod-analytics.yaml
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -15,7 +15,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-maven-clm
@@ -29,7 +29,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/analytics/tca'
project-name: 'dcaegen2-analytics-tca'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 134240d02..47f75bbe5 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -26,7 +26,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/collectors/snmptrap'
project-name: 'dcaegen2-collectors-snmptrap'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index a6486048a..641ace5f6 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -26,7 +26,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/collectors/ves'
project-name: 'dcaegen2-collectors-ves'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
index 6424e11bb..2cb26dd3b 100644
--- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
@@ -26,7 +26,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/platform/cli'
project-name: 'dcaegen2-platform-cli'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 9266802da..6d81b778d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -26,7 +26,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/platform/configbinding'
project-name: 'dcaegen2-platform-configbinding'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 27632c8f7..8b5b88b15 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -30,7 +30,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/platform/inventory-api'
project-name: 'dcaegen2-platform-inventory-api'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 70bc7ef8a..6aa6f1e25 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -26,7 +26,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/platform/plugins'
project-name: 'dcaegen2-platform-plugins'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index 838638d6e..c968ebcd3 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -26,7 +26,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/platform/policy-handler'
project-name: 'dcaegen2-platform-policy-handler'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 295ce274f..6803f47af 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -26,7 +26,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/services/heartbeat'
project-name: 'dcaegen2-services-heartbeat'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 96b95bf28..25da4759c 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -40,13 +40,13 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
- project:
name: dcaegen2-utils-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dcaegen2/utils'
project-name: 'dcaegen2-utils'
branch: 'master'
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 07e53928b..1560589dc 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -23,7 +23,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'demo'
project-name: 'demo'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 2b0206ac0..34b3055d8 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -29,7 +29,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dmaap/buscontroller'
project-name: 'dmaap-buscontroller'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 1ad6daf44..d9548cf01 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -18,7 +18,7 @@
name: dmaap-datarouter-sonar
jobs:
- gerrit-maven-sonar
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dmaap/datarouter'
project-name: 'dmaap-datarouter'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index 602734c79..8eb25089b 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -25,7 +25,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dmaap/dbcapi'
project-name: 'dmaap-dbcapi'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index c9ddf7b34..b5007521b 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -19,7 +19,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dmaap/messagerouter/dmaapclient'
project-name: 'dmaap-messagerouter-dmaapclient'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 3270204c6..6dd1e3775 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -19,7 +19,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dmaap/messagerouter/messageservice'
project-name: 'dmaap-messagerouter-messageservice'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 6b0c1024e..ecbc783cc 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -19,7 +19,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dmaap/messagerouter/mirroragent'
project-name: 'dmaap-messagerouter-mirroragent'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 8de95da18..346211be4 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -19,7 +19,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'dmaap/messagerouter/msgrtr'
project-name: 'dmaap-messagerouter-msgrtr'
branch: 'master'
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 21111d06e..03a9e18cb 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -5,7 +5,7 @@
jobs:
- gerrit-maven-clm
- '{project-name}-{stream}-verify-rtd':
- build-node: centos7-basebuild-4c-4g
+ build-node: centos7-builder-4c-4g
- '{project-name}-{stream}-merge-rtd'
project: 'doc'
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 9de47bf9a..64f6a74eb 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -32,7 +32,7 @@
# Timeout in minutes
build-timeout: 90
- build-node: ubuntu1604-basebuild-2c-1g
+ build-node: ubuntu1604-builder-2c-1g
archive-artifacts: ''
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index c0061a2ba..8fb735ade 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -15,13 +15,13 @@
mvn-settings: 'holmes-common-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: holmes-common-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'holmes/common'
project-name: 'holmes-common'
branch: 'master'
diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
index 3819cc35f..a44a9e5f8 100644
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -18,13 +18,13 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: holmes-dsa-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'holmes/dsa'
project-name: 'holmes-dsa'
branch: 'master'
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 857a57d64..db1eeeee6 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -18,13 +18,13 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: holmes-engine-management-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'holmes/engine-management'
project-name: 'holmes-engine-management'
branch: 'master'
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 83021aca4..3b5638e52 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -18,13 +18,13 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: holmes-rule-management-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'holmes/rule-management'
project-name: 'holmes-rule-management'
branch: 'master'
diff --git a/jjb/integration/integration-devtool.yaml b/jjb/integration/integration-devtool.yaml
index 15b436915..175dffa5a 100644
--- a/jjb/integration/integration-devtool.yaml
+++ b/jjb/integration/integration-devtool.yaml
@@ -13,4 +13,4 @@
- 'master':
branch: 'master'
mvn-settings: 'integration-devtool-settings'
- build-node: ubuntu1604-basebuild-2c-1g
+ build-node: ubuntu1604-builder-2c-1g
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 92125d4ff..3b0e72576 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -16,4 +16,4 @@
mvn-settings: 'integration-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml
index f164a12b8..fac83caed 100644
--- a/jjb/integration/integration-seccom.yaml
+++ b/jjb/integration/integration-seccom.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'integration-seccom-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 4f293d6de..6c700fb61 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -18,4 +18,4 @@
mvn-settings: 'integration-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml
index b35344083..5f46494df 100644
--- a/jjb/lab/lab-templates.yaml
+++ b/jjb/lab/lab-templates.yaml
@@ -4,7 +4,7 @@
description: '{job-desc}'
disabled: false
project-type: freestyle
- build-node: ubuntu1604-basebuild-2c-1g
+ build-node: ubuntu1604-builder-2c-1g
properties:
- lf-infra-properties:
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index aa26fbcc6..9fbcaef62 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -17,13 +17,13 @@
mvn-settings: 'logging-analytics-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: logging-analytics-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'logging-analytics'
project-name: 'logging-analytics'
branch: 'master'
@@ -53,7 +53,7 @@
- '{project-name}-{subproject}-python-release-{stream}'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: logging-analytics-pylog-python
project-name: 'logging-analytics-pylog'
@@ -62,7 +62,7 @@
- 'master':
branch: 'master'
mvn-settings: 'logging-analytics-settings'
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
subproject:
- 'pylog':
path: 'pylog'
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 5cda615f1..5bdfc0e04 100644
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -30,7 +30,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'modeling/toscaparsers'
project-name: 'modeling-toscaparsers'
branch: 'master'
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 4a0789f3b..5cdeea23d 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'modeling-toscaparsers-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
subproject:
- 'nfvparser':
path: 'nfvparser/'
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 66cf96d03..d9db19dd1 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -20,13 +20,13 @@
mvn-settings: 'msb-apigateway-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: msb-apigateway-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'msb/apigateway'
project-name: 'msb-apigateway'
branch: 'master'
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index b75c08ceb..3ef99d709 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -19,13 +19,13 @@
mvn-settings: 'msb-discovery-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: msb-discovery-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'msb/discovery'
project-name: 'msb-discovery'
branch: 'master'
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 88ebb3fe2..e23654216 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -14,13 +14,13 @@
mvn-settings: 'msb-java-sdk-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: msb-java-sdk-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'msb/java-sdk'
project-name: 'msb-java-sdk'
branch: 'master'
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 6a52bd605..5bf3715a2 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -14,13 +14,13 @@
mvn-settings: 'msb-swagger-sdk-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: msb-swagger-sdk-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'msb/swagger-sdk'
project-name: 'msb-swagger-sdk'
branch: 'master'
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 7d7e3b9c5..d241331ff 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -23,13 +23,13 @@
!include-raw-escape: 'build-multicloud-framework-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: multicloud-framework-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/framework'
project-name: 'multicloud-framework'
branch: 'master'
diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml
index 4fcad3e3d..c8b4b35ad 100644
--- a/jjb/multicloud/multicloud-framework-python.yaml
+++ b/jjb/multicloud/multicloud-framework-python.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'multicloud-framework-settings'
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
subproject:
- 'multivimbroker':
path: 'multivimbroker'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 71c11162f..0366abdd8 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -23,13 +23,13 @@
!include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: multicloud-openstack-vmware-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/openstack/vmware'
project-name: 'multicloud-openstack-vmware'
branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
index 62e52f244..a23ecf3d4 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-python.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'multicloud-openstack-vmware-settings'
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
subproject:
- 'vio':
path: 'vio'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
index 1d4fa6b33..2bcb2e870 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
@@ -22,4 +22,4 @@
!include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
index 0a8fcd4a0..ca22904a6 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'multicloud-openstack-vmware-settings'
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
subproject:
- 'vesagent':
path: 'vesagent'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 9260ea9aa..dffbd1f4f 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -47,7 +47,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-newton'
branch: 'master'
@@ -60,7 +60,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-ocata'
branch: 'master'
@@ -73,7 +73,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'multicloud/openstack'
project-name: 'multicloud-openstack-windriver'
branch: 'master'
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 1bb3c7151..0de8a8665 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -14,4 +14,4 @@
mvn-settings: 'music-distributed-kv-store-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 780d5224c..0866f063e 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -17,14 +17,14 @@
mvn-settings: 'music-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: music-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'music'
project-name: 'music'
branch: 'master'
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index befce135d..725c67efc 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -19,4 +19,4 @@
mvn-settings: 'oom-registrator-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index 4ca31ed2e..58d5f31be 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -21,4 +21,4 @@
mvn-settings: 'oparent-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index ffb16c0db..ddbccf651 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -26,13 +26,13 @@
!include-raw-escape: 'build-optf-has-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
- project:
name: optf-has-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'optf/has'
project-name: 'optf-has'
branch: 'master'
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index d58611ca5..c93cccff6 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -25,13 +25,13 @@
!include-raw-escape: 'build-optf-osdf-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
- project:
name: optf-osdf-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'optf/osdf'
project-name: 'optf-osdf'
branch: 'master'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index fb760424c..dfb012cdb 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -15,13 +15,13 @@
mvn-settings: 'policy-common-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: policy-common-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'policy/common'
project-name: 'policy-common'
branch: 'master'
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index de1392cc2..0eb5d7f07 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -25,4 +25,4 @@
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index ccf078eed..39879c8a4 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -16,13 +16,13 @@
mvn-settings: 'policy-drools-applications-settings'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
- project:
name: policy-drools-applications-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'policy/drools-applications'
project-name: 'policy-drools-applications'
branch: 'master'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 3fc8f576e..bacd997c6 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -26,13 +26,13 @@
mvn-settings: 'policy-drools-pdp-settings'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
- project:
name: policy-drools-pdp-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'policy/drools-pdp'
project-name: 'policy-drools-pdp'
branch: 'master'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index a8a9a1766..c364ef537 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -26,13 +26,13 @@
mvn-settings: 'policy-engine-settings'
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-basebuild-4c-4g'
+ build-node: 'ubuntu1604-builder-4c-4g'
- project:
name: policy-engine-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'policy/engine'
project-name: 'policy-engine'
branch: 'master'
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 2d6d9365c..b8a8a74ed 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -23,13 +23,13 @@
mvn-settings: 'portal-sdk-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: portal-sdk-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'portal/sdk'
project-name: 'portal-sdk'
branch: 'master'
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 5f244f6ed..9a04c1e6a 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -14,14 +14,14 @@
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER
- project:
name: portal-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'portal'
project-name: 'portal'
branch: 'master'
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index c9dd15c6e..e9dbe6043 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -21,7 +21,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'sdc/jtosca'
project-name: 'sdc-jtosca'
branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index e685eab2e..d6b9f8078 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -21,7 +21,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'sdc/sdc-distribution-client'
project-name: 'sdc-sdc-distribution-client'
branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 6b59c5259..4cc78ed51 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -14,4 +14,4 @@
mvn-settings: 'sdc-sdc-docker-base-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-8c-8g
+ build-node: ubuntu1604-builder-8c-8g
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 1bf90bdfe..2ff56969c 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -21,7 +21,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'sdc/sdc-tosca'
project-name: 'sdc-sdc-tosca'
branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 6d6f3a29e..04a0c2d8f 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -17,13 +17,13 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: sdc-sdc-workflow-designer-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'sdc/sdc-workflow-designer'
project-name: 'sdc-sdc-workflow-designer'
branch: 'master'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index bc99a175e..e751311ef 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -20,13 +20,13 @@
mvn-settings: 'sdc-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-8c-8g
+ build-node: ubuntu1604-builder-8c-8g
- project:
name: sdc-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-8c-8g
+ build-node: ubuntu1604-builder-8c-8g
project: 'sdc'
project-name: 'sdc'
branch: 'master'
diff --git a/jjb/sdnc/sdnc-features.yaml b/jjb/sdnc/sdnc-features.yaml
index 04670fbad..e134928ee 100644
--- a/jjb/sdnc/sdnc-features.yaml
+++ b/jjb/sdnc/sdnc-features.yaml
@@ -12,4 +12,4 @@
mvn-settings: 'sdnc-features-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index e7307757d..5f9e2f1e3 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -21,13 +21,13 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: sdnc-northbound-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'sdnc/northbound'
project-name: 'sdnc-northbound'
branch: 'master'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index e4bfb4c9a..476707f86 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -19,4 +19,4 @@
mvn-settings: 'sdnc-oam-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 719b424d3..1ff4ca444 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'so/libs'
project-name: 'so-libs'
branch: 'master'
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 213ffdebf..3e8efc7ab 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -26,13 +26,13 @@
mvn-settings: 'so-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: so-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'so'
project-name: 'so'
branch: 'master'
diff --git a/jjb/testsuite/testsuite-heatbridge-master.yaml b/jjb/testsuite/testsuite-heatbridge-master.yaml
index 1a686d729..aea8385ac 100644
--- a/jjb/testsuite/testsuite-heatbridge-master.yaml
+++ b/jjb/testsuite/testsuite-heatbridge-master.yaml
@@ -17,4 +17,4 @@
mvn-settings: 'testsuite-heatbridge-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/testsuite/testsuite-properties.yaml b/jjb/testsuite/testsuite-properties.yaml
index a4b8608ec..252a2493e 100644
--- a/jjb/testsuite/testsuite-properties.yaml
+++ b/jjb/testsuite/testsuite-properties.yaml
@@ -11,4 +11,4 @@
mvn-settings: 'testsuite-properties-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml
index 1438b3d98..5a896b822 100644
--- a/jjb/ui/ui-dmaapbc.yaml
+++ b/jjb/ui/ui-dmaapbc.yaml
@@ -17,13 +17,13 @@
mvn-settings: 'ui-dmaapbc-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: ui-dmaapbc-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'ui/dmaapbc'
project-name: 'ui-dmaapbc'
branch: 'master'
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 15a0f7778..c0bb0f325 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -18,13 +18,13 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: usecase-ui-server-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'usecase-ui/server'
project-name: 'usecase-ui-server'
branch: 'master'
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index af637f432..42903955e 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -18,13 +18,13 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: usecase-ui-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-8c-8g
+ build-node: ubuntu1604-builder-8c-8g
project: 'usecase-ui'
project-name: 'usecase-ui'
branch: 'master'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 11abc267b..27ca086c2 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -23,14 +23,14 @@
!include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-gvnfm-vnfmgr-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
mvn-params: '-f mgr/pom.xml'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/gvnfm/vnfmgr'
project-name: 'vfc-gvnfm-vnfmgr'
branch: 'master'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
index 9de9b0fea..6c9afedc8 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
subproject:
- 'mgr':
path: 'mgr'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index f37d46d49..8da145249 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -24,14 +24,14 @@
!include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-gvnfm-vnfres-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
mvn-params: '-f res/pom.xml'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/gvnfm/vnfres'
project-name: 'vfc-gvnfm-vnfres'
branch: 'master'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
index db7762f3e..f1723305d 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-gvnfm-vnfres-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
subproject:
- 'res':
path: 'res'
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index f8955c3c2..69f192e40 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -24,13 +24,13 @@
!include-raw-escape: 'build-driver-ems-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-driver-ems-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/driver/ems'
project-name: 'vfc-nfvo-driver-ems'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 680076291..ffac8a65a 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -23,14 +23,14 @@
!include-raw-escape: 'build-driver-zte-sfc-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-driver-sfc-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
mvn-params: '-f zte/sfc-driver/pom.xml'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/driver/sfc'
project-name: 'vfc-nfvo-driver-sfc'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 88c316453..ace1f8626 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -19,13 +19,13 @@
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-driver-svnfm-huawei-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
mvn-params: '-f huawei/pom.xml'
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-svnfm-huawei'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 4470606da..7769c2b74 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -24,14 +24,14 @@
!include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
mvn-params: '-f gvnfmadapter/pom.xml'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/gvnfm'
project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
index a9e6afa7b..a1efb31b9 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
@@ -18,13 +18,13 @@
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-juju-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
mvn-params: '-f juju/juju-vnfmadapter/pom.xml'
project: 'vfc/nfvo/driver/vnfm/gvnfm'
project-name: 'vfc-nfvo-driver-vnfm-gvnfm-juju'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
index a1a7d236d..255238644 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
subproject:
- 'gvnfmadapter':
path: 'gvnfmadapter'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
index cec8aa6b9..69606b4b5 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
@@ -16,13 +16,13 @@
!include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-vnfm-svnfm'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index b60c4049d..0accce8f7 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -19,14 +19,14 @@
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
mvn-params: '-f nokia/vnfmdriver/pom.xml'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokia'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index 941662003..dbfdd39e6 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -19,14 +19,14 @@
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
mvn-params: '-f nokiav2/pom.xml'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokiav2'
branch: 'master'
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 96d8055d1..557f7cfc5 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -20,14 +20,14 @@
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
mvn-params: '-f zte/vmanager/pom.xml'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
index 79a392337..0f77612cd 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
subproject:
- 'drv-vnfm-zte':
path: 'zte/vmanager'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index c8888f719..0002c35ab 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -8,7 +8,7 @@
stream:
- 'master':
branch: 'master'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-maven-clm:
- '{project-name}-{stream}-verify-java'
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/resmanagement'
project-name: 'vfc-nfvo-resmanagement'
branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 991b6d4f3..c35b6a89c 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -28,14 +28,14 @@
mvn-goals: 'clean'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vfc-nfvo-wfengine-wfenginemgrservice-sonar
jobs:
- gerrit-maven-sonar
mvn-params: '-f wfenginemgrservice/pom.xml'
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/wfengine'
project-name: 'vfc-nfvo-wfengine-wfenginemgrservice'
branch: 'master'
@@ -48,7 +48,7 @@
- gerrit-maven-sonar
mvn-params: '-f activiti-extension/pom.xml'
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vfc/nfvo/wfengine'
project-name: 'vfc-nfvo-wfengine-activiti-extension'
branch: 'master'
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 4dc5285dc..06e13255e 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -17,13 +17,13 @@
mvn-settings: 'vid-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vid-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vid'
project-name: 'vid'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index bc9be9aef..17760b614 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -15,7 +15,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vnfsdk-dovetail-integration-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
@@ -26,7 +26,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/dovetail-integration'
project-name: 'vnfsdk-dovetail-integration'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index ab737a567..b82ea8e71 100644
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -22,7 +22,7 @@
tox-dir: 'ice-server/'
tox-envs: ''
mvn-settings: 'vnfsdk-ice-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
@@ -34,7 +34,7 @@
- gerrit-maven-sonar
cron: 'H 11 * * *'
mvn-params: '-f validation-scripts/pom.xml'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/ice'
project-name: 'vnfsdk-ice-validation-scripts'
branch: 'master'
@@ -47,7 +47,7 @@
- gerrit-maven-sonar
cron: 'H 11 * * *'
mvn-params: '-f ice-server/pom.xml'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/ice'
project-name: 'vnfsdk-ice-ice-server'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index 215e76fdb..5479abe58 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -14,7 +14,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vnfsdk-pkgtools-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/pkgtools'
project-name: 'vnfsdk-pkgtools'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 07dd8e75f..83081708e 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -22,13 +22,13 @@
mvn-settings: 'vnfsdk-refrepo-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vnfsdk-refrepo-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/refrepo'
project-name: 'vnfsdk-refrepo'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index f4224b9dc..79b857359 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -15,13 +15,13 @@
mvn-settings: 'vnfsdk-validation-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vnfsdk-validation-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/validation'
project-name: 'vnfsdk-validation'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index a41e68df2..c0bf97011 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -20,13 +20,13 @@
mvn-settings: 'vnfsdk-ves-agent-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
- project:
name: vnfsdk-ves-agent-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vnfsdk/ves-agent'
project-name: 'vnfsdk-ves-agent'
branch: 'master'
diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml
index 8779ee071..027deb2ee 100644
--- a/jjb/vvp/vvp-cms.yaml
+++ b/jjb/vvp/vvp-cms.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-cms-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vvp/cms'
project-name: 'vvp-cms'
branch: 'master'
diff --git a/jjb/vvp/vvp-devkit.yaml b/jjb/vvp/vvp-devkit.yaml
index 5bd0d62e8..01736e16f 100644
--- a/jjb/vvp/vvp-devkit.yaml
+++ b/jjb/vvp/vvp-devkit.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-devkit-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml
index daa8dd853..421123e70 100644
--- a/jjb/vvp/vvp-documentation.yaml
+++ b/jjb/vvp/vvp-documentation.yaml
@@ -7,6 +7,6 @@
- 'master':
branch: 'master'
mvn-settings: 'vvp-documentation-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml
index a01bd8459..5ba163bef 100644
--- a/jjb/vvp/vvp-engagementmgr.yaml
+++ b/jjb/vvp/vvp-engagementmgr.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-engagementmgr-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vvp/engagementmgr'
project-name: 'vvp-engagementmgr'
branch: 'master'
diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml
index 448717a3b..eaeb780f4 100644
--- a/jjb/vvp/vvp-gitlab.yaml
+++ b/jjb/vvp/vvp-gitlab.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-gitlab-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml
index ca802c076..55c3adf31 100644
--- a/jjb/vvp/vvp-image-scanner.yaml
+++ b/jjb/vvp/vvp-image-scanner.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-image-scanner-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vvp/image-scanner'
project-name: 'vvp-image-scanner'
branch: 'master'
diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index 82037046b..447766b82 100644
--- a/jjb/vvp/vvp-jenkins.yaml
+++ b/jjb/vvp/vvp-jenkins.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-jenkins-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm:
- '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vvp/jenkins'
project-name: 'vvp-jenkins'
branch: 'master'
diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml
index 9b2e7794a..4717dc163 100644
--- a/jjb/vvp/vvp-portal.yaml
+++ b/jjb/vvp/vvp-portal.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-portal-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml
index 901c6d7e6..bd56bd030 100644
--- a/jjb/vvp/vvp-postgresql.yaml
+++ b/jjb/vvp/vvp-postgresql.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-postgresql-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index 3c79f06b3..71bbbc8ef 100644
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-test-engine-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
@@ -24,7 +24,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vvp/test-engine'
project-name: 'vvp-test-engine'
branch: 'master'
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 349f68f70..73aaafd3e 100644
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -12,7 +12,7 @@
path: '.'
pattern: '**'
mvn-settings: 'vvp-validation-scripts-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-python-xc-clm
- '{project-name}-{stream}-{subproject}-verify-python'
@@ -21,7 +21,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-builder-4c-4g
project: 'vvp/validation-scripts'
project-name: 'vvp-validation-scripts'
branch: 'master'