From: seshukm <seshu.kumar.m@huawei.com>
Date: Thu, 6 Aug 2020 04:36:21 +0000 (+0530)
Subject: upgrade the JSDK java 11 for specific branches
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9763172b766b4e6752c84cc43bf7985460313797;p=ci-management.git

upgrade the JSDK java 11 for specific branches

Issue-ID: SO-3022

Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: I63baacd34c6c8504aaeecd66331b2e7eb3a03a80
---

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index c2aae6fad..87cf07fb3 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -2,7 +2,6 @@
 - project:
     name: so-libs
     project-name: 'so-libs'
-    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -67,7 +66,6 @@
     name: so-libs-info
     project-name: so-libs
     java-version: openjdk11
-    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 11b4a1f1e..2c5a06aaf 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -9,7 +9,6 @@
 - project:
     name: so
     project-name: 'so'
-    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -29,12 +28,14 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
       - 'frankfurt':
           branch: 'frankfurt'
       - 'elalto':
           branch: 'elalto'
       - 'dynamicBPMN':
           branch: 'Dynamic_BPMN'
+          java-version: openjdk11
     mvn-settings: 'so-settings'
     java-version: openjdk11
     files: '**'