Skip to content

Commit b2c132e

Browse files
gboissinotgboissinot
committedFeb 22, 2012
1 parent 173ae9e commit b2c132e

File tree

2 files changed

+20
-37
lines changed

2 files changed

+20
-37
lines changed
 

‎src/main/java/org/jenkinsci/plugins/envinject/EnvInjectListener.java

+14-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ public Environment setUpEnvironment(AbstractBuild build, Launcher launcher, Buil
3939
try {
4040
if (!isMatrixRun(build)) {
4141
if (variableGetter.isEnvInjectJobPropertyActive(build)) {
42-
return setUpEnvironmentNonMatrixProject(build, launcher, listener);
42+
return setUpEnvironmentNonMatrixRun(build, launcher, listener);
4343
}
4444
} else {
4545
if (variableGetter.isEnvInjectJobPropertyActive(build)) {
46-
return setUpEnvironmentMatrixProject(build, listener);
46+
return setUpEnvironmentMatrixRun(build, listener);
4747
}
4848
}
4949
} catch (EnvInjectException envEx) {
@@ -60,7 +60,7 @@ public Environment setUpEnvironment(AbstractBuild build, Launcher launcher, Buil
6060
};
6161
}
6262

63-
private Environment setUpEnvironmentNonMatrixProject(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException, EnvInjectException {
63+
private Environment setUpEnvironmentNonMatrixRun(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException, EnvInjectException {
6464
EnvInjectVariableGetter variableGetter = new EnvInjectVariableGetter();
6565
EnvInjectLogger logger = new EnvInjectLogger(listener);
6666
logger.info("Preparing an environment for the job.");
@@ -129,10 +129,10 @@ public void buildEnvVars(Map<String, String> env) {
129129
};
130130
}
131131

132-
private Environment setUpEnvironmentMatrixProject(AbstractBuild build, BuildListener listener) throws IOException, InterruptedException, EnvInjectException {
132+
private Environment setUpEnvironmentMatrixRun(AbstractBuild build, BuildListener listener) throws IOException, InterruptedException, EnvInjectException {
133133
EnvInjectVariableGetter variableGetter = new EnvInjectVariableGetter();
134134
EnvInjectLogger logger = new EnvInjectLogger(listener);
135-
logger.info("Using environment variables injected by the matrix job.");
135+
logger.info("Using environment variables injected by the parent matrix job.");
136136
final Map<String, String> resultVariables = variableGetter.getEnvVarsPreviousSteps(build, logger);
137137
final FilePath rootPath = getNodeRootPath();
138138

@@ -267,12 +267,21 @@ public void onCompleted(Run run, TaskListener listener) {
267267

268268
EnvInjectPluginAction envInjectAction = run.getAction(EnvInjectPluginAction.class);
269269
if (envInjectAction != null) {
270+
270271
//Add other plugins env vars contribution variables (exclude builder action and parameter actions already populated)
271272
for (EnvironmentContributingAction a : Util.filter(run.getActions(), EnvironmentContributingAction.class)) {
272273
if (!parameter2exclude(a)) {
273274
a.buildEnvVars((AbstractBuild<?, ?>) run, envVars);
274275
}
275276
}
277+
278+
//Add workspace if not set
279+
AbstractBuild build = (AbstractBuild) run;
280+
FilePath ws = build.getWorkspace();
281+
if (ws != null) {
282+
envVars.put("WORKSPACE", ws.getRemote());
283+
}
284+
276285
} else {
277286
//Keep classic injected env vars
278287
AbstractBuild abstractBuild = (AbstractBuild) run;

‎src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java

+6-32
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import hudson.FilePath;
44
import hudson.Util;
5+
import hudson.matrix.MatrixBuild;
56
import hudson.matrix.MatrixRun;
67
import hudson.model.*;
78
import hudson.slaves.EnvironmentVariablesNodeProperty;
@@ -75,12 +76,6 @@ public Map<String, String> getBuildVariables(AbstractBuild build, EnvInjectLogge
7576
//Add build variables such as parameters, plugins contributions, ...
7677
result.putAll(build.getBuildVariables());
7778

78-
//Add workspace variable
79-
String workspace = getWorkspaceWithCreation(build, logger, result);
80-
if (workspace != null) {
81-
result.put("WORKSPACE", workspace);
82-
}
83-
8479
//Retrieve triggered cause
8580
Map<String, String> triggerVariable = new BuildCauseRetriever().getTriggeredCause(build);
8681
result.putAll(triggerVariable);
@@ -113,32 +108,6 @@ public Map<String, String> overrideParametersVariablesWithSecret(AbstractBuild b
113108
return result;
114109
}
115110

116-
private String getWorkspaceWithCreation(AbstractBuild build, EnvInjectLogger logger, Map<String, String> currentEnvVars) throws EnvInjectException {
117-
Node node = build.getBuiltOn();
118-
Job job = build.getParent();
119-
try {
120-
final WorkspaceList.Lease lease = decideWorkspace((TopLevelItem) job, node, currentEnvVars, Computer.currentComputer().getWorkspaceList());
121-
FilePath workspace = lease.path;
122-
workspace.mkdirs();
123-
return workspace.getRemote();
124-
} catch (InterruptedException e) {
125-
throw new EnvInjectException(e);
126-
} catch (IOException e) {
127-
throw new EnvInjectException(e);
128-
}
129-
}
130-
131-
private WorkspaceList.Lease decideWorkspace(TopLevelItem item, Node n, Map<String, String> currentEnVars, WorkspaceList wsl) throws InterruptedException, IOException {
132-
if (item instanceof AbstractProject) {
133-
String customWorkspace = ((AbstractProject) item).getCustomWorkspace();
134-
if (customWorkspace != null) {
135-
String customWorkspaceResolved = Util.replaceMacro(customWorkspace, currentEnVars);
136-
return WorkspaceList.Lease.createDummyLease(n.getRootPath().child(customWorkspaceResolved));
137-
}
138-
}
139-
return wsl.allocate(n.getWorkspaceFor(item));
140-
}
141-
142111
public boolean isEnvInjectJobPropertyActive(AbstractBuild build) {
143112

144113
if (build == null) {
@@ -172,6 +141,11 @@ public Map<String, String> getEnvVarsPreviousSteps(AbstractBuild build, EnvInjec
172141
EnvInjectDetector envInjectDetector = new EnvInjectDetector();
173142
if (envInjectDetector.isEnvInjectActivated(build)) {
174143
result.putAll(getCurrentInjectedEnvVars(build));
144+
//Add workspace if not set
145+
FilePath ws = build.getWorkspace();
146+
if (ws != null) {
147+
result.put("WORKSPACE", ws.getRemote());
148+
}
175149
} else {
176150
result.putAll(getJenkinsSystemVariablesCurrentNode(build));
177151
result.putAll(getBuildVariables(build, logger));

0 commit comments

Comments
 (0)
Please sign in to comment.