X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-datafile.yaml;h=59e4bf7f132ded0cc80e396d876c7664bdb88be2;hb=d7432d215f88bb3fd84f66ac84be4b674abc8fe0;hp=7f065240c0a7a1efc5983023c25dde62e8f25564;hpb=8b33c98aed46a6f1e5a03bd1bbb26ad1055fd851;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 7f065240c..59e4bf7f1 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
@@ -15,9 +18,19 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - 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}-{stream}-verify-java':
           mvn-goals: 'clean install'
       - '{project-name}-{stream}-merge-java':
@@ -27,11 +40,17 @@
     name: dcaegen2-collectors-datafile-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}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/collectors/datafile'
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -42,9 +61,14 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/datafile
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-datafile'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-collectors-datafile-settings'
 
 - project:
@@ -52,5 +76,6 @@
     project-name: dcaegen2-collectors-datafile
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/collectors/datafile
     branch: master