From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Fri, 23 Jun 2023 17:09:32 +0000 (-0700)
Subject: Fix: Add JDK configuration step in Gradle jobs
X-Git-Tag: v0.87.1^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=37f05c74e577373c062563634176f8435c6a939a;p=releng%2Fglobal-jjb.git

Fix: Add JDK configuration step in Gradle jobs

Issue: RELENG-4769
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I50eb766d7b60e8da8ff3eafbda1d9fc4f2e817ca
---

diff --git a/docs/jjb/lf-gradle-jobs.rst b/docs/jjb/lf-gradle-jobs.rst
index 98841d1e..3bc0c344 100644
--- a/docs/jjb/lf-gradle-jobs.rst
+++ b/docs/jjb/lf-gradle-jobs.rst
@@ -18,6 +18,7 @@ Runs a gradle build command to perform the verification.
 
 :Required parameters:
     :build-node:    The node to run build on.
+    :java-version: Version of Java to execute Maven build. (default: openjdk17)
     :jenkins-ssh-credential: Credential to use for SSH. (Generally configured in defaults.yaml)
 
 :Optional parameters:
diff --git a/jjb/lf-gradle-jobs.yaml b/jjb/lf-gradle-jobs.yaml
index 424d83e4..cd4f4d66 100644
--- a/jjb/lf-gradle-jobs.yaml
+++ b/jjb/lf-gradle-jobs.yaml
@@ -77,6 +77,9 @@
     <<: *lf_gradle_common
 
     builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - shell: |
           ./gradlew build
 
diff --git a/releasenotes/notes/add-lf-gradle-jdk-c32197ce5806ccef.yaml b/releasenotes/notes/add-lf-gradle-jdk-c32197ce5806ccef.yaml
new file mode 100644
index 00000000..c0909ae8
--- /dev/null
+++ b/releasenotes/notes/add-lf-gradle-jdk-c32197ce5806ccef.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Add a JDK configuration step in the Gradle based jobs.