Skip to content

Commit

Permalink
[FIXED JENKINS-10448] Fixed the Latest Promotion perma link and page'…
Browse files Browse the repository at this point in the history 
…s reference

[FIXED JENKINS-10447] Added Promotion History per Promotion Process at Project's Promotion Status
page.
  • Loading branch information
@gerard-hcp @ssogabe
gerard-hcp authored and ssogabe committed Oct 23, 2011
1 parent 423124b commit d3574ab
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 21 deletions.
16 changes: 16 additions & 0 deletions src/main/java/hudson/plugins/promoted_builds/PromotedBuildAction.java
View file
Expand Up @@ -95,6 +95,22 @@ public List<Status> getPromotions() {
return statuses.getView();
}

/**
* Gets the read-only view of all the promotion builds that this build achieved
* for a PromotionProcess.
*/
public List<Promotion> getPromotionBuilds(PromotionProcess promotionProcess) {
List<Promotion> filtered = new ArrayList<Promotion>();

for(Status s: getPromotions() ){
if( s.isFor(promotionProcess)){
filtered.addAll( s.getPromotionBuilds() );
}
}
return filtered;
}


/**
* Finds the {@link Status} that has matching {@link Status#name} value.
* Or null if not found.
Expand Down
50 changes: 44 additions & 6 deletions src/main/java/hudson/plugins/promoted_builds/PromotedProjectAction.java
View file
Expand Up @@ -6,14 +6,19 @@
import hudson.model.ProminentProjectAction;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
* For customizing project top-level GUI.
* @author Kohsuke Kawaguchi
*/
public class PromotedProjectAction implements ProminentProjectAction, PermalinkProjectAction {
public final AbstractProject<?,?> owner;

//TODO externalize to a plugin property?
private static final int SUMMARY_SIZE = 10;

public final AbstractProject<?,?> owner;
private final JobPropertyImpl property;

public PromotedProjectAction(AbstractProject<?, ?> owner, JobPropertyImpl property) {
Expand All @@ -24,23 +29,56 @@ public PromotedProjectAction(AbstractProject<?, ?> owner, JobPropertyImpl proper
public List<PromotionProcess> getProcesses() {
return property.getActiveItems();
}

public PromotionProcess getProcess(String name) {
for (PromotionProcess pp : getProcesses() ){
if(pp.getName().equals(name))
return pp;
}
return null;
}

public AbstractBuild<?,?> getLatest(PromotionProcess p) {
return getLatest(p.getName());
List<Promotion> list = getPromotions( p );
return list.size() > 0 ? list.get(0) : null;
}

/**
* Finds the last promoted build under the given criteria.
*/
public AbstractBuild<?,?> getLatest(String name) {
List<Promotion> list = getPromotions( getProcess(name) );
return list.size() > 0 ? list.get(0) : null;
}


public List<Promotion> getPromotions(PromotionProcess promotionProcess){
List<Promotion> list = new ArrayList<Promotion>();
for( AbstractBuild<?,?> build : owner.getBuilds() ) {
PromotedBuildAction a = build.getAction(PromotedBuildAction.class);
if(a!=null && a.contains(name))
return build;
if(a!=null && a.contains(promotionProcess))
list.addAll( a.getPromotionBuilds(promotionProcess) );
}
return null;
Collections.sort(list);
return list;
}


/**
* returns the summary of the latest promotions for a promotion process.
*
* @param promotionProcessName
* @return
*/
public List<Promotion> getPromotionsSummary(PromotionProcess promotionProcess){
List<Promotion> promotionList = this.getPromotions(promotionProcess);
if(promotionList.size() > SUMMARY_SIZE ){
return promotionList.subList(0, SUMMARY_SIZE);
}else{
return promotionList;
}
}


public List<Permalink> getPermalinks() {
List<Permalink> r = new ArrayList<Permalink>();
for (PromotionProcess pp : property.getActiveItems())
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/hudson/plugins/promoted_builds/Promotion.java
View file
Expand Up @@ -27,7 +27,8 @@
*
* @author Kohsuke Kawaguchi
*/
public class Promotion extends AbstractBuild<PromotionProcess,Promotion> {
public class Promotion extends AbstractBuild<PromotionProcess,Promotion>
implements Comparable<Promotion>{

public Promotion(PromotionProcess job) throws IOException {
super(job);
Expand Down Expand Up @@ -171,4 +172,10 @@ private boolean preBuild(BuildListener listener, List<BuildStep> steps) {
//public static final Permission PROMOTE = new Permission(PERMISSIONS, "Promote", Messages._Promotion_PromotePermission_Description(), Hudson.ADMINISTER);
public static final PermissionGroup PERMISSIONS = new PermissionGroup(Promotion.class, null);
public static final Permission PROMOTE = new Permission(PERMISSIONS, "Promote", null, Hudson.ADMINISTER);

@Override
public int compareTo(Promotion that) {
return that.getId().compareTo( this.getId() );
}

}
49 changes: 35 additions & 14 deletions src/main/resources/hudson/plugins/promoted_builds/PromotedProjectAction/index.jelly
View file
Expand Up @@ -10,22 +10,43 @@
<img src="${rootURL}/plugin/promoted-builds/icons/32x32/${c.getIcon()}.gif"/> ${c.name}
</h2>

<!-- history of this promotion process -->
<l:pane title="${%Promotion History}" width="90">
<j:forEach var="attempt" items="${it.getPromotionsSummary(c)}">
<tr><td>
<a href="../${attempt.target.number}/promotion/${c.name}/promotionBuild/${attempt.number}/">
<img src="${imagesURL}/16x16/${attempt.buildStatusUrl}"
alt="${attempt.iconColor.description}"/> ${c.name} #${attempt.number}
</a>
promoted build
<a href="../${attempt.target.number}/">
#${attempt.target.number}
</a>
on ${attempt.time}
</td></tr>
</j:forEach>
</l:pane>

<!-- permalink last promotion -->
<j:set var="b" value="${it.getLatest(c)}" />
<j:choose>
<j:when test="${b!=null}">
<p>
Last promoted build is <t:buildLink job="${b.project}" number="${b.number}" />,
${b.timestampString} ago.
(<a href="latest/${c.name}/">permalink</a>)
</p>
</j:when>
<j:otherwise>
<p>
No build promoted so far.
</p>
</j:otherwise>
</j:choose>
<j:choose>
<j:when test="${b!=null}">
<p>
Last promoted build is <t:buildLink job="${b.project}" number="${b.number}" />
(<a href="latest/${c.name}/">permalink</a>)
</p>
</j:when>
<j:otherwise>
<p>
No build promoted so far.
</p>
</j:otherwise>
</j:choose>
</j:forEach>



</l:main-panel>
</l:layout>
</j:jelly>

0 comments on commit d3574ab

Please sign in to comment.