X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-datafile.yaml;h=e1935667100b420829c44dc5f2f51a36ad3d1ed5;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=750b24aa9433db20a2c5be345229fd2ff420e1e0;hpb=61a0f59c466bf12a84b8b2b5d0031589bcdadc0d;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 750b24aa9..e19356671 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -2,80 +2,69 @@
 - project:
     name: dcaegen2-collectors-datafile
     # job template iterators
-    project-name: 'dcaegen2-collectors-datafile'
+    project-name: "dcaegen2-collectors-datafile"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+      - "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: ''
-    build-node: ubuntu2004-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    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'
+          mvn-goals: "clean install"
       - gerrit-maven-merge:
-          mvn-goals: 'clean deploy'
+          mvn-goals: "clean deploy"
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-docker-8c-8g
+          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: ubuntu2004-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-goals: 'clean package docker:build -DpushImageTag'
+          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: 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: ubuntu2004-docker-8c-8g
-    project: 'dcaegen2/collectors/datafile'
-    project-name: 'dcaegen2-collectors-datafile'
-    branch: 'master'
+    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/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'
+    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: ubuntu2004-docker-8c-8g
-    project-name: 'dcaegen2-collectors-datafile'
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: "dcaegen2-collectors-datafile"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk11
-    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
+    mvn-settings: "dcaegen2-collectors-datafile-settings"