X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-ves.yaml;h=dd5c754fa2a1bf3d09bed227e802c77646a43b8f;hb=HEAD;hp=eba5e397f1b58b01f51a67a5bb9cba87113cf85c;hpb=5762aabfbe273c974b4bcf3d23ec47554a1631ff;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index eba5e397f..dd5c754fa 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -1,36 +1,43 @@
 ---
 - project:
     name: dcaegen2-collectors-ves
-    project-name: 'dcaegen2-collectors-ves'
+    project-name: "dcaegen2-collectors-ves"
     java-version: openjdk11
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
+      # - '{project-name}-{stream}-verify-java'
+      # - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          sign-artifacts: false
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImageTag'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-    project: 'dcaegen2/collectors/ves'
+    project: "dcaegen2/collectors/ves"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-ves-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-collectors-ves-settings"
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
+    mvn-snapshot-id: "ecomp-snapshots"
+    mvn-version: "mvn36"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: dcaegen2-collectors-ves-sonar
@@ -38,35 +45,27 @@
     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}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/collectors/ves'
-    project-name: 'dcaegen2-collectors-ves'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-ves-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/collectors/ves"
+    project-name: "dcaegen2-collectors-ves"
+    branch: "master"
+    mvn-settings: "dcaegen2-collectors-ves-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-collectors-ves-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/collectors/ves
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-collectors-ves'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-ves-settings'
-
-- project:
-    name: dcaegen2-collectors-ves-info
-    project-name: dcaegen2-collectors-ves
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/collectors/ves
-    branch: master
+    project-name: "dcaegen2-collectors-ves"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-collectors-ves-settings"