From 5394d802e2ecdf07be40ec4ced59e2f58ce28e44 Mon Sep 17 00:00:00 2001
From: Rishabh Singh <sngri@amazon.com>
Date: Fri, 28 Jun 2024 12:34:07 -0700
Subject: [PATCH] Add bwc.checkout.align parameter support in gradle-check

Signed-off-by: Rishabh Singh <sngri@amazon.com>
---
 jenkins/gradle/gradle-check.jenkinsfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/jenkins/gradle/gradle-check.jenkinsfile b/jenkins/gradle/gradle-check.jenkinsfile
index bed22d1ea8..cf1dc1285d 100644
--- a/jenkins/gradle/gradle-check.jenkinsfile
+++ b/jenkins/gradle/gradle-check.jenkinsfile
@@ -7,7 +7,7 @@
  * compatible open source license.
  */
 
-lib = library(identifier: 'jenkins@6.5.0', retriever: modernSCM([
+lib = library(identifier: 'jenkins@6.6.0', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))
@@ -107,6 +107,7 @@ pipeline {
 
                     echo("Build Cause: ${BUILD_CAUSE}")
                     withCredentials([usernamePassword(credentialsId: CREDENTIAL_ID, usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) {
+                        def bwc_checkout_align = "false"
 
                         def dockerLogin = sh(returnStdout: true, script: "set +x && (echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin) || echo docker error").trim()
 
@@ -117,12 +118,14 @@ pipeline {
                                 currentBuild.description = """runner: ${agent_name}<br><a href="${pr_to_clone_url}">Others</a>: ${pr_title}"""
                             }
                             else {
-                                currentBuild.description = """runner: ${agent_name}<br><a href="${pr_url}">PR #${pr_number}</a>: ${pr_title}"""
+                                currentBuild.description = """runner: ${agent_name}<br><a href="${pr_url}">PR #${pr_number}</a>: ${pr_title} with bwc.checkout.align=true"""
+                                bwc_checkout_align = "true"
                             }
 
                             runGradleCheck(
                                 gitRepoUrl: "${pr_from_clone_url}",
-                                gitReference: "${pr_from_sha}"
+                                gitReference: "${pr_from_sha}",
+                                bwcCheckoutAlign: "${bwc_checkout_align}"
                             )
                         }
                         else {
@@ -132,7 +135,8 @@ pipeline {
 
                             runGradleCheck(
                                 gitRepoUrl: "${GIT_REPO_URL}",
-                                gitReference: "${GIT_REFERENCE}"
+                                gitReference: "${GIT_REFERENCE}",
+                                bwcCheckoutAlign: "${bwc_checkout_align}"
                             )
                         }