mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 14:02:22 +00:00
Rolling back r19373-19376 as discussed in http://www.nabble.com/attention-all-subversion-users-td24335693.html to proceed with the 1.315 release
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19544 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
439a6b94f0
commit
df1e55186b
5 files changed
+1
-60
No files matched your search
@@ -262,12 +262,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
|
||||
listener.getLogger().println(node instanceof Hudson ? Messages.AbstractBuild_BuildingOnMaster() : Messages.AbstractBuild_BuildingRemotely(builtOn));
|
||||
|
||||
node.getFileSystemProvisioner().prepareWorkspace(AbstractBuild.this,project.getWorkspace(),listener);
|
||||
|
||||
if (project.isCleanWorkspaceRequired()) {
|
||||
listener.getLogger().println("Cleaning workspace because project is configured to use a clean workspace for each build.");
|
||||
project.getWorkspace().deleteContents();
|
||||
}
|
||||
|
||||
|
||||
checkout(listener);
|
||||
|
||||
if(!preBuild(listener,project.getProperties()))
|
||||
|
||||
@@ -160,11 +160,6 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
|
||||
private transient boolean enableRemoteTrigger;
|
||||
|
||||
private volatile BuildAuthorizationToken authToken = null;
|
||||
|
||||
/**
|
||||
* True to clean the workspace prior to each build.
|
||||
*/
|
||||
private volatile boolean cleanWorkspaceRequired;
|
||||
|
||||
/**
|
||||
* List of all {@link Trigger}s for this project.
|
||||
@@ -341,10 +336,6 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
|
||||
return disabled;
|
||||
}
|
||||
|
||||
public boolean isCleanWorkspaceRequired() {
|
||||
return cleanWorkspaceRequired;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates the retry count Regex
|
||||
*/
|
||||
@@ -368,8 +359,6 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
|
||||
Hudson.getInstance().getQueue().cancel(this);
|
||||
save();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public BallColor getIconColor() {
|
||||
@@ -1204,12 +1193,6 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
|
||||
canRoam = true;
|
||||
assignedNode = null;
|
||||
}
|
||||
|
||||
if (req.getParameter("cleanWorkspaceRequired") != null) {
|
||||
cleanWorkspaceRequired = true;
|
||||
} else {
|
||||
cleanWorkspaceRequired = false;
|
||||
}
|
||||
|
||||
authToken = BuildAuthorizationToken.create(req);
|
||||
|
||||
|
||||
Reference in new issue
Block a user