X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fvfc%2Fvfc-nfvo-driver-vnfm-gvnfm-java.yaml;h=0370b516f009e7e526e0c3054ebdcaa3bcf64983;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=e7796972bc597d6ccb8031f1144504a759361fd4;hpb=e3b705eb4abeb0feacca7868308d67eb43264707;p=ci-management.git

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index e7796972b..0370b516f 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -1,36 +1,35 @@
 ---
-
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-java
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
-    project: 'vfc/nfvo/driver/vnfm/gvnfm'
+    project-name: "vfc-nfvo-driver-vnfm-gvnfm"
+    project: "vfc/nfvo/driver/vnfm/gvnfm"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
     subproject:
-      - 'gvnfmadapter':
-          pom: 'gvnfmadapter/pom.xml'
-          pattern: 'gvnfmadapter/**'
+      - "gvnfmadapter":
+          pom: "gvnfmadapter/pom.xml"
+          pattern: "gvnfmadapter/**"
     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: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-pom: 'gvnfmadapter/pom.xml'
-          mvn-params: '-f gvnfmadapter/pom.xml'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
+          mvn-pom: "gvnfmadapter/pom.xml"
+          mvn-params: "-f gvnfmadapter/pom.xml"
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-gvnfm-driver-docker-image.sh"
           build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -38,35 +37,25 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    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'
-    mvn-params: '-f gvnfmadapter/pom.xml'
+    mvn-params: "-f gvnfmadapter/pom.xml"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vfc/nfvo/driver/vnfm/gvnfm'
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vfc/nfvo/driver/vnfm/gvnfm"
+    project-name: "vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter"
+    branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-java-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vfc/nfvo/driver/vnfm/gvnfm
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+    project-name: "vfc-nfvo-driver-vnfm-gvnfm"
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
-
-- project:
-    name: vfc-nfvo-driver-vnfm-gvnfm-info
-    project-name: vfc-nfvo-driver-vnfm-gvnfm
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: vfc/nfvo/driver/vnfm/gvnfm
-    branch: master
+    branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"