summaryrefslogtreecommitdiffstats
path: root/jjb/vfc
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/vfc')
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml8
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml8
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-python.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-catalog-csit.yaml14
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-db.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml8
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml8
-rw-r--r--jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml6
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml8
-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-nokiav2.yaml8
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml6
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-multivimproxy.yaml8
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml8
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml12
23 files changed, 59 insertions, 73 deletions
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index b93bf60d6..e05273b37 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -29,7 +29,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnflcm-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-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 4412d094a..1445f9b78 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 6c9afedc8..2bb891beb 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 8fbf442ce..6551d45d9 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 f1723305d..5bdf8e411 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-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
deleted file mode 100644
index cb438381f..000000000
--- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: vfc-nfvo-catalog-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vfc-nfvo-catalog'
- recipients: 'yangyanyj@chinamobile.com'
- stream: 'master'
- functionality:
- - 'sanity-check':
- trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index e12807d82..0e46c4037 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 87c4907e2..679cc45e3 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 b79fdcca4..85e9d6852 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 5130e9ccf..407a615e1 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-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 19cf0b477..f8784524a 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.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-svnfm-huawei-sonar
@@ -36,7 +36,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 huawei/pom.xml'
project: 'vfc/nfvo/driver/vnfm/svnfm'
project-name: 'vfc-nfvo-driver-svnfm-huawei'
@@ -53,7 +53,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/vnfm/svnfm
project-name: 'vfc-nfvo-driver-svnfm-huawei'
- 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-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 95a4dee85..db89affc4 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -26,12 +26,12 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-driver-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-vnfm-gvnfm-gvnfmadapter-sonar
@@ -44,7 +44,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
mvn-params: '-f gvnfmadapter/pom.xml'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/driver/vnfm/gvnfm'
project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
branch: 'master'
@@ -59,7 +59,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/vnfm/gvnfm
project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
index 0990efb19..0f56d0c7c 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-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
index 255238644..0cad04b23 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-builder-4c-4g
+ build-node: ubuntu1804-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 6807afa39..ac6138a0e 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
@@ -14,8 +14,8 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index 193df51a2..88607ebf5 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -24,7 +24,7 @@
build-node: centos7-docker-8c-8g
files: 'nokiav2/**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker
@@ -64,7 +64,7 @@
docker_registry: '$DOCKER_REGISTRY:10003'
files: 'nokiav2/**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar
@@ -83,7 +83,7 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm
@@ -93,6 +93,6 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/driver/vnfm/svnfm
project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
- 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-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
index d97ec98c0..52aee732c 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
@@ -21,7 +21,7 @@
maven-versions-plugin: true
mvn-params: '-P rootOnly'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-driver-svnfm-root-info
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 13f5945cb..db2b6bb8b 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-driver-vnfm-svnfm-zte-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
index 39d7eb8ba..5c77ac299 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
subproject:
- 'drv-vnfm-zte':
path: 'zte/vmanager'
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index ff6c94b02..fd848c53c 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-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index d9601cbf6..16866a8fa 100644
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.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-multivimproxy-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/multivimproxy'
project-name: 'vfc-nfvo-multivimproxy'
branch: 'master'
@@ -49,7 +49,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/multivimproxy
project-name: 'vfc-nfvo-multivimproxy'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-multivimproxy-settings'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 35992f87a..b162ab848 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'
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 4d650c3d4..ca51fc3c3 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -27,7 +27,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-wfengine-engine-mgr-service-stage
@@ -53,7 +53,7 @@
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-wfengine-engine-activiti-extension-stage
@@ -79,7 +79,7 @@
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vfc-nfvo-wfengine-wfenginemgrservice-sonar
@@ -92,7 +92,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
mvn-params: '-f wfenginemgrservice/pom.xml'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/wfengine'
project-name: 'vfc-nfvo-wfengine-wfenginemgrservice'
branch: 'master'
@@ -110,7 +110,7 @@
sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
mvn-params: '-f activiti-extension/pom.xml'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vfc/nfvo/wfengine'
project-name: 'vfc-nfvo-wfengine-activiti-extension'
branch: 'master'
@@ -125,7 +125,7 @@
nexus-iq-namespace: 'onap-'
project: vfc/nfvo/wfengine
project-name: 'vfc-nfvo-wfengine'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vfc-nfvo-wfengine-settings'