#4 env variables are now also expanded in suites-field.

jenkinsci · Apr 4, 2018 · 3acc992 · 3acc992
1 parent 9abe8b7
commit 3acc992
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/qftest/ScriptCreator.java b/src/main/java/org/jenkinsci/plugins/qftest/ScriptCreator.java
@@ -231,6 +231,7 @@ private void runner() {
 		String slash = "\\";
 		for (Suites s : suitefield) {
 			String suiteName = s.getSuitename();
+			suiteName = envVars.expand(suiteName);
 			if (suiteName.contains(".qft")) {
 				script.append("echo [qftest plugin] Running test-suite ");
 				script.append(s.getSuitename());
@@ -488,15 +489,16 @@ private void runnerShell() {
 			}
 
 			if (!suitesFileProvided) {
+				String suite = s.getSuitename();
+				suite = envVars.expand(suite);
 				if (daemonSelected) {
-					String suite = s.getSuitename();
 					if ( suite.startsWith("/") || suite.startsWith("\\")) {
 						script.append(" \""+ suite+"\" ");
 					} else {
 						script.append(" \""+getWorkspaceDir() + "/" + suite+"\" ");
 					}
 				} else {
-					appendSuites(s.getSuitename());
+					appendSuites(suite);
 				}
 			}
 			script.append("\n");