Skip to content

Job to aggregate can contain variable, expand it before use #72

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Job to aggregate can contain variable, expand it before use #72

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c729ae7
Job to aggregate can contain variable, expand it before use
jeromeliunow Jun 9, 2017
9c3e2be
Remove unnecessary import and new lines
jeromeliunow Jun 9, 2017
2e85017
Added JUnit test
ahahxof Dec 20, 2019
d64985f
Merge branch 'master' into master
ahahxof Dec 20, 2019
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
18 changes: 17 additions & 1 deletion src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.AutoCompletionCandidates;
import hudson.EnvVars;
import hudson.Extension;
import hudson.Launcher;
import hudson.Util;
import static hudson.Util.fixNull;
import hudson.model.Action;
import hudson.model.BuildListener;
import hudson.model.DependencyGraph;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't need this, sorry. I will remove it and the excess new lines added below

import hudson.model.Fingerprint.RangeSet;
import hudson.model.InvisibleAction;
import hudson.model.ItemGroup;
Expand All @@ -51,6 +53,7 @@
import hudson.tasks.Recorder;
import hudson.util.FormValidation;
import net.sf.json.JSONObject;

import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
Expand All @@ -60,7 +63,9 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;

import javax.annotation.CheckForNull;

import org.acegisecurity.AccessDeniedException;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
Expand Down Expand Up @@ -95,9 +100,20 @@ public AggregatedTestResultPublisher(String jobs, boolean includeFailedBuilds) {

public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
// add a TestResult just so that it can show up later.
build.addAction(new TestResultAction(jobs, includeFailedBuilds, build));
// Expand the jobs String as it can contain variable
String expandedJobs = this.getJobs(build.getEnvironment(listener));
build.addAction(new TestResultAction(expandedJobs, includeFailedBuilds, build));
return true;
}

/**
* Return the expanded job list
* @param env
* @return
*/
public String getJobs(EnvVars env) {
return (env != null ? env.expand(this.jobs) : this.jobs);
}

public BuildStepMonitor getRequiredMonitorService() {
return BuildStepMonitor.NONE;
Expand Down