summaryrefslogtreecommitdiffstats
path: root/jjb/vfc
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-03-30 09:27:11 +0800
committeryangyan <yangyanyj@chinamobile.com>2020-03-30 09:27:29 +0800
commit1062b9b8857f713ec8cb6b77bba1932fc9051b1b (patch)
tree938d522603e461434ea6a5e7049c1e7720063e60 /jjb/vfc
parenta37644ff374cc056a122d0a675bdfc7de34a6a70 (diff)
Update VFC to ubuntu 1804
Change-Id: I6bb4fe25dc3824f9f7dbbebdfa532f9b39a5c6ca Issue-ID: VFC-1653 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'jjb/vfc')
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml2
-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-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.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-multivimproxy.yaml8
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml12
10 files changed, 27 insertions, 27 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-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-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 5ffc7f87d..52aee732c 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
@@ -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-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-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-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'