X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fvfc%2Fvfc-gvnfm-vnfres-java.yaml;h=06f971814274b2b8e5f3a48488d6e2a725e9cec8;hb=refs%2Fchanges%2F43%2F136443%2F1;hp=124c64c4e97b02ea33e2dc76152c11d2a1292427;hpb=8f58c69332449e8112f480fec034a658a1f2e728;p=ci-management.git

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