Update vfc to ubuntu 1804
Change-Id: I7cfec6494490603123e0daaa1551f06408ef4225
Issue-ID: VFC-1653
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 8e6a8e6..e816422 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'modeling-toscaparsers-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
subproject:
- 'nfvparser':
path: 'nfvparser/'
@@ -34,7 +34,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: 'modeling/toscaparsers'
project-name: 'modeling-toscaparsers-nfvparser'
branch: 'master'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 4412d09..1445f9b 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -23,12 +23,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnfmgr-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
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-gvnfm-vnfmgr-mgr-sonar
@@ -41,7 +41,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f mgr/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/gvnfm/vnfmgr'
project-name: 'vfc-gvnfm-vnfmgr-mgr'
branch: 'master'
@@ -56,7 +56,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/gvnfm/vnfmgr
project-name: 'vfc-gvnfm-vnfmgr'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
index 6c9afed..2bb891b 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-builder-4c-4g
+ build-node: ubuntu1804-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 8fbf442..6551d45 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -24,12 +24,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnfres-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
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-gvnfm-vnfres-res-sonar
@@ -42,7 +42,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f res/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/gvnfm/vnfres'
project-name: 'vfc-gvnfm-vnfres-res'
branch: 'master'
@@ -57,7 +57,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/gvnfm/vnfres
project-name: 'vfc-gvnfm-vnfres'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-gvnfm-vnfres-settings'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
index f172330..5bdf8e4 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-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
subproject:
- 'res':
path: 'res'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index e12807d..0e46c40 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -25,7 +25,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-catalog-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
files: '**'
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 87c4907..679cc45 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -7,7 +7,7 @@
stream:
- 'master':
branch: 'master'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -20,7 +20,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-db-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
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index b79fdcc..85e9d68 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -24,12 +24,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-driver-ems-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
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-ems-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/driver/ems'
project-name: 'vfc-nfvo-driver-ems'
branch: 'master'
@@ -56,7 +56,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/ems
project-name: 'vfc-nfvo-driver-ems'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-ems-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 5130e9c..407a615 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -25,12 +25,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-driver-zte-sfc-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
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-sfc-sonar
@@ -43,7 +43,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f zte/sfc-driver/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/driver/sfc'
project-name: 'vfc-nfvo-driver-sfc'
branch: 'master'
@@ -58,7 +58,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/sfc
project-name: 'vfc-nfvo-driver-sfc'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-sfc-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
index 0990efb..0f56d0c 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
@@ -17,7 +17,7 @@
- '{project-name}-{stream}-{subproject}-merge-java'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-gvnfm-juju-sonar
@@ -29,7 +29,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-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-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
index d97ec98..5ffc7f8 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
@@ -13,7 +13,7 @@
mvn-params: '-P rootOnly'
pattern: 'pom.xml'
- '{project-name}-{stream}-merge-profile-java':
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
pattern: 'pom.xml'
- gerrit-maven-stage:
sign-artifacts: true
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 13f5945..db2b6bb 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -24,7 +24,7 @@
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
@@ -37,7 +37,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f zte/vmanager/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
branch: 'master'
@@ -53,6 +53,6 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/vnfm/svnfm
project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index ff6c94b..fd848c5 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -19,7 +19,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-lcm-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
files: '**'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 35992f8..b162ab8 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -7,7 +7,7 @@
stream:
- 'master':
branch: 'master'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -20,7 +20,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-resmanagement-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
@@ -34,7 +34,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/resmanagement'
project-name: 'vfc-nfvo-resmanagement'
branch: 'master'
@@ -49,7 +49,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/resmanagement
project-name: 'vfc-nfvo-resmanagement'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-resmanagement-settings'