Merge "Preparation for CSIT on both master and guilin"

diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml
index 11bc579..4e88e90 100644 (file)
--- a/jjb/appc/appc-csit.yaml
+++ b/jjb/appc/appc-csit.yaml
@@ -11,5 +11,5 @@
           branch: 'master'
     functionality:
       - 'healthcheck':
-          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
+          trigger_jobs:
     robot-options: ''

diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 89b9460..d45453f 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -26,6 +26,7 @@
           build-node: centos7-docker-8c-8g
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'deployment/docker/pom.xml'
+          java-version: openjdk11
           mvn-goals: 'docker:build'
           docker-image-name: 'onap/cli'
           build-node: ubuntu1804-docker-8c-8g
@@ -74,6 +75,7 @@
     project: 'cli'
     project-name: 'cli'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'cli-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -86,6 +88,7 @@
     project: 'cli'
     project-name: 'cli'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'cli-settings'
     build-node: ubuntu1804-builder-4c-4g