X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-ves.yaml;h=d7bc96472a4315077c1a4c696ff4c484b57aa667;hb=362970a9ee685a05bbc16b22846d2afc8abbcc7d;hp=394bf99743f2a60ddb610eace5271fb3db3f8e55;hpb=f1a860edca2ad92585ff919540ff624393ca3f64;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 394bf9974..7fa8ef5f1 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -2,17 +2,31 @@
 - project:
     name: dcaegen2-collectors-ves
     project-name: 'dcaegen2-collectors-ves'
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          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
 
     project: 'dcaegen2/collectors/ves'
     stream:
       - 'master':
           branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'honolulu':
+          branch: 'honolulu'
     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
@@ -21,16 +35,48 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
+
 - project:
     name: dcaegen2-collectors-ves-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
-    build-node: ubuntu1604-basebuild-4c-4g
-    java-version: ''
+    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'
+    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'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-collectors-ves-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dcaegen2/collectors/ves
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: 'dcaegen2-collectors-ves'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+    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