consume property in openjdk build.xml

buildenv/jenkins/JenkinsfileBase

@@ -25,28 +25,28 @@ def setupEnv() {
 	if ( params.JDK_VERSION ) {
 		env.ORIGIN_JDK_VERSION = params.JDK_VERSION
 		env.JDK_VERSION = params.JDK_VERSION.equalsIgnoreCase("next") ? "" : params.JDK_VERSION
-	}
+	} 
+	env.USE_TESTENV_PROPERTIES = params.USE_TESTENV_PROPERTIES
 
 	env.SPEC = "${SPEC}"
-
-	ADOPTOPENJDK_REPO = params.ADOPTOPENJDK_REPO ? params.ADOPTOPENJDK_REPO : "https://github.com/adoptium/aqa-tests.git"
-	OPENJ9_REPO = params.OPENJ9_REPO ? params.OPENJ9_REPO : "https://github.com/eclipse-openj9/openj9.git"
-
-	String[] tkg = getGitRepoBranch(params.TKG_OWNER_BRANCH, "adoptium:master", "TKG")
-	TKG_REPO = tkg[0]
-	TKG_BRANCH = tkg[1]
-
-	//For Zos, the right repo should be something like: git@github.ibm.com:runtimes/openj9-openjdk-jdk**-zos.git and for now there is only jdk11
-	env.JDK_REPO = params.JDK_REPO ? params.JDK_REPO : ""
-	if (env.SPEC.startsWith('zos')) {
-		ADOPTOPENJDK_REPO = ADOPTOPENJDK_REPO.replace("https://github.com/","git@github.com:")
-		OPENJ9_REPO = OPENJ9_REPO.replace("https://github.com/","git@github.com:")
+	if(!params.USE_TESTENV_PROPERTIES){
+		ADOPTOPENJDK_REPO = params.ADOPTOPENJDK_REPO ? params.ADOPTOPENJDK_REPO : "https://github.com/adoptium/aqa-tests.git"
+		OPENJ9_REPO = params.OPENJ9_REPO ? params.OPENJ9_REPO : "https://github.com/eclipse-openj9/openj9.git"
+		String[] tkg = getGitRepoBranch(params.TKG_OWNER_BRANCH, "adoptium:master", "TKG")
+		TKG_REPO = tkg[0]
+		TKG_BRANCH = tkg[1]
+		//For Zos, the right repo should be something like: git@github.ibm.com:runtimes/openj9-openjdk-jdk**-zos.git and for now there is only jdk11
+		env.JDK_REPO = params.JDK_REPO ? params.JDK_REPO : ""
+		if (env.SPEC.startsWith('zos')) {
+			ADOPTOPENJDK_REPO = ADOPTOPENJDK_REPO.replace("https://github.com/","git@github.com:")
+			OPENJ9_REPO = OPENJ9_REPO.replace("https://github.com/","git@github.com:")
+		}
+		OPENJ9_BRANCH = params.OPENJ9_BRANCH ? params.OPENJ9_BRANCH : "master"
 	}
 
 	PLATFORM = params.PLATFORM ? params.PLATFORM : ""
 	ADOPTOPENJDK_BRANCH = params.ADOPTOPENJDK_BRANCH ? params.ADOPTOPENJDK_BRANCH : "master"
 	CLONE_OPENJ9 = params.CLONE_OPENJ9 ? params.CLONE_OPENJ9 : "true"
-	OPENJ9_BRANCH = params.OPENJ9_BRANCH ? params.OPENJ9_BRANCH : "master"
 	CUSTOM_TARGET = params.CUSTOM_TARGET ? params.CUSTOM_TARGET : ""
 	UPSTREAM_JOB_NAME = params.UPSTREAM_JOB_NAME ? params.UPSTREAM_JOB_NAME : ""
 	UPSTREAM_JOB_NUMBER = params.UPSTREAM_JOB_NUMBER ? params.UPSTREAM_JOB_NUMBER : ""
@@ -382,34 +382,42 @@ def setup() {
 					}
 				}
 			}
+			OPENJ9_REPO_OPTION = ""
+			OPENJ9_BRANCH_OPTION = ""
+			TKG_REPO_OPTION = ""
+			TKG_BRANCH_OPTION = ""
+			if(!params.USE_TESTENV_PROPERTIES){
+				OPENJ9_REPO_OPTION = "--openj9_repo ${OPENJ9_REPO}"
+				OPENJ9_BRANCH_OPTION = "--openj9_branch ${OPENJ9_BRANCH}"
+				TKG_REPO_OPTION = "--tkg_repo ${TKG_REPO}"
+				TKG_BRANCH_OPTION = "--tkg_branch ${TKG_BRANCH}"
+			}
 			CLONE_OPENJ9_OPTION = (params.CLONE_OPENJ9) ? "--clone_openj9 ${params.CLONE_OPENJ9}" : ""
-			OPENJ9_REPO_OPTION = "--openj9_repo ${OPENJ9_REPO}"
-			OPENJ9_BRANCH_OPTION = "--openj9_branch ${OPENJ9_BRANCH}"
 			OPENJ9_SHA_OPTION = (params.OPENJ9_SHA) ? "--openj9_sha ${params.OPENJ9_SHA}" : ""
-			TKG_REPO_OPTION = "--tkg_repo ${TKG_REPO}"
-			TKG_BRANCH_OPTION = "--tkg_branch ${TKG_BRANCH}"
 			JDK_VERSION_OPTION = env.JDK_VERSION ? "-j ${env.JDK_VERSION}" : ""
 			JDK_IMPL_OPTION = env.JDK_IMPL ? "-i ${env.JDK_IMPL}" : ""
 
 			// system test repository exports to be used by system/common.xml
-			if (params.ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH) {
+			if(!params.USE_TESTENV_PROPERTIES && params.ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH){
 				String[] adoptSystemTest = getGitRepoBranch(params.ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH, "adoptium:master", "aqa-systemtest")
 				env.ADOPTOPENJDK_SYSTEMTEST_REPO = adoptSystemTest[0]
 				env.ADOPTOPENJDK_SYSTEMTEST_BRANCH = adoptSystemTest[1]
 			}
-
-			if (params.OPENJ9_SYSTEMTEST_OWNER_BRANCH) {
+				
+			if (!params.USE_TESTENV_PROPERTIES && params.OPENJ9_SYSTEMTEST_OWNER_BRANCH) {
 				String[] openj9SystemTest = getGitRepoBranch(params.OPENJ9_SYSTEMTEST_OWNER_BRANCH, "eclipse:master", "openj9-systemtest")
 				env.OPENJ9_SYSTEMTEST_REPO = openj9SystemTest[0]
 				env.OPENJ9_SYSTEMTEST_BRANCH = openj9SystemTest[1]
 			}
-
-			if (params.STF_OWNER_BRANCH) {
+			if (!params.USE_TESTENV_PROPERTIES && params.STF_OWNER_BRANCH) {
 				String[] stf = getGitRepoBranch(params.STF_OWNER_BRANCH, "adoptium:master", "stf")
 				env.STF_REPO = stf[0]
 				env.STF_BRANCH = stf[1]
 			}
 
+
+
+
 			// vendor test
 			// expect VENDOR_TEST_* to be comma separated string parameters
 			VENDOR_TEST_REPOS = (params.VENDOR_TEST_REPOS) ? "--vendor_repos \"${params.VENDOR_TEST_REPOS}\"" : ""
@@ -421,7 +429,10 @@ def setup() {
 			// Only set image required to false if params is set to false. In get.sh, the default value is true
 			TEST_IMAGES_REQUIRED = (params.TEST_IMAGES_REQUIRED == false) ? "--test_images_required false" : ""
 			DEBUG_IMAGES_REQUIRED = (params.DEBUG_IMAGES_REQUIRED == false) ? "--debug_images_required false" : ""
+
 			GET_SH_CMD = "./get.sh -s `pwd`/.. -p $PLATFORM -r ${SDK_RESOURCE} ${JDK_VERSION_OPTION} ${JDK_IMPL_OPTION} ${CUSTOMIZED_SDK_URL_OPTION} ${CUSTOMIZED_SDK_SOURCE_URL_OPTION} ${CLONE_OPENJ9_OPTION} ${OPENJ9_REPO_OPTION} ${OPENJ9_BRANCH_OPTION} ${OPENJ9_SHA_OPTION} ${TKG_REPO_OPTION} ${TKG_BRANCH_OPTION} ${VENDOR_TEST_REPOS} ${VENDOR_TEST_BRANCHES} ${VENDOR_TEST_DIRS} ${VENDOR_TEST_SHAS} ${TEST_IMAGES_REQUIRED} ${DEBUG_IMAGES_REQUIRED}"
+
+
 			RESOLVED_MAKE = "if [ `uname` = AIX ] || [ `uname` = SunOS ] || [ `uname` = *BSD ]; then MAKE=gmake; else MAKE=make; fi"
 
 			dir( WORKSPACE) {
@@ -470,7 +481,18 @@ def get_sources() {
 		}
 	}
 }
-
+def exportEnv(){
+	String makeTestCmd = "bash ./compile.sh ${USE_TESTENV_PROPERTIES}"
+	dir('aqa-tests') {
+		if (!env.SPEC.startsWith('zos')) {
+			sshagent (credentials: ["$params.SSH_AGENT_CREDENTIAL"], ignoreMissing: true) {
+				sh "$makeTestCmd";
+			}
+		} else {
+			sh "$makeTestCmd";
+		}
+	}
+}
 def makeCompileTest() {
 	String makeTestCmd = "$RESOLVED_MAKE; cd ./aqa-tests/TKG; \$MAKE compile"
 	// use sshagent with Jenkins credentials ID for all platforms except zOS
@@ -538,10 +560,10 @@ def buildTest() {
 				if(params.CUSTOMIZED_SDK_URL_CREDENTIAL_ID) {
 					withCredentials([usernamePassword(credentialsId: "${params.CUSTOMIZED_SDK_URL_CREDENTIAL_ID}",
 						usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-						makeCompileTest()
+						exportEnv()
 					}
 				} else {
-					makeCompileTest()
+					exportEnv()
 				}
 			}
 		}

compile.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+usage ()
+{
+	echo '                [--USE_TESTENV_PROPERTIES ]: use testenv.properties or not'
+}
+
+if [ $USE_TESTENV_PROPERTIES == true ];then
+    while read line; do
+        export $line
+    done < ./testenv/testenv.properties
+fi
+cd ./TKG;
+make compile

get.sh

@@ -430,7 +430,10 @@ getTestKitGen()
 {
 	echo "get testKitGen..."
 	cd $TESTDIR
-
+	if [ "$TKG_REPO" == "" ]
+	then
+		TKG_REPO="https://github.com/adoptium/TKG.git"
+	fi
 	echo "git clone -q $TKG_REPO"
 	git clone -q $TKG_REPO
 	cd TKG
@@ -640,7 +643,12 @@ checkOpenJ9RepoSHA()
 	checkRepoSHA "$TESTDIR/openj9"
 }
 
+
 parseCommandLineArgs "$@"
+if [[ "$USE_TESTENV_PROPERTIES" == true  ]]; then
+	source ./testenv/testenv.properties
+fi
+
 if [[ "$SDKDIR" != "" ]]; then
 	getBinaryOpenjdk
 	testJavaVersion