commit 4a85064ed8c629a4d7743f0f0eb8fc72a4e2f6cf
author Anil Belur <abelur@linuxfoundation.org> Thu May 27 12:22:43 2021 +1000
committer Anil Belur <abelur@linuxfoundation.org> Thu May 27 12:23:44 2021 +1000
tree 62dcd727218e39f1510e4c6871fbe41f9e574f4c
parent 566e7f81da3d54a08314072bc05bee0357494d92

CI: Update dcaegen2 jobs to use mvn35

Issue-ID: CIMAN-33 LF-JIRA: IT-22152
Change-Id: Icc85b59126d537db4795ae4d74e7a9612f07b9a4
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

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 91fdaa5..4fbd716 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -1,25 +1,7 @@
 ---
 - project:
     name: dcaegen2-analytics-tca-gen2
-    # job template iterators
-    project-name: 'dcaegen2-analytics-tca-gen2'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
     # apply to all jobs
-    project: 'dcaegen2/analytics/tca-gen2'
-    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
-    mvn-version: 'mvn35'
-    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':
@@ -35,6 +17,26 @@
           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'
+      - 'guilin':
+          branch: 'guilin'
+      - '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
@@ -54,6 +56,7 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+    maven-version: 'mvn35'
 
 - project:
     name: dcaegen2-analytics-tca-gen2-clm
@@ -67,6 +70,7 @@
     branch: 'master'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
     mvn-version: 'mvn35'
+    maven-version: 'mvn35'
 
 - project:
     name: dcaegen2-analytics-tca-gen2-info