Set system.dev with additional label and vendors info

Signed-off-by: Sophia Guo <[email protected]>
adoptium · Jan 31, 2024 · f6ac62b · f6ac62b
1 parent a6efa25
commit f6ac62b
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -350,7 +350,9 @@ class Build {
         def jdkBranch = getJDKBranch()
         def jdkRepo = getJDKRepo()
         def openj9Branch = (buildConfig.SCM_REF && buildConfig.VARIANT == 'openj9') ? buildConfig.SCM_REF : 'master'
-
+        def vendorTestRepos = ''
+        def vendorTestBranches = ''
+
         List testList = buildConfig.TEST_LIST
         List dynamicList = buildConfig.DYNAMIC_LIST
         List numMachines = buildConfig.NUM_MACHINES
@@ -385,14 +387,24 @@ class Build {
                             DYNAMIC_COMPILE = true
                         }
                         def additionalTestLabel = buildConfig.ADDITIONAL_TEST_LABEL
-                        if (testType  == 'dev.openjdk') {
+                        if (testType  == 'dev.openjdk' || testType  == 'dev.system') {
                             context.println "${testType} need extra label sw.tool.docker"
                             if (additionalTestLabel == '') {
                                 additionalTestLabel = 'sw.tool.docker'
                             } else {
                                 additionalTestLabel += '&&sw.tool.docker'
                             }
                         }
+
+                        if (testType  == 'dev.system') {
+                            def useAdoptShellScripts = Boolean.valueOf(buildConfig.USE_ADOPT_SHELL_SCRIPTS)
+                            def vendorTestBranches = useAdoptShellScripts ? ADOPT_DEFAULTS_JSON['repository']['build_branch'] : DEFAULTS_JSON['repository']['build_branch']
+                            def vendorTestRepos = useAdoptShellScripts ? ADOPT_DEFAULTS_JSON['repository']['build_url'] :  DEFAULTS_JSON['repository']['build_url']
+                            vendorTestRepos = vendorTestRepos - ('.git')
+                            // Use BUILD_REF override if specified
+                            vendorTestBranches = buildConfig.BUILD_REF ?: vendorTestBranches
+                        }
+
                         def jobParams = getAQATestJobParams(testType)
                         def parallel = 'None'
                         def numMachinesPerTest = ''
@@ -409,6 +421,14 @@ class Build {
                             parallel = 'Dynamic'
                         }
 
+                        // For reproduciable comparision tests
+                        def useAdoptShellScripts = Boolean.valueOf(buildConfig.USE_ADOPT_SHELL_SCRIPTS)
+                        def vendorTestBranches = useAdoptShellScripts ? ADOPT_DEFAULTS_JSON['repository']['build_branch'] : DEFAULTS_JSON['repository']['build_branch']
+                        def vendorTestRepos = useAdoptShellScripts ? ADOPT_DEFAULTS_JSON['repository']['build_url'] :  DEFAULTS_JSON['repository']['build_url']
+                        vendorTestRepos = vendorTestRepos - ('.git')
+
+                        // Use BUILD_REF override if specified
+                        vendorTestBranches = buildConfig.BUILD_REF ?: vendorTestBranches
                         def jobName = jobParams.TEST_JOB_NAME
                         String helperRef = buildConfig.HELPER_REF ?: DEFAULTS_JSON['repository']['helper_ref']
                         def JobHelper = context.library(identifier: "openjdk-jenkins-helper@${helperRef}").JobHelper
@@ -463,6 +483,8 @@ class Build {
                                             context.string(name: 'ADOPTOPENJDK_BRANCH', value: aqaBranch),
                                             context.string(name: 'ACTIVE_NODE_TIMEOUT', value: "${buildConfig.ACTIVE_NODE_TIMEOUT}"),
                                             context.booleanParam(name: 'DYNAMIC_COMPILE', value: DYNAMIC_COMPILE),
+                                            context.string(name: 'VENDOR_TEST_REPOS', value: vendorTestRepos),
+                                            context.string(name: 'VENDOR_TEST_BRANCHES', value: vendorTestBranches),
                                             context.string(name: 'RERUN_ITERATIONS', value: "${rerunIterations}")
                                         ],
                                         wait: true