From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 16 Sep 2020 12:12:44 +0000 (+0200)
Subject: Fix the merge job
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7ac8160e06c8d8571280010e38a797cf8610a92f;p=ci-management.git

Fix the merge job

Fix the merge job that does not use jdk 11

Issue-ID: SDC-2725

Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I3bb72a6ca40efa738b7bce16d842c3c6454d6edb
---

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index da5dfdccc..55df274fc 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1090,6 +1090,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 22fa4818d..c64d17e89 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -35,7 +35,6 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
-          java-version: openjdk11
       - gerrit-maven-stage:
           build-timeout: 90
           sign-artifacts: true