X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-analytics-tca-gen2.yaml;h=c4d6188991bf308c35825ebc871fd672ed1639ee;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=197660a4eb123484c8d086d8aa4b967d8bc3058f;hpb=e610d706a7a5957d92dd7f6edc371dc3a02298c1;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 197660a4e..c4d618899 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -1,68 +1,76 @@
 ---
 - project:
     name: 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'
-    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
-    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-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-2c-1g
       - 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: ubuntu1804-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
-          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
+    project-name: "dcaegen2-analytics-tca-gen2"
+    stream:
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    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
-    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
-    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'
+    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/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-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/analytics/tca-gen2
-    build-node: ubuntu1604-docker-8c-8g
-    project-name: 'dcaegen2-analytics-tca-gen2'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
-
-- project:
-    name: dcaegen2-analytics-tca-gen2-info
-    project-name: dcaegen2-analytics-tca-gen2
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/analytics/tca-gen2
-    branch: master
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: "dcaegen2-analytics-tca-gen2"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-analytics-tca-gen2-settings"
+    mvn-version: "mvn35"
+    maven-version: "mvn35"