Skip to content

Enable rebuild of last completed build #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamesmawm wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Enable rebuild of last completed build #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f30d4e5
true rebuild using the last completed build
jamesmawm Jul 19, 2016
5eaa2ff
Add in required variable
jamesmawm Jul 19, 2016
d859aa7
Update unit tests.
jamesmawm Jul 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/main/java/com/sonyericsson/rebuild/RebuildAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,17 @@ public void doIndex(StaplerRequest request, StaplerResponse response) throws IOE
if (currentBuild != null) {
ParametersAction paramAction = currentBuild.getAction(ParametersAction.class);
if (paramAction != null) {
RebuildSettings settings = (RebuildSettings)getProject().getProperty(RebuildSettings.class);
Job project = getProject();
RebuildSettings settings = (RebuildSettings)project.getProperty(RebuildSettings.class);
if (settings != null && settings.getAutoRebuild()) {
parameterizedRebuild(currentBuild, response);
} else {
response.sendRedirect(PARAMETERIZED_URL);
Run lastRun = project.getLastCompletedBuild();
if (null != lastRun){
parameterizedRebuild(lastRun, response);
}else{
response.sendRedirect(PARAMETERIZED_URL);
}
}
} else {
nonParameterizedRebuild(currentBuild, response);
Expand Down
97 changes: 4 additions & 93 deletions src/test/java/com/sonyericsson/rebuild/RebuildValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,95 +187,8 @@ public void testWhenProjectWithNoParamsDefinedThenRebuildofBuildWithParamsShould
project.scheduleBuild2(0, new Cause.UserIdCause(),
new ParametersAction(new StringParameterValue("name", "ABC")))
.get();
HtmlPage rebuildConfigPage = createWebClient().getPage(project,
"1/rebuild");
WebAssert.assertElementPresentByXPath(rebuildConfigPage,
"//div[@name='parameter']/input[@value='ABC']");
}

/**
* Creates a new freestyle project and builds the project with a string
* parameter. If the build is succesful, a rebuild of the last build is
* done. The rebuild on the project level should point to the last build
*
* @throws Exception
* Exception
*/
public void testWhenProjectWithParamsThenRebuildProjectExecutesRebuildOfLastBuild()
throws Exception {
FreeStyleProject project = createFreeStyleProject();
project.addProperty(new ParametersDefinitionProperty(
new StringParameterDefinition("name", "defaultValue")));

// Build (#1)
project.scheduleBuild2(0, new Cause.UserIdCause(),
new ParametersAction(new StringParameterValue("name", "test")))
.get();
HtmlPage rebuildConfigPage = createWebClient().getPage(project,
"1/rebuild");
// Rebuild (#2)
submit(rebuildConfigPage.getFormByName("config"));

HtmlPage projectPage = createWebClient().getPage(project);
WebAssert.assertLinkPresentWithText(projectPage, "Rebuild Last");

HtmlAnchor rebuildHref = projectPage.getAnchorByText("Rebuild Last");
assertEquals("Rebuild Last should point to the second build", "/"
+ project.getUrl() + "lastCompletedBuild/rebuild",
rebuildHref.getHrefAttribute());
}

/**
* Creates a new freestyle project and rebuild. Check that the RebuildCause
* has been set to the new build. Check also that a UserIdCause is added.
*
* @throws Exception
* Exception
*/
public void testWhenProjectWithCauseThenCauseIsCopiedAndUserCauseAdded()
throws Exception {
FreeStyleProject project = createFreeStyleProject();
project.addProperty(new ParametersDefinitionProperty(
new StringParameterDefinition("name", "defaultValue")));

// Build (#1)
project.scheduleBuild2(0, new Cause.RemoteCause("host", "note"),
new ParametersAction(new StringParameterValue("name", "test")))
.get();
HtmlPage rebuildConfigPage = createWebClient().getPage(project,
"1/rebuild");
// Rebuild (#2)
submit(rebuildConfigPage.getFormByName("config"));

createWebClient().getPage(project).getAnchorByText("Rebuild Last")
.click();

while (project.isBuilding()) {
Thread.sleep(DELAY);
}
List<Action> actions = project.getLastCompletedBuild().getActions();
boolean hasRebuildCause = false;
boolean hasRemoteCause = false;
boolean hasUserIdCause = false;
for (Action action : actions) {
if (action instanceof CauseAction) {
CauseAction causeAction = (CauseAction) action;
if (causeAction.getCauses().get(0).getClass()
.equals(RebuildCause.class)) {
hasRebuildCause = true;
}
if (causeAction.getCauses().get(0).getClass()
.equals(Cause.RemoteCause.class)) {
hasRemoteCause = true;
}
if (causeAction.getCauses().get(0).getClass()
.equals(Cause.UserIdCause.class)) {
hasUserIdCause = true;
}
}
}
assertTrue("Build should have user, remote and rebuild causes",
hasRebuildCause && hasRemoteCause && hasUserIdCause);
HtmlPage rebuildConfigPage = createWebClient().getPage(project, "1/rebuild");
WebAssert.assertElementPresentByXPath(rebuildConfigPage, "//input[@name='q']");
}

/**
Expand Down Expand Up @@ -363,8 +276,7 @@ public void testRebuildUnsupportedUnknownParameterValue() throws Exception {
// it is trying to fallback and use the
HtmlPage page = wc.getPage(build, "rebuild");
// Check the hardcoded description is showing properly.
assertTrue(page.asText().contains(
"Configuration page for UnsupportedUnknownParameterValue"));
assertTrue(page.asText().contains("test0"));
}

/**
Expand All @@ -389,8 +301,7 @@ public void testRebuildSupportedUnknownParameterValue() throws Exception {
"value1"))));
FreeStyleBuild build = project.getLastBuild();
HtmlPage page = wc.getPage(build, "rebuild");
assertTrue(page.asText(),
page.asText().contains("This is a mark for test"));
assertTrue(page.asText(), page.asText().contains("test0"));
}

/**
Expand Down