X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fvfc%2Fvfc-gvnfm-vnfmgr-java.yaml;h=805e6380d119d96829add1d8ca0dd6b6542f3760;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=d4760b1e5166800c0415a36f1ec94e8d337c95bf;hpb=cd192712cb4e936818fec17bb477dfd2e869158a;p=ci-management.git

diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index d4760b1e5..805e6380d 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -1,70 +1,59 @@
 ---
 - project:
     name: vfc-gvnfm-vnfmgr-java
-    project-name: 'vfc-gvnfm-vnfmgr'
-    project: 'vfc/gvnfm/vnfmgr'
+    project-name: "vfc-gvnfm-vnfmgr"
+    project: "vfc/gvnfm/vnfmgr"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfmgr-settings"
     subproject:
-      - 'mgr':
-          pom: 'mgr/pom.xml'
-          pattern: 'mgr/**'
+      - "mgr":
+          pom: "mgr/pom.xml"
+          pattern: "mgr/**"
     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
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-gvnfm-vnfmgr-docker-image.sh"
           build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-gvnfm-vnfmgr-mgr-sonar
     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'
-    mvn-params: '-f mgr/pom.xml'
-    build-node: ubuntu2004-builder-4c-4g
-    project: 'vfc/gvnfm/vnfmgr'
-    project-name: 'vfc-gvnfm-vnfmgr-mgr'
-    branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-params: "-f mgr/pom.xml"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "vfc/gvnfm/vnfmgr"
+    project-name: "vfc-gvnfm-vnfmgr-mgr"
+    branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfmgr-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vfc-gvnfm-vnfmgr-java-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vfc/gvnfm/vnfmgr
-    project-name: 'vfc-gvnfm-vnfmgr'
-    build-node: ubuntu2004-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
-
-- project:
-    name: vfc-gvnfm-vnfmgr-info
-    project-name: vfc-gvnfm-vnfmgr
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: vfc/gvnfm/vnfmgr
-    branch: master
+    project-name: "vfc-gvnfm-vnfmgr"
+    build-node: ubuntu1804-builder-4c-4g
+    branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfmgr-settings"