X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-analytics-tca-gen2.yaml;h=4599e94d6f054128008cf7bc87c2e9fc11637ab1;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=0737cbd162b3815ff2e054f316a14e840c785325;hpb=a1493e0a098c9a8b5a1c041262ec584df011482f;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 0737cbd16..4599e94d6 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -1,24 +1,11 @@
 ---
 - project:
     name: dcaegen2-analytics-tca-gen2
-    # job template iterators
-    project-name: 'dcaegen2-analytics-tca-gen2'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
     # apply to all jobs
-    project: 'dcaegen2/analytics/tca-gen2'
-    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
-    files: '**'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
     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
@@ -29,10 +16,32 @@
           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'
+      - '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: ubuntu1804-docker-8c-8g
+
 - project:
     name: dcaegen2-analytics-tca-gen2-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -48,20 +57,28 @@
     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: ubuntu1804-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