X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-datafile.yaml;h=070bdac988357347cf76427bf24fa036d88163e6;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=3f4f91155f166aeaecc7bb48b88208e7849b2722;hpb=dce47d46aea14b96648fe33bf77e9544b4984e79;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 3f4f91155..070bdac98 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -2,71 +2,70 @@
 - project:
     name: dcaegen2-collectors-datafile
     # job template iterators
-    project-name: 'dcaegen2-collectors-datafile'
+    project-name: "dcaegen2-collectors-datafile"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    java-version: openjdk11
     # apply to all jobs
-    project: 'dcaegen2/collectors/datafile'
-    mvn-settings: 'dcaegen2-collectors-datafile-settings'
-    files: '**'
+    project: "dcaegen2/collectors/datafile"
+    mvn-settings: "dcaegen2-collectors-datafile-settings"
+    files: "**"
     maven-deploy-properties: |
       deployAtEnd=true
-    archive-artifacts: ''
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     jobs:
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+          mvn-goals: "clean install"
+      - gerrit-maven-merge:
+          mvn-goals: "clean deploy"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          sbom-generator: true
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
       - 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':
-          mvn-goals: 'clean deploy'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
 
 - project:
     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'
+    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-docker-8c-8g
-    project: 'dcaegen2/collectors/datafile'
-    project-name: 'dcaegen2-collectors-datafile'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-datafile-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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"
 
 - project:
     name: dcaegen2-collectors-datafile-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/collectors/datafile
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-collectors-datafile'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-datafile-settings'
-
-- project:
-    name: dcaegen2-collectors-datafile-info
-    project-name: dcaegen2-collectors-datafile
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/collectors/datafile
-    branch: master
+    project-name: "dcaegen2-collectors-datafile"
+    stream:
+      - "master":
+          branch: "master"
+    java-version: openjdk11
+    mvn-settings: "dcaegen2-collectors-datafile-settings"