Skip to content
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.

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

M2Releases triggered from Pipeline View #55

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 28 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,46 @@
<!-- only necessary if Hamcrest matchers are used -->
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.2</version>
<version>1.3</version>
<scope>test</scope>
</dependency>
<!-- Need to update this version due to conflicts on maven* versions -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>dashboard-view</artifactId>
<version>2.2</version>
<version>2.9.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>parameterized-trigger</artifactId>
<version>2.17</version>
</dependency>
<!-- Additional dependencies to enable detection of maven builds, resp. maven release builds
The test-scoped dependencies are needed due to mismatches with the versions. -->
<dependency>
<groupId>org.jenkins-ci.plugins.m2release</groupId>
<artifactId>m2release</artifactId>
<version>0.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>3.0.3</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.seleniumhq.selenium</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@

import javax.servlet.ServletException;

import org.jvnet.hudson.plugins.m2release.M2ReleaseAction;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
Expand Down Expand Up @@ -931,5 +932,28 @@ public boolean hasPermission(final Permission p) {
}

return display;
}
}

/**
* Check for M2ReleaseAction, if present, then provide an icon on top
*
* @return boolean - whether the first job is a m2release job
*/
public boolean isM2Release() {
if (Jenkins.getInstance().getPlugin("m2release") == null) {
return false;
}
final String firstJobName = ((DownstreamProjectGridBuilder) gridBuilder).getFirstJob();
final AbstractProject<?, ?> project = Jenkins.getInstance().getItem(firstJobName, this.getOwnerItemGroup(),
AbstractProject.class);
if (project != null) {
// If a M2ReleaseAction is found
final List<M2ReleaseAction> actions = project.getActions(M2ReleaseAction.class);
if (actions != null && !actions.isEmpty()) {
return true;
}
}
return false;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,14 @@
</j:if>
<div>Run</div>
</div>
<j:if test="${from.m2Release}">
<div class="icon-container">
<div onclick="buildPipeline.fillDialog('${rootURL}/job/${from.gridBuilder.firstJob}/m2release', 'Starts the pipeline with a maven release build')" class="pointer">
<img src="${rootURL}/images/24x24/installer.gif" alt="M2Release in a Pipeline" class="icon-with-caption"/>
</div>
<div>Release</div>
</div>
</j:if>
</j:if>

<div class="icon-container">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
height: 48px;
margin-left: auto;
margin-right: auto;
width: 340px;
width: 392px;
}

.icon-container {
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/js/build-pipeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ BuildPipeline.prototype = {
type: 'iframe',
title: title,
titlePosition: 'outside',
href: '/' + href,
href: href,
transitionIn : 'elastic',
transitionOut : 'elastic',
width: '90%',
Expand Down