X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-analytics-tca-gen2.yaml;h=68d39e926ed1d643e0e9072a3615db875deef17d;hb=5e7a1ae75944e02943490751184a2b2301079497;hp=d56a6e4bd154c8273b2a2f57cc1a0a8fb12bf179;hpb=f3d229258a970b77180ffdb86266ebd7804ad0e0;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index d56a6e4bd..68d39e926 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -3,8 +3,9 @@
     name: dcaegen2-analytics-tca-gen2
     # apply to all jobs
     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:
           mvn-goals: 'clean install'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -15,7 +16,8 @@
           container-staging-registry: 'nexus3.onap.org:10003'
       - 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: 'dcaegen2/analytics/tca-gen2'
     # job template iterators
@@ -23,14 +25,14 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
     mvn-version: 'mvn35'
     maven-version: 'mvn35'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -44,7 +46,6 @@
       - 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'
@@ -70,8 +71,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
     mvn-version: 'mvn35'
     maven-version: 'mvn35'
@@ -82,6 +81,6 @@
     project-name: dcaegen2-analytics-tca-gen2
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/analytics/tca-gen2
     branch: master