Fix Parallel value to 'None' and revert change of order for declaring…

… env variables

buildenv/jenkins/JenkinsfileBase

@@ -1214,7 +1214,7 @@ def addGrinderLink() {
 		}
 		// Always set Parallel to None for Grinder link
 		if (key == "PARALLEL") {
-			value = "NONE"
+			value = "None"
 		}
 
 		url += "${key}=${value}"
@@ -1224,16 +1224,16 @@ def addGrinderLink() {
 		i++;
 	}
 
+	env.RERUN_LINK = url
+	env.FAILED_TEST_TARGET = targetValue
+	env.CUSTOM_TARGET_KEY_VALUE = customTargetKeyValue
+
 	currentBuild.description += "<br><a href=\"https://github.com/adoptium/aqa-tests/wiki/How-to-Run-a-Grinder-Build-on-Jenkins\">Grinder Wiki</a>"
 	echo "Rerun in Grinder: ${url}"
 	currentBuild.description += "<br><a href=${url}>Rerun in Grinder</a> Change TARGET to run only the failed test targets."
 	def sameMachineUrl = url.replace(labelValue,"LABEL=${NODE_NAME}")
 	echo "Rerun in Grinder on same machine: ${sameMachineUrl}"
 	currentBuild.description += "<br><a href=${sameMachineUrl}>Rerun in Grinder on same machine</a> Change TARGET to run only the failed test targets. For dynamic vm agents as they are created at runtime and quickly recycled, it may not be possible to rerun on the same agent."
-
-	env.RERUN_LINK = url
-	env.FAILED_TEST_TARGET = targetValue
-	env.CUSTOM_TARGET_KEY_VALUE = customTargetKeyValue
 }
 
 def addFailedTestsGrinderLink(paths=""){