[DCAE] Jobs updated to include istanbul branch

[ci-management.git] / jjb / dcaegen2 / dcaegen2-analytics-tca-gen2.yaml

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 4c626e9..e5ae144 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -1,19 +1,7 @@
 ---
 - 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: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
       - '{project-name}-{stream}-merge-java':
@@ -29,8 +17,29 @@
           sign-artifacts: 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'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
+    mvn-version: 'mvn35'
+    maven-version: 'mvn35'
+    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
@@ -46,9 +55,12 @@
     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-'
@@ -57,9 +69,12 @@
     project-name: 'dcaegen2-analytics-tca-gen2'
     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