X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fvfc%2Fvfc-nfvo-driver-svnfm-huawei.yaml;h=c64b7f4cf5b1e0bfe123f2f211297ae965c888a4;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;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..c64b7f4cf 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -1,65 +1,61 @@
 ---
 - project:
     name: vfc-nfvo-driver-svnfm-huawei
-    project-name: 'vfc-nfvo-driver-svnfm-huawei'
-    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    project-name: "vfc-nfvo-driver-svnfm-huawei"
+    java-version: openjdk11
+    project: "vfc/nfvo/driver/vnfm/svnfm"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings"
     subproject:
-      - 'drv-vnfm-huawei':
-          pom: 'huawei/pom.xml'
-          pattern: 'huawei/**'
+      - "drv-vnfm-huawei":
+          pom: "huawei/pom.xml"
+          pattern: "huawei/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - "{project-name}-{stream}-{subproject}-verify-java"
+      - "{project-name}-{stream}-{subproject}-merge-java"
       - gerrit-maven-stage:
+          sbom-generator: true
           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'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+          mvn-pom: "huawei/pom.xml"
+          mvn-params: "-f huawei/pom.xml"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    files: "**"
+    archive-artifacts: ""
+    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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    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
-    mvn-params: '-f huawei/pom.xml'
-    project: 'vfc/nfvo/driver/vnfm/svnfm'
-    project-name: 'vfc-nfvo-driver-svnfm-huawei'
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    cron: "@daily"
+    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"
+    branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - 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-'
+          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
-    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
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: vfc/nfvo/driver/vnfm/svnfm
-    branch: master
+    project-name: "vfc-nfvo-driver-svnfm-huawei"
+    build-node: ubuntu1804-builder-4c-4g
+    branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings"