X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fvfc%2Fvfc-nfvo-driver-svnfm-huawei.yaml;h=5d975c437555a06f2df0764604e89d69c9a3e4bc;hb=627a2bfc1daf1c3b458d46a71bb714f9010cf09a;hp=709562c91184e63d8661b0354d76951f3035279c;hpb=465cb8dad524bdae3bcfbacd7f8155cc55ca5ed5;p=ci-management.git

diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 709562c91..5d975c437 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -2,6 +2,7 @@
 - project:
     name: vfc-nfvo-driver-svnfm-huawei
     project-name: 'vfc-nfvo-driver-svnfm-huawei'
+    java-version: openjdk11
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     stream:
       - 'master':
@@ -16,25 +17,27 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-pom: 'huawei/pom.xml'
           mvn-params: '-f huawei/pom.xml'
+      - '{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-svnfm-huawei-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    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"
     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'
@@ -45,21 +48,23 @@
 
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm:
           mvn-params: '-f huawei/pom.xml'
     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'
 
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-info
     project-name: vfc-nfvo-driver-svnfm-huawei
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: vfc/nfvo/driver/vnfm/svnfm
     branch: master