Migrate to ubuntu1804-docker
Migrate the rest of the jobs from
ubuntu1604-docker to ubuntu1804-docker
Remove unused nodes
Issue-ID: CIMAN-373
Change-Id: Idec34497cec90f650336cdd2dcfc8aaae2bcd2ec
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
deleted file mode 100644
index 56786f7..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20191127-235551.406
-LABELS=ubuntu1604-docker-8c-8g
-HARDWARE_ID=v2-highcpu-8
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index ef105ff..3c603b7 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -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':
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index d24124f..b20bbc5 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -12,7 +12,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'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 18cb107..afa2388 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -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'
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 71ca922..f9c6198 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -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'
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index 0df1293..f78cce7 100644
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -84,7 +84,7 @@
name: '{project-name}-{stream}-docker-c-shell-daily'
id: gerrit-docker-c-shell-daily
<<: *c_job_common
- node: 'ubuntu1604-docker-8c-8g'
+ node: 'ubuntu1804-docker-8c-8g'
triggers:
# 12 AM UTC
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index 2615157..4d48b87 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -157,7 +157,7 @@
name: '{project-name}-{stream}-docker-golang-shell-daily'
golangver: 'golang110'
project-type: freestyle
- node: 'ubuntu1604-docker-8c-8g'
+ node: 'ubuntu1804-docker-8c-8g'
disabled: false
properties:
- infra-properties:
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index bcf4bd3..7224b75 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -815,7 +815,7 @@
name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
project-type: freestyle
- node: 'ubuntu1604-docker-8c-8g'
+ node: 'ubuntu1804-docker-8c-8g'
disabled: '{disabled}'
properties:
- infra-properties:
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index cb23377..b00e788 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -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'
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 7e4342b..9b530ef 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -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'
diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
index ca2ea85..62d07a7 100644
--- a/jjb/lf-infra-releasedockerhub.yaml
+++ b/jjb/lf-infra-releasedockerhub.yaml
@@ -12,7 +12,7 @@
build-timeout: 90
project-type: freestyle
- node: ubuntu1604-docker-8c-8g ## Probably don't need this much
+ node: ubuntu1804-docker-8c-8g ## Probably don't need this much
disable-job: false
disabled: '{disable-job}'
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 f0eab70..48ab6d1 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
@@ -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'
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 3f4f3cb..bfe36c4 100644
--- a/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 @@
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'
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 3f064c4..194baf9 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
@@ -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'
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 41855fc..907cf30 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
@@ -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'
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 90126a0..1555a87 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
@@ -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'
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index 295a49e..9383e48 100644
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -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'
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 29d9422..5e96e18 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -2,7 +2,7 @@
- project:
name: offline-installer
project-name: 'offline-installer'
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-8g'
offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh
stream:
diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml
index 1455f7f..8defb44 100644
--- a/jjb/oom/oom-oneclick-config.yaml
+++ b/jjb/oom/oom-oneclick-config.yaml
@@ -13,7 +13,7 @@
files: '**'
archive-artifacts: ''
build-timeout: 60
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
submodule-recursive: true
jobs:
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index d625aba..2a4b15b 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -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'
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 291011c..b4adadc 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -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'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 803fc20..97356fc 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -22,7 +22,7 @@
# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
# mvn-profile: 'docker'
# mvn-params: '-Dmaven.test.skip=true'
-# build-node: ubuntu1604-docker-8c-8g
+# build-node: ubuntu1804-docker-8c-8g
project: 'vnfsdk/refrepo'
stream:
- 'master':
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 9e2cc94..9f9b85e 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-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily':
@@ -32,7 +32,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'vvp/validation-scripts'
project-name: 'vvp-validation-scripts'
branch: 'master'
@@ -44,7 +44,7 @@
name: vvp-validation-scripts-tracability-matrix
project: 'vvp/validation-scripts'
project-name: 'vvp-validation-scripts'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-settings: 'vvp-validation-scripts-settings'
mvn-global-settings: 'global-settings'
stream: