summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg3
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg3
-rw-r--r--jjb/cli/cli.yaml6
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics-pnda.yaml4
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics-tca.yaml6
-rw-r--r--jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml2
-rw-r--r--jjb/demo/demo.yaml2
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml2
-rw-r--r--jjb/dmaap/dmaap-dbcapi.yaml2
-rw-r--r--jjb/externalapi/externalapi-nbi.yaml4
-rw-r--r--jjb/holmes/holmes-common.yaml4
-rw-r--r--jjb/holmes/holmes-engine-mgt.yaml4
-rw-r--r--jjb/holmes/holmes-rule-mgt.yaml4
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml4
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml4
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml4
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml4
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml4
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml4
-rw-r--r--jjb/logging-analytics/logging-analytics.yaml4
-rw-r--r--jjb/multicloud/multicloud-k8s.yaml2
-rw-r--r--jjb/music/music-distributed-kv-store.yaml2
-rw-r--r--jjb/music/music-jar.yaml2
-rw-r--r--jjb/music/music-mdbc.yaml2
-rw-r--r--jjb/music/music-prom.yaml2
-rw-r--r--jjb/oom/oom-registrator.yaml2
-rw-r--r--jjb/oparent/oparent.yaml2
-rw-r--r--jjb/openci/openci-onap-daily-jobs.yaml4
-rw-r--r--jjb/so/so-libs.yaml2
-rw-r--r--jjb/testsuite/testsuite-heatbridge.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml6
-rw-r--r--jjb/vnfsdk/vnfsdk-functest.yaml6
-rw-r--r--jjb/vnfsdk/vnfsdk-pkgtools-python.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-validation.yaml6
-rw-r--r--jjb/vnfsdk/vnfsdk-ves-agent.yaml6
35 files changed, 60 insertions, 66 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
deleted file mode 100644
index ec5ae3e9a..000000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855
-LABELS=ubuntu1604-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
deleted file mode 100644
index 65e930c9b..000000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855
-LABELS=ubuntu1604-builder-8c-8g
-HARDWARE_ID=v2-highcpu-8
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 3c603b721..4d1f3de26 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -36,7 +36,7 @@
mvn-settings: 'cli-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: cli-arm64
@@ -66,7 +66,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'cli'
project-name: 'cli'
branch: 'master'
@@ -83,7 +83,7 @@
project-name: 'cli'
branch: 'master'
mvn-settings: 'cli-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: cli-info
diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
index fa3ad68c6..4e65ab981 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
@@ -29,7 +29,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/analytics/pnda'
project-name: 'dcaegen2-analytics-pnda'
branch: 'master'
@@ -43,7 +43,7 @@
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
project: dcaegen2/analytics/pnda
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project-name: 'dcaegen2-analytics-pnda'
branch: 'master'
mvn-settings: 'dcaegen2-analytics-pnda-settings'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
index 2e2296c77..bcb4f91eb 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml
@@ -14,7 +14,7 @@
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-verify-java':
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/analytics/tca'
project-name: 'dcaegen2-analytics-tca'
branch: 'master'
@@ -54,7 +54,7 @@
project: 'dcaegen2/analytics/tca'
project-name: 'dcaegen2-analytics-tca'
branch: 'master'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
mvn-settings: 'dcaegen2-analytics-tca-settings'
- project:
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index eec174ab5..20e7c5972 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -66,7 +66,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dcaegen2/services'
project-name: 'dcaegen2-services-bbs-event-processor'
branch: 'master'
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 305ca378b..2cec1347f 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -38,7 +38,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'demo'
project-name: 'demo'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index afa238856..703445322 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -32,7 +32,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dmaap/datarouter'
project-name: 'dmaap-datarouter'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index 5793822fe..38f4a5f9b 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -36,7 +36,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'dmaap/dbcapi'
project-name: 'dmaap-dbcapi'
branch: 'master'
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index f9c619849..7620cca0c 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -32,7 +32,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: externalapi-nbi-arm64
@@ -74,7 +74,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'externalapi/nbi'
project-name: 'externalapi-nbi'
branch: 'master'
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 3f8816ea2..9b6824cbe 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -25,7 +25,7 @@
mvn-settings: 'holmes-common-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: holmes-common-sonar
@@ -37,7 +37,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'holmes/common'
project-name: 'holmes-common'
branch: 'master'
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index b00e78857..f9c19be69 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -23,7 +23,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: holmes-engine-management-sonar
@@ -35,7 +35,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'holmes/engine-management'
project-name: 'holmes-engine-management'
branch: 'master'
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 9b530ef58..347c6b75c 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -23,7 +23,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: holmes-rule-management-sonar
@@ -35,7 +35,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'holmes/rule-management'
project-name: 'holmes-rule-management'
branch: 'master'
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 48ab6d1f6..085788f3f 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
@@ -25,7 +25,7 @@
mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
maven-version: 'mvn35'
#- project:
@@ -57,7 +57,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: logging-analytics/pomba/pomba-aai-context-builder
project-name: logging-analytics-pomba-pomba-aai-context-builder
branch: master
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 be776fffd..0130f17b7 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
@@ -18,7 +18,7 @@
mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: logging-analytics-pomba-pomba-audit-common-sonar
@@ -30,7 +30,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: logging-analytics/pomba/pomba-audit-common
project-name: logging-analytics-pomba-pomba-audit-common
branch: master
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 bfe36c45c..0fed02406 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@ -24,7 +24,7 @@
mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
maven-version: 'mvn35'
- project:
@@ -37,7 +37,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: logging-analytics/pomba/pomba-context-aggregator
project-name: logging-analytics-pomba-pomba-context-aggregator
branch: master
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 194baf9b4..bc760c07b 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
@@ -24,7 +24,7 @@
mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
maven-version: 'mvn35'
#- project:
@@ -57,7 +57,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: logging-analytics/pomba/pomba-network-discovery-context-builder
project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
branch: master
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 907cf30c6..17c419838 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
@@ -24,7 +24,7 @@
mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
maven-version: 'mvn35'
#- project:
@@ -55,7 +55,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: logging-analytics/pomba/pomba-sdc-context-builder
project-name: logging-analytics-pomba-pomba-sdc-context-builder
branch: master
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 1555a87b1..4b94f803c 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
@@ -24,7 +24,7 @@
mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
@@ -53,7 +53,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: 'H 11 * * *'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: logging-analytics/pomba/pomba-sdnc-context-builder
project-name: logging-analytics-pomba-pomba-sdnc-context-builder
branch: master
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 159f3572d..8b6c39180 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -31,7 +31,7 @@
files: '**'
archive-artifacts: ''
maven-version: "mvn35"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: logging-analytics-arm64
@@ -63,7 +63,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'logging-analytics'
project-name: 'logging-analytics'
branch: 'master'
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 2995e7bfd..65276dbb2 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -26,7 +26,7 @@
mvn-settings: 'multicloud-k8s-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
#- project:
# name: multicloud-k8s-arm64
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 2f6015108..d5b030879 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -16,7 +16,7 @@
mvn-settings: 'music-distributed-kv-store-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: music-distributed-kv-store-info
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index 496cd60cd..1450e9c16 100644
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -27,7 +27,7 @@
mvn-settings: 'music-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml
index 25773fb7b..5f2c15496 100644
--- a/jjb/music/music-mdbc.yaml
+++ b/jjb/music/music-mdbc.yaml
@@ -16,7 +16,7 @@
mvn-settings: 'music-mdbc-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index 9383e48df..93ffe4511 100644
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -24,7 +24,7 @@
mvn-settings: 'music-prom-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index 2a4b15baf..fd35695ec 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -25,7 +25,7 @@
mvn-settings: 'oom-registrator-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: oom-registrator-clm
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index fd76da2dc..aced94657 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -28,7 +28,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: oparent-clm
diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml
index b956da779..03b9be801 100644
--- a/jjb/openci/openci-onap-daily-jobs.yaml
+++ b/jjb/openci/openci-onap-daily-jobs.yaml
@@ -25,7 +25,7 @@
concurrent: false
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
parameters:
- string:
@@ -71,7 +71,7 @@
concurrent: false
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
triggers:
- jms-messaging:
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 1a6bdc416..af1be777c 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -36,7 +36,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'so/libs'
project-name: 'so-libs'
branch: 'master'
diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml
index 2c46a1560..77f8cb502 100644
--- a/jjb/testsuite/testsuite-heatbridge.yaml
+++ b/jjb/testsuite/testsuite-heatbridge.yaml
@@ -23,7 +23,7 @@
mvn-settings: 'testsuite-heatbridge-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: testsuite-heatbridge-master-clm
@@ -32,7 +32,7 @@
nexus-iq-namespace: 'onap-'
project: testsuite/heatbridge
project-name: 'testsuite-heatbridge'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'testsuite-heatbridge-settings'
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index b4adadc49..5c7716f25 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -21,7 +21,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vnfsdk-dovetail-integration-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-merge-java'
@@ -56,7 +56,7 @@
jobs:
- gerrit-tox-sonar
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/dovetail-integration'
project-name: 'vnfsdk-dovetail-integration'
branch: 'master'
@@ -80,6 +80,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/dovetail-integration
project-name: 'vnfsdk-dovetail-integration'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-dovetail-integration-settings'
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 3a29d4136..57e12fc19 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -17,7 +17,7 @@
mvn-settings: 'vnfsdk-functest-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-functest-sonar
@@ -29,7 +29,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/functest'
project-name: 'vnfsdk-functest'
branch: 'master'
@@ -53,6 +53,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/functest
project-name: 'vnfsdk-functest'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-functest-settings'
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index 7b2a77312..6d22310e6 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-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{subproject}-python-staging-{stream}'
@@ -25,7 +25,7 @@
jobs:
- gerrit-tox-sonar
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/pkgtools'
project-name: 'vnfsdk-pkgtools'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index f5e7f43c2..3d5a602a1 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -18,7 +18,7 @@
mvn-settings: 'vnfsdk-validation-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-validation-sonar
@@ -30,7 +30,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/validation'
project-name: 'vnfsdk-validation'
branch: 'master'
@@ -54,6 +54,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/validation
project-name: 'vnfsdk-validation'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-validation-settings'
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index b0a6a2cd0..7d4191456 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -31,7 +31,7 @@
mvn-settings: 'vnfsdk-ves-agent-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-ves-agent-sonar
@@ -54,7 +54,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/ves-agent'
project-name: 'vnfsdk-ves-agent'
branch: 'master'
@@ -80,6 +80,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/ves-agent
project-name: 'vnfsdk-ves-agent'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-ves-agent-settings'