Allow user to set OPENJCEPLUS_GIT_REPO and BRANCH (adoptium#5054)

Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
zzambers · Feb 12, 2024 · a590cfb · a590cfb
1 parent b4c6b1d
commit a590cfb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
@@ -78,7 +78,7 @@ def setupEnv() {
  env.TEST_JDK_HOME = "$WORKSPACE/jdkbinary/j2sdk-image"
  env.JVM_VERSION = params.JVM_VERSION ? params.JVM_VERSION : ""
  env.JVM_OPTIONS = params.JVM_OPTIONS ? params.JVM_OPTIONS : ""
- env.APPLICATION_OPTIONS = params.APPLICATION_OPTIONS ? params.APPLICATION_OPTIONS : ""
+ env.APPLICATION_OPTIONS = params.APPLICATION_OPTIONS ? params.APPLICATION_OPTIONS : ""
  env.EXTRA_DOCKER_ARGS = params.EXTRA_DOCKER_ARGS ? params.EXTRA_DOCKER_ARGS : ""
  env.OPENJDK_SHA = params.OPENJDK_SHA ? params.OPENJDK_SHA : ""
  env.OPENLIBERTY_SHA = params.OPENLIBERTY_SHA ? params.OPENLIBERTY_SHA : ""
@@ -105,6 +105,9 @@ def setupEnv() {
  env.EXIT_SUCCESS = params.EXIT_SUCCESS ? params.EXIT_SUCCESS : false
  NUM_MACHINES = params.NUM_MACHINES ? params.NUM_MACHINES.toInteger() : 1
  env.LIB_DIR="${WORKSPACE}/../../testDependency/lib"
+ env.OPENJCEPLUS_GIT_REPO = params.OPENJCEPLUS_GIT_REPO ?: "https://github.com/IBM/OpenJCEPlus.git"
+ env.OPENJCEPLUS_GIT_BRANCH = params.OPENJCEPLUS_GIT_BRANCH ?: "main"
+
 
  if (JOB_NAME.contains("Grinder")) {
  def currentDate = new Date()

diff --git a/functional/OpenJcePlusTests/build.xml b/functional/OpenJcePlusTests/build.xml
@@ -28,6 +28,7 @@
  <property name="build" location="./bin" />
  <property name="LIB" value="junit4,hamcrest_core,bcprov_jdk18on"/>
  <import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
+ <property environment="env" />
 
  <target name="openJcePlusTests.check">
  <condition property="openJcePlusTests.exists">
@@ -36,19 +37,26 @@
  </target>
 
  <if>
- <contains string="${SPEC}" substring="zos"/>
+ <isset property="env.OPENJCEPLUS_GIT_REPO"/>
  <then>
- <property name="GIT_REPO" value="git@github.com:" />
+ <property name="openjceplusGitRepo" value="${env.OPENJCEPLUS_GIT_REPO}"/>
  </then>
  <else>
- <property name="GIT_REPO" value="https://github.com/" />
+ <property name="openjceplusGitRepo" value="https://github.com/IBM/OpenJCEPlus.git"/>
  </else>
  </if>
+ <if>
+ <isset property="env.OPENJCEPLUS_GIT_BRANCH"/>
+ <then>
+ <property name="openjceplusGitBranch" value="${env.OPENJCEPLUS_GIT_BRANCH}"/>
+ </then>
+ <else>
+ <property name="openjceplusGitBranch" value="main"/>
+ </else>
+ </if>
+
  <target name="getOpenJcePlusTests" depends="openJcePlusTests.check" unless="openJcePlusTests.exists">
- <exec executable="git" failonerror="true">
- <arg value="clone" />
- <arg value="${GIT_REPO}IBM/OpenJCEPlus.git" />
- </exec>
+ <getFileWithRetry file="OpenJCEPlus" command="git clone --depth 1 -q ${openjceplusGitRepo} -b ${openjceplusGitBranch} OpenJCEPlus"/>
  <delete dir="./OpenJCEPlus/src/main" />
  </target>