fixes adoptium#92 enable jdkRepo

bhuva-v · Oct 1, 2021 · e96ffb0 · e96ffb0
1 parent 1a5c2c3
commit e96ffb0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/action.yml b/action.yml
@@ -9,10 +9,10 @@ inputs:
     description: 'testing jdk version (Required when jdksource is github-hosted or install-jdk.)'
     required: false
   build_list:           # test category
-    description: 
+    description:
     default: 'openjdk'
   target:              # test
-    description: 
+    description:
     default: '_jdk_math'
   custom_target:   #  Used if need to set non-default custom target
     description:
@@ -26,6 +26,9 @@ inputs:
   tkg_Repo:
     description: 'Personal TKG Repo. For example, octocat/TKG:test'
     required: false
+  jdk_Repo:
+    description: 'jdk Repo'
+    required: false
   vendor_testRepos:
       description: 'Comma-separated list of vendor repositories'
       required: false

diff --git a/src/aqa.ts b/src/aqa.ts
@@ -11,6 +11,7 @@ async function run(): Promise<void> {
     const aqatestsRepo = core.getInput('aqa-testsRepo', {required: false})
     const openj9Repo = core.getInput('openj9_repo', {required: false})
     const tkgRepo = core.getInput('tkg_Repo', {required: false})
+    const jdkRepo = core.getInput('jdk_Repo', {required: false});
     const vendorTestRepos = core.getInput('vendor_testRepos', {required: false})
     const vendorTestBranches = core.getInput('vendor_testBranches', {
       required: false
@@ -67,6 +68,7 @@ async function run(): Promise<void> {
       aqatestsRepo,
       openj9Repo,
       tkgRepo,
+      jdkRepo,
       vendorTestParams
     )
   } catch (error) {

diff --git a/src/runaqa.ts b/src/runaqa.ts
@@ -32,6 +32,7 @@ export async function runaqaTest(
   aqatestsRepo: string,
   openj9Repo: string,
   tkgRepo: string,
+  jdkRepo: string,
   vendorTestParams: string
 ): Promise<void> {
   await installDependencyAndSetup()
@@ -41,7 +42,7 @@ export async function runaqaTest(
     process.env.TEST_JDK_HOME = getTestJdkHome(version, jdksource)
 
   await getAqaTestsRepo(aqatestsRepo)
-  await runGetSh(tkgRepo, openj9Repo, vendorTestParams)
+  await runGetSh(tkgRepo, jdkRepo, openj9Repo, vendorTestParams)
 
   //Get Dependencies, using /*zip*/dependents.zip to avoid loop every available files
   let dependents = await tc.downloadTool(
@@ -232,13 +233,18 @@ async function getAqaTestsRepo(aqatestsRepo: string): Promise<void> {
 async function runGetSh(
   tkgRepo: string,
   openj9Repo: string,
+  jdkRepo: string,
   vendorTestParams: string
 ): Promise<void> {
   let parameters = ''
   if (tkgRepo.length !== 0) {
     const repoBranch = parseRepoBranch(tkgRepo)
     parameters += `--tkg_branch ${repoBranch[1]} --tkg_repo https://github.com/${repoBranch[0]}.git`
   }
+  if (jdkRepo && jdkRepo.length !== 0) {
+    const repoBranch = parseRepoBranch(jdkRepo);
+    parameters += ` --jdk_branch ${repoBranch[1]} --jdk_repo https://github.com/${repoBranch[0]}.git`;
+  }
   if (openj9Repo.length !== 0) {
     const repoBranch = parseRepoBranch(openj9Repo)
     parameters += ` --openj9_branch ${repoBranch[1]} --openj9_repo https://github.com/${repoBranch[0]}.git`