From: egernug <gerard.nugent@est.tech>
Date: Fri, 1 Sep 2023 09:49:17 +0000 (+0100)
Subject: [CPS] Fixing issue with CPS CSIT re: Java 17
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=b1297fe0e79be3a2d3844cbc61f2927b2b04432b

[CPS] Fixing issue with CPS CSIT re: Java 17

CPS-CSIt defaults to using Java 11 for mmaster because the java-version was not expressly declared

Issue-ID: CPS-1767

Signed-off-by: egernug <gerard.nugent@est.tech>
Change-Id: Icd90ff3b96ce2a0458e002276d24e479ccc03d2b
---

diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index d57c0abe6..b778d1d5b 100644
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -1,6 +1,9 @@
 ---
 - project:
     name: cps-csit-java11
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     jobs:
       - "{project-name}-review-verification-maven-{stream}":
           mvn-goals: clean install
@@ -21,6 +24,9 @@
     branch: "master"
 - project:
     name: cps-csit-java17
+    java-version: openjdk17
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     jobs:
       - "{project-name}-review-verification-maven-{stream}":
           mvn-goals: clean install