Trying to Fix Some Jenkins Jobs

Change-Id: Iab3f20323de347612abc281390b8483e9698f310
Issue-ID: HOLMES-332
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 5a3c5cb..94f6def 100644 (file)
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -15,9 +15,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          java-version: openjdk11
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
+          java-version: openjdk11
     project: 'holmes/common'
     stream:
       - 'master':
@@ -45,6 +46,7 @@
     mvn-settings: 'holmes-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: holmes-common-clm
@@ -55,6 +57,7 @@
     project-name: 'holmes-common'
     branch: 'master'
     mvn-settings: 'holmes-common-settings'
+    java-version: openjdk11
 
 - project:
     name: holmes-common-info

diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index c27a626..8532258 100644 (file)
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -9,11 +9,14 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          java-version: openjdk11
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
+          java-version: openjdk11
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+          java-version: openjdk11
     project: 'holmes/engine-management'
     stream:
       - 'master':
@@ -43,6 +46,7 @@
     mvn-settings: 'holmes-engine-management-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: holmes-engine-management-clm
@@ -53,6 +57,7 @@
     project-name: 'holmes-engine-management'
     branch: 'master'
     mvn-settings: 'holmes-engine-management-settings'
+    java-version: openjdk11
 
 - project:
     name: holmes-engine-management-info

diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index fee52ac..9aa9c9d 100644 (file)
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -9,11 +9,14 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          java-version: openjdk11
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
+          java-version: openjdk11
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+          java-version: openjdk11
     project: 'holmes/rule-management'
     stream:
       - 'master':
@@ -43,6 +46,7 @@
     mvn-settings: 'holmes-rule-management-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: holmes-rule-management-clm
@@ -53,6 +57,7 @@
     project-name: 'holmes-rule-management'
     branch: 'master'
     mvn-settings: 'holmes-rule-management-settings'
+    java-version: openjdk11
 
 - project:
     name: holmes-rule-management-info