Set functional vendor repo branch match with official adoptium branch

fixes: automation/issues/108 Signed-off-by: Lan Xia <[email protected]>
adoptium · Nov 6, 2024 · 5036eb0 · 5036eb0
1 parent 4160f41
commit 5036eb0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/buildenv/jenkins/aqaTestPipeline.groovy b/buildenv/jenkins/aqaTestPipeline.groovy
@@ -190,7 +190,13 @@ def generateJobs(jobJdkVersion, jobTestFlag, jobPlatforms, jobTargets, jobParall
                         }
                     } else {
                         VENDOR_TEST_REPOS = '[email protected]:runtimes/test.git'
-                        VENDOR_TEST_BRANCHES = params.ADOPTOPENJDK_BRANCH ?: 'master'
+                        // Default VENDOR_TEST_BRANCHES is master. 
+                        // If offical adoptium repo is used, set VENDOR_TEST_BRANCHES to match with params.ADOPTOPENJDK_BRANCH.
+                        VENDOR_TEST_BRANCHES = 'master'
+                        if (params.ADOPTOPENJDK_REPO && params.ADOPTOPENJDK_REPO.contains("adoptium/aqa-tests")) {
+                            VENDOR_TEST_BRANCHES = params.ADOPTOPENJDK_BRANCH ?: 'master'
+                        }
+
                         VENDOR_TEST_DIRS = 'functional'
                     }
                 } else if (TARGET.contains('jck')) {