X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fmulticloud%2Fmulticloud-openstack-vmware-java.yaml;h=f76ec86afff74ebc6b46d726922e684a032338fc;hb=refs%2Fchanges%2F51%2F135651%2F5;hp=40c79e634e18fe1a1eafea84669d68a2f61f0d4f;hpb=abf581c312d31919c36c495d791881db452002f8;p=ci-management.git

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 40c79e634..f76ec86af 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -1,85 +1,69 @@
 ---
 - project:
     name: multicloud-openstack-vmware-java
-    project-name: 'multicloud-openstack-vmware'
-    project: 'multicloud/openstack/vmware'
+    project-name: "multicloud-openstack-vmware"
+    project: "multicloud/openstack/vmware"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "multicloud-openstack-vmware-settings"
     subproject:
-      - 'vio':
-          pom: 'vio/pom.xml'
-          pattern: 'vio/**'
+      - "vio":
+          pom: "vio/pom.xml"
+          pattern: "vio/**"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-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}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
+          maven-goals: install
+          mvn-params: "-P docker"
+          maven-versions-plugin: true
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - "{project-name}-{stream}-{subproject}-verify-java"
+      - "{project-name}-{stream}-{subproject}-merge-java"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+    disabled: true
 
-#- project:
-#    name: multicloud-openstack-vmware-arm64-java
-#    project-name: 'multicloud-openstack-vmware-arm64'
-#    project: 'multicloud/openstack/vmware'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-openstack-vmware-settings'
-#    subproject:
-#      - 'vio':
-#          pom: 'vio/pom.xml'
-#          pattern: 'vio/**'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
-#    files: '**'
-#    archive-artifacts: ''
-#
 - project:
     name: multicloud-openstack-vmware-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'multicloud/openstack/vmware'
-    project-name: 'multicloud-openstack-vmware'
-    branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-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: "{sonar_mvn_goal}"
+    cron: "@daily"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "multicloud/openstack/vmware"
+    project-name: "multicloud-openstack-vmware"
+    branch: "master"
+    mvn-settings: "multicloud-openstack-vmware-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    disabled: true
 
 - project:
     name: multicloud-openstack-vmware-java-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: multicloud/openstack/vmware
-    project-name: 'multicloud-openstack-vmware'
-    branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-
-- project:
-    name: multicloud-openstack-vmware-info
-    project-name: multicloud-openstack-vmware
-    jobs:
-      - gerrit-info-yaml-verify
+    nexus-iq-namespace: "onap-"
     project: multicloud/openstack/vmware
-    branch: master
+    project-name: "multicloud-openstack-vmware"
+    build-node: "ubuntu1804-builder-4c-4g"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "multicloud-openstack-vmware-settings"
+    disabled: true