Set TEST_FLAG and KEEP_REPORTDIR even if not defined in job config (a…

…doptium#5564) Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
fengxue-IS · Sep 6, 2024 · 2440d30 · 2440d30
1 parent 80ffd1d
commit 2440d30
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/buildenv/jenkins/aqaTestPipeline.groovy b/buildenv/jenkins/aqaTestPipeline.groovy
@@ -237,10 +237,6 @@ def generateJobs(jobJdkVersion, jobTestFlag, jobPlatforms, jobTargets) {
                         childParams << booleanParam(name: param.key, value: LIGHT_WEIGHT_CHECKOUT.toBoolean())
                     } else if (param.key == "TIME_LIMIT") {
                         childParams << string(name: param.key, value: TIME_LIMIT.toString())
-                    } else if (param.key == "TEST_FLAG") {
-                        childParams << string(name: param.key, value: jobTestFlag)
-                    } else if (param.key == "KEEP_REPORTDIR") {
-                        childParams << booleanParam(name: param.key, value: keep_reportdir.toBoolean())
                     } else {
                         def value = param.value.toString()
                         if (value == "true" || value == "false") {
@@ -252,10 +248,12 @@ def generateJobs(jobJdkVersion, jobTestFlag, jobPlatforms, jobTargets) {
                 }
                 childParams << booleanParam(name: "DYNAMIC_COMPILE", value: DYNAMIC_COMPILE.toBoolean())
                 childParams << booleanParam(name: "GENERATE_JOBS", value: AUTO_AQA_GEN.toBoolean())
+                childParams << booleanParam(name: "KEEP_REPORTDIR", value: keep_reportdir.toBoolean())
                 childParams << string(name: "JDK_IMPL", value: jdk_impl)
                 childParams << string(name: "JDK_VERSION", value: jobJdkVersion)
                 childParams << string(name: "PLATFORM", value: PLATFORM)
                 childParams << string(name: "RERUN_ITERATIONS", value: rerunIterations.toString())
+                childParams << string(name: "TEST_FLAG", value: jobTestFlag)
                 childParams << string(name: "VENDOR_TEST_BRANCHES", value: VENDOR_TEST_BRANCHES)
                 childParams << string(name: "VENDOR_TEST_DIRS", value: VENDOR_TEST_DIRS)
                 childParams << string(name: "VENDOR_TEST_REPOS", value: VENDOR_TEST_REPOS)