X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-analytics-tca-gen2.yaml;h=da1d88235aafe5be8ae8fc5c42f7bbbbd6c263c0;hb=61a0f59c466bf12a84b8b2b5d0031589bcdadc0d;hp=2a4ef29534fea09fe0b7acd8d5be5bf74ddd5583;hpb=04f77fb4de5831c0f541244b666bcbbe223be17c;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 2a4ef2953..da1d88235 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -1,59 +1,87 @@
 ---
 - project:
     name: dcaegen2-analytics-tca-gen2
+    # apply to all jobs
+    jobs:
+      - 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
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu2004-docker-8c-8g
+          mvn-goals: 'clean deploy docker:build -DpushImage'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          sbom-generator: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+    project: 'dcaegen2/analytics/tca-gen2'
     # job template iterators
     project-name: 'dcaegen2-analytics-tca-gen2'
     stream:
       - 'master':
           branch: 'master'
-    # apply to all jobs
-    project: 'dcaegen2/analytics/tca-gen2'
+      - 'jakarta':
+          branch: 'jakarta'
+    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
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - '{project-name}-{stream}-verify-java':
-      - '{project-name}-{stream}-merge-java':
-          mvn-goals: 'clean install'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
-          mvn-goals: 'clean deploy docker:build -DpushImage'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
+    build-node: ubuntu2004-docker-8c-8g
 
 - project:
     name: dcaegen2-analytics-tca-gen2-sonar
+    java-version: openjdk11
     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: ubuntu2004-docker-8c-8g
     project: 'dcaegen2/analytics/tca-gen2'
     project-name: 'dcaegen2-analytics-tca-gen2'
     branch: 'master'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn35'
+    maven-version: 'mvn35'
 
 - project:
     name: dcaegen2-analytics-tca-gen2-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/analytics/tca-gen2
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     project-name: 'dcaegen2-analytics-tca-gen2'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
+    mvn-version: 'mvn35'
+    maven-version: 'mvn35'
 
 - project:
     name: dcaegen2-analytics-tca-gen2-info
+    java-version: openjdk11
     project-name: dcaegen2-analytics-tca-gen2
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/analytics/tca-gen2
     branch: master