allocate node for generate rerun job

Signed-off-by: Lan Xia <[email protected]>

Author: llxia

buildenv/jenkins/JenkinsfileBase

@@ -351,20 +351,9 @@ def createJob( TEST_JOB_NAME, ARCH_OS ) {
 	}
 
 	def templatePath = 'aqa-tests/buildenv/jenkins/testJobTemplate'
-	if (env.NODE_NAME) {
-		echo "${env.NODE_NAME} is allocated ..."
-		if (!fileExists(templatePath)) {
-			sh "curl -Os https://raw.githubusercontent.com/adoptium/aqa-tests/master/buildenv/jenkins/testJobTemplate"
-			templatePath = 'testJobTemplate'
-		}
-	} else {
-		echo "Node is not allocated ..."
-		node {
-			if (!fileExists(templatePath)) {
-				sh "curl -Os https://raw.githubusercontent.com/adoptium/aqa-tests/master/buildenv/jenkins/testJobTemplate"
-				templatePath = 'testJobTemplate'
-			}
-		}
+	if (!fileExists(templatePath)) {
+		sh "curl -Os https://raw.githubusercontent.com/adoptium/aqa-tests/master/buildenv/jenkins/testJobTemplate"
+		templatePath = 'testJobTemplate'
 	}
 
 	if (params.LIGHT_WEIGHT_CHECKOUT) {
@@ -1222,34 +1211,42 @@ def triggerRerunJob () {
 			stage('Rerun') {
 				def rerunJobName = "${JOB_NAME}_rerun"
 				def newJobs = [:]
-				generateJob(newJobs, rerunJobName, rerunJobName)
-				parallel newJobs
-
 				def childParams = []
-				// loop through all the params and change the parameters if needed
-				params.each { param ->
-					// set PARALLEL, NUM_MACHINES and TEST_TIME to default values
-					// set TARGET to failed tests and set ITERATIONS to rerunIterations
-					if (param.key == "TARGET") {
-						childParams << string(name: param.key, value: "testList TESTLIST=" + env.FAILED_TESTS)
-					} else if (param.key == "PARALLEL") {
-						childParams << string(name: param.key, value: "None")
-					} else if (param.key == "NUM_MACHINES") {
-						childParams << string(name: param.key, value: "")
-					} else if (param.key == "TEST_TIME") {
-						childParams << string(name: param.key, value: "")
-					} else if (param.key == "ITERATIONS") {
-						childParams << string(name: param.key, value: rerunIterations.toString())
-					} else {
-						def value = param.value.toString()
-						if (value == "true" || value == "false") {
-							childParams << booleanParam(name: param.key, value: value.toBoolean())
+				echo "allocate a node for generating rerun job ..."
+				node {
+					generateJob(newJobs, rerunJobName, rerunJobName)
+					parallel newJobs
+
+					// loop through all the params and change the parameters if needed
+					params.each { param ->
+						// set PARALLEL, NUM_MACHINES and TEST_TIME to default values
+						// set TARGET to failed tests and set ITERATIONS to rerunIterations
+						if (param.key == "TARGET") {
+							childParams << string(name: param.key, value: "testList TESTLIST=" + env.FAILED_TESTS)
+						} else if (param.key == "PARALLEL") {
+							childParams << string(name: param.key, value: "None")
+						} else if (param.key == "NUM_MACHINES") {
+							childParams << string(name: param.key, value: "")
+						} else if (param.key == "TEST_TIME") {
+							childParams << string(name: param.key, value: "")
+						} else if (param.key == "ITERATIONS") {
+							childParams << string(name: param.key, value: rerunIterations.toString())
 						} else {
-							childParams << string(name: param.key, value: value)
+							def value = param.value.toString()
+							if (value == "true" || value == "false") {
+								childParams << booleanParam(name: param.key, value: value.toBoolean())
+							} else {
+								childParams << string(name: param.key, value: value)
+							}
 						}
 					}
 				}
-				build job: rerunJobName, parameters: childParams, propagate: false
+
+				if (childParams) {
+					echo "rerunJobName: ${rerunJobName}"
+					echo "childParams: ${childParams}"
+					build job: rerunJobName, parameters: childParams, propagate: false
+				}
 			}
 		}
 	}

functional/MBCS_Tests/urlclassloader/playlist.xml

@@ -13,6 +13,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../TestConfig/playlist.xsd">
+	<test>
+		<testCaseName>myTest</testCaseName>
+		<command>$(JAVA_COMMAND) -versadfasfs; \
+	$(TEST_STATUS)</command>
+		<platformRequirements>os.linux</platformRequirements>
+		<levels>
+			<level>special</level>
+		</levels>
+		<groups>
+			<group>functional</group>
+		</groups>
+	</test>
 	<test>
 		<testCaseName>MBCS_Tests_urlclassloader_ja_JP_linux</testCaseName>
 		<command>LANG=ja_JP.UTF-8 bash $(TEST_RESROOT)$(D)test.sh; \