Merge "Migrate to ubuntu1804-builder"

diff --combined jjb/cli/cli.yaml
index 3c603b7,4dc1eb4..4d1f3de
--- 1/jjb/cli/cli.yaml
--- 2/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@@ -28,7 -28,7 +28,7 @@@
            pom: 'deployment/docker/pom.xml'
            mvn-goals: 'docker:build'
            docker-image-name: 'onap/cli'
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
      project: 'cli'
      stream:
        - 'master':
@@@ -36,7 -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 +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 +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 --combined jjb/dmaap/dmaap-datarouter.yaml
index afa2388,bd99674..7034453
--- 1/jjb/dmaap/dmaap-datarouter.yaml
--- 2/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@@ -5,7 -5,7 +5,7 @@@
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - gerrit-maven-docker-stage:
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
            mvn-goals: 'clean package -P docker docker:build docker:push'
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
@@@ -32,7 -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 --combined jjb/externalapi/externalapi-nbi.yaml
index f9c6198,0d656dd..7620cca
--- 1/jjb/externalapi/externalapi-nbi.yaml
--- 2/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@@ -17,7 -17,7 +17,7 @@@
            maven-versions-plugin: true
            mvn-params: '-Dmaven.test.skip=true'
        - gerrit-maven-docker-stage:
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
            maven-versions-plugin: true
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
@@@ -32,7 -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 +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 --combined jjb/holmes/holmes-engine-mgt.yaml
index b00e788,b8406cb..f9c19be
--- 1/jjb/holmes/holmes-engine-mgt.yaml
--- 2/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@@ -11,7 -11,7 +11,7 @@@
            maven-versions-plugin: true
        - '{project-name}-{stream}-docker-java-daily':
            mvn-params: '-Dmaven.test.skip=true'
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
        - '{project-name}-gerrit-release-jobs':
            build-node: centos7-docker-8c-8g
      project: 'holmes/engine-management'
@@@ -23,7 -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 +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 --combined jjb/holmes/holmes-rule-mgt.yaml
index 9b530ef,20ec1c0..347c6b7
--- 1/jjb/holmes/holmes-rule-mgt.yaml
--- 2/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@@ -11,7 -11,7 +11,7 @@@
            maven-versions-plugin: true
        - '{project-name}-{stream}-docker-java-daily':
            mvn-params: '-Dmaven.test.skip=true'
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
        - '{project-name}-gerrit-release-jobs':
            build-node: centos7-docker-8c-8g
      project: 'holmes/rule-management'
@@@ -23,7 -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 +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 --combined jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index 48ab6d1,2e47ee3..085788f
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
--- 2/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@@ -10,7 -10,7 +10,7 @@@
            build-node: centos7-builder-4c-4g
            maven-versions-plugin: true
        - gerrit-maven-docker-stage:
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
            mvn-params: '-Dmaven.test.skip=true -P docker'
@@@ -25,7 -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 +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 --combined jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
index bfe36c4,5439b80..0fed024
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
--- 2/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@@ -10,7 -10,7 +10,7 @@@
            build-node: centos7-builder-4c-4g
            maven-versions-plugin: true
        - gerrit-maven-docker-stage:
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
            mvn-params: '-Dmaven.test.skip=true -P docker'
@@@ -24,7 -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 +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 --combined jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index 194baf9,111d4a5..bc760c0
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
--- 2/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
@@@ -10,7 -10,7 +10,7 @@@
            build-node: centos7-builder-4c-4g
            maven-versions-plugin: true
        - gerrit-maven-docker-stage:
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
            mvn-params: '-Dmaven.test.skip=true -P docker'
@@@ -24,7 -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 +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 --combined jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
index 907cf30,331a7ef..17c4198
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
--- 2/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
@@@ -10,7 -10,7 +10,7 @@@
            build-node: centos7-builder-4c-4g
            maven-versions-plugin: true
        - gerrit-maven-docker-stage:
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
            mvn-params: '-Dmaven.test.skip=true -P docker'
@@@ -24,7 -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 +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 --combined jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index 1555a87,9200747..4b94f80
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
--- 2/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@@ -10,7 -10,7 +10,7 @@@
            build-node: centos7-builder-4c-4g
            maven-versions-plugin: true
        - gerrit-maven-docker-stage:
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
            mvn-params: '-Dmaven.test.skip=true -P docker'
@@@ -24,7 -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 +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 --combined jjb/music/music-prom.yaml
index 9383e48,58f1ba0..93ffe45
--- 1/jjb/music/music-prom.yaml
--- 2/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@@ -10,7 -10,7 +10,7 @@@
            build-node: centos7-builder-4c-4g
            maven-versions-plugin: true
        - gerrit-maven-docker-stage:
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
            maven-versions-plugin: true
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
@@@ -24,7 -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 --combined jjb/oom/oom-registrator.yaml
index 2a4b15b,7dc7771..fd35695
--- 1/jjb/oom/oom-registrator.yaml
--- 2/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@@ -15,7 -15,7 +15,7 @@@
            mvn-goals: 'install'
            script:
              !include-raw-escape: 'build-registrator-docker-image.sh'
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
        - '{project-name}-gerrit-release-jobs':
            build-node: centos7-docker-8c-8g
      project: 'oom/registrator'
@@@ -25,7 -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 --combined jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index b4adadc,b6fea86..5c7716f
--- 1/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
--- 2/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@@ -21,7 -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'
@@@ -31,7 -31,7 +31,7 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
 -          build-node: ubuntu1604-docker-8c-8g
 +          build-node: ubuntu1804-docker-8c-8g
  #- project:
  #    name: vnfsdk-dovetail-integration-arm64
  #    project-name: 'vnfsdk-dovetail-integration-arm64'
@@@ -56,7 -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 +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'