Skip to content

The Unified and Autonomous Development Platform

Fix some job interpolation bugs

Robin Shen7e0ebf28e682
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java
index d9cce82b82..2e730eb155 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java
@@ -21,7 +21,7 @@ public class CacheSpec implements Serializable {
private String path;
@Editable(order=100, description="Specify key of the cache. Caches with same key can be reused by different builds. "
- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
+ + "Note: Type @ to insert variable, use \\ to escape normal occurrences of @ or \\")
@Interpolative(variableSuggester="suggestVariables")
@NotEmpty
@RegEx(interpolative=true, value="[a-zA-Z0-9\\-_]+", message="Can only contain alphanumeric, dash and underscore")
@@ -35,7 +35,7 @@ public class CacheSpec implements Serializable {
@Editable(order=200, description="Specify path to cache. Non-absolute path is considered to be relative to job workspace. "
+ "Specify \".\" (without quote) to cache workspace itself. "
- + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
+ + "Note: Type @ to insert variable, use \\ to escape normal occurrences of @ or \\")
@Interpolative(variableSuggester="suggestVariables")
@Path
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
index 6e3634def2..194da4e88b 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
@@ -63,6 +63,7 @@ import io.onedev.server.entitymanager.BuildParamManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.event.Event;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.build.BuildFinished;
import io.onedev.server.event.build.BuildPending;
@@ -225,22 +226,27 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
- for (JobDependency dependency: build.getJob().getJobDependencies()) {
- new MatrixRunner<List<String>>(JobParam.getParamMatrix(dependency.getJobParams())) {
-
- @Override
- public void run(Map<String, List<String>> params) {
- Build dependencyBuild = submit(project, commitId, dependency.getJobName(),
- params, submitter, new LinkedHashSet<>(checkedJobNames));
- BuildDependence dependence = new BuildDependence();
- dependence.setDependency(dependencyBuild);
- dependence.setDependent(build);
- dependence.setRequireSuccessful(dependency.isRequireSuccessful());
- dependence.setArtifacts(dependency.getArtifacts());
- build.getDependencies().add(dependence);
- }
-
- }.run();
+ Build.push(build);
+ try {
+ for (JobDependency dependency: build.getJob().getJobDependencies()) {
+ new MatrixRunner<List<String>>(JobParam.getParamMatrix(dependency.getJobParams())) {
+
+ @Override
+ public void run(Map<String, List<String>> params) {
+ Build dependencyBuild = submit(project, commitId, dependency.getJobName(),
+ params, submitter, new LinkedHashSet<>(checkedJobNames));
+ BuildDependence dependence = new BuildDependence();
+ dependence.setDependency(dependencyBuild);
+ dependence.setDependent(build);
+ dependence.setRequireSuccessful(dependency.isRequireSuccessful());
+ dependence.setArtifacts(build.interpolate(dependency.getArtifacts()));
+ build.getDependencies().add(dependence);
+ }
+
+ }.run();
+ }
+ } finally {
+ Build.pop();
}
for (ProjectDependency dependency: build.getJob().getProjectDependencies()) {
@@ -271,16 +277,20 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
+ dependency.getProjectName() + "': permission denied");
}
- Build dependencyBuild = buildManager.find(dependencyProject, Long.parseLong(dependency.getBuildNumber()));
+ String buildNumberStr = build.interpolate(dependency.getBuildNumber());
+ if (buildNumberStr.startsWith("#"))
+ buildNumberStr = buildNumberStr.substring(1);
+ Long buildNumber = Long.parseLong(buildNumberStr);
+ Build dependencyBuild = buildManager.find(dependencyProject, buildNumber);
if (dependencyBuild == null) {
String errorMessage = String.format("Unable to find dependency build (project: %s, build number: %d)",
- dependency.getProjectName(), dependency.getBuildNumber());
+ dependency.getProjectName(), buildNumber);
throw new OneException(errorMessage);
}
BuildDependence dependence = new BuildDependence();
dependence.setDependency(dependencyBuild);
dependence.setDependent(build);
- dependence.setArtifacts(dependency.getArtifacts());
+ dependence.setArtifacts(build.interpolate(dependency.getArtifacts()));
build.getDependencies().add(dependence);
}
@@ -493,53 +503,58 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Sessional
@Listen
public void on(ProjectEvent event) {
- if (event instanceof BuildCommitAware) {
- ObjectId commitId = ((BuildCommitAware) event).getBuildCommit();
- if (!commitId.equals(ObjectId.zeroId())) {
- ScriptIdentity.push(new JobIdentity(event.getProject(), commitId));
- try {
- CISpec ciSpec = event.getProject().getCISpec(commitId);
- if (ciSpec != null) {
- for (Job job: ciSpec.getJobs()) {
- JobTrigger trigger = job.getMatchedTrigger(event);
- if (trigger != null) {
- Map<String, List<List<String>>> paramMatrix = JobParam.getParamMatrix(trigger.getParams());
- Long projectId = event.getProject().getId();
-
- // run asynchrously as session may get closed due to exception
- sessionManager.runAsync(new Runnable() {
-
- @Override
- public void run() {
- Project project = projectManager.load(projectId);
- try {
- new MatrixRunner<List<String>>(paramMatrix) {
-
- @Override
- public void run(Map<String, List<String>> paramMap) {
- submit(project, commitId, job.getName(), paramMap, null);
- }
-
- }.run();
- } catch (Exception e) {
- String message = String.format("Error submitting build (project: %s, commit: %s, job: %s)",
- project.getName(), commitId.name(), job.getName());
- logger.error(message, e);
- }
- }
+ Event.push(event);
+ try {
+ if (event instanceof BuildCommitAware) {
+ ObjectId commitId = ((BuildCommitAware) event).getBuildCommit();
+ if (!commitId.equals(ObjectId.zeroId())) {
+ ScriptIdentity.push(new JobIdentity(event.getProject(), commitId));
+ try {
+ CISpec ciSpec = event.getProject().getCISpec(commitId);
+ if (ciSpec != null) {
+ for (Job job: ciSpec.getJobs()) {
+ JobTrigger trigger = job.getMatchedTrigger(event);
+ if (trigger != null) {
+ Map<String, List<List<String>>> paramMatrix = JobParam.getParamMatrix(trigger.getParams());
+ Long projectId = event.getProject().getId();
- }, SecurityUtils.getSubject());
+ // run asynchrously as session may get closed due to exception
+ sessionManager.runAsync(new Runnable() {
+
+ @Override
+ public void run() {
+ Project project = projectManager.load(projectId);
+ try {
+ new MatrixRunner<List<String>>(paramMatrix) {
+
+ @Override
+ public void run(Map<String, List<String>> paramMap) {
+ submit(project, commitId, job.getName(), paramMap, null);
+ }
+
+ }.run();
+ } catch (Exception e) {
+ String message = String.format("Error submitting build (project: %s, commit: %s, job: %s)",
+ project.getName(), commitId.name(), job.getName());
+ logger.error(message, e);
+ }
+ }
+
+ }, SecurityUtils.getSubject());
+ }
}
}
+ } catch (Exception e) {
+ String message = String.format("Error checking job triggers (project: %s, commit: %s)",
+ event.getProject().getName(), commitId.name());
+ logger.error(message, e);
+ } finally {
+ ScriptIdentity.pop();
}
- } catch (Exception e) {
- String message = String.format("Error checking job triggers (project: %s, commit: %s)",
- event.getProject().getName(), commitId.name());
- logger.error(message, e);
- } finally {
- ScriptIdentity.pop();
}
}
+ } finally {
+ Event.pop();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java
index 9c301489a4..6f02d98e7e 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java
@@ -22,7 +22,7 @@ public class EnvVar implements Serializable {
@Editable(order=100, description="Specify name of the environment variable. "
+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
@Interpolative(variableSuggester="suggestVariables")
- @VariableName
+ @VariableName(interpolative = true)
@NotEmpty
public String getName() {
return name;
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobService.java b/server-core/src/main/java/io/onedev/server/ci/job/JobService.java
index a4de412ed9..eefdbf77f6 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/JobService.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobService.java
@@ -33,7 +33,7 @@ public class JobService implements Serializable {
@Editable(order=100, description="Specify name of the service, which can be used to access "
+ "the service. <b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
@Interpolative(variableSuggester="suggestVariables")
- @VariableName
+ @VariableName(interpolative = true)
@NotEmpty
public String getName() {
return name;
@@ -80,6 +80,7 @@ public class JobService implements Serializable {
+ "be interpretated by cmd.exe on Windows images, and by shell on Linux images. It will be "
+ "executed repeatedly until a zero code is returned to indicate service ready. "
+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
+ @Interpolative(variableSuggester="suggestVariables")
@NotEmpty
public String getReadinessCheckCommand() {
return readinessCheckCommand;
@@ -90,7 +91,9 @@ public class JobService implements Serializable {
}
@Editable(order=10000, name="CPU Requirement", group="More Settings", description="Specify CPU requirement of the job. "
- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details")
+ + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details. "
+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
+ @Interpolative(variableSuggester="suggestVariables")
@NotEmpty
public String getCpuRequirement() {
return cpuRequirement;
@@ -101,7 +104,9 @@ public class JobService implements Serializable {
}
@Editable(order=10100, group="More Settings", description="Specify memory requirement of the job. "
- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details")
+ + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details. "
+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
+ @Interpolative(variableSuggester="suggestVariables")
@NotEmpty
public String getMemoryRequirement() {
return memoryRequirement;
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java b/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java
index 9803826873..c14b482029 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java
@@ -15,7 +15,8 @@ public class SubmoduleCredential extends Authentication {
private String url;
- @Editable(order=100, description="Specify submodule url. <b>Note:</b> Input '@' to start inserting variable")
+ @Editable(order=100, description="Specify submodule url. Note: Input '@' to start inserting variable. "
+ + "Use \\ to escape normal occurrences of @ or \\")
@Interpolative(variableSuggester="suggestVariables")
@NotEmpty
public String getUrl() {
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java
index 693e08cf44..b7a11f0038 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java
@@ -11,6 +11,8 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.hibernate.validator.constraints.NotEmpty;
import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.server.event.Event;
+import io.onedev.server.model.Build;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.ScriptChoice;
@@ -60,6 +62,8 @@ public class ScriptingValues implements ValuesProvider {
@Override
public List<List<String>> getValues() {
Map<String, Object> variables = new HashMap<>();
+ variables.put("build", Build.get());
+ variables.put("event", Event.get());
List<List<String>> values = new ArrayList<>();
for (Object each: (List<Object>) GroovyUtils.evalScriptByName(scriptName, variables)) {
List<String> strings = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index eac396442a..bb416e08c6 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -73,6 +73,7 @@ import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.event.Event;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.event.entity.EntityRemoved;
@@ -739,32 +740,37 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
if (trigger instanceof PullRequestTrigger) {
PullRequestTrigger pullRequestTrigger = (PullRequestTrigger) trigger;
PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = new PullRequestMergePreviewCalculated(request);
- if (pullRequestTrigger.matches(pullRequestMergePreviewCalculated, job)) {
- boolean required = requiredJobNames.contains(job.getName());
- new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {
-
- @Override
- public void run(Map<String, List<String>> paramMap) {
- Build build = jobManager.submit(request.getTargetProject(),
- commitId, job.getName(), paramMap, null);
- PullRequestBuild pullRequestBuild = null;
- for (PullRequestBuild prevPullRequestBuild: prevPullRequestBuilds) {
- if (prevPullRequestBuild.getBuild().equals(build)) {
- pullRequestBuild = prevPullRequestBuild;
- break;
+ Event.push(pullRequestMergePreviewCalculated);
+ try {
+ if (pullRequestTrigger.matches(pullRequestMergePreviewCalculated, job)) {
+ boolean required = requiredJobNames.contains(job.getName());
+ new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {
+
+ @Override
+ public void run(Map<String, List<String>> paramMap) {
+ Build build = jobManager.submit(request.getTargetProject(),
+ commitId, job.getName(), paramMap, null);
+ PullRequestBuild pullRequestBuild = null;
+ for (PullRequestBuild prevPullRequestBuild: prevPullRequestBuilds) {
+ if (prevPullRequestBuild.getBuild().equals(build)) {
+ pullRequestBuild = prevPullRequestBuild;
+ break;
+ }
}
+ if (pullRequestBuild == null) {
+ pullRequestBuild = new PullRequestBuild();
+ pullRequestBuild.setRequest(request);
+ pullRequestBuild.setBuild(build);
+ }
+ pullRequestBuild.setRequired(required);
+ request.getPullRequestBuilds().add(pullRequestBuild);
}
- if (pullRequestBuild == null) {
- pullRequestBuild = new PullRequestBuild();
- pullRequestBuild.setRequest(request);
- pullRequestBuild.setBuild(build);
- }
- pullRequestBuild.setRequired(required);
- request.getPullRequestBuilds().add(pullRequestBuild);
- }
-
- }.run();
- requiredJobNames.remove(job.getName());
+
+ }.run();
+ requiredJobNames.remove(job.getName());
+ }
+ } finally {
+ Event.pop();
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/event/Event.java b/server-core/src/main/java/io/onedev/server/event/Event.java
index a76f640058..bb0002ac7a 100644
--- a/server-core/src/main/java/io/onedev/server/event/Event.java
+++ b/server-core/src/main/java/io/onedev/server/event/Event.java
@@ -1,6 +1,7 @@
package io.onedev.server.event;
import java.util.Date;
+import java.util.Stack;
import javax.annotation.Nullable;
@@ -12,6 +13,15 @@ import io.onedev.server.model.User;
@JsonTypeInfo(property="@class", use = Id.CLASS)
public abstract class Event {
+ private static ThreadLocal<Stack<Event>> stack = new ThreadLocal<Stack<Event>>() {
+
+ @Override
+ protected Stack<Event> initialValue() {
+ return new Stack<Event>();
+ }
+
+ };
+
private final User user;
private final Date date;
@@ -30,4 +40,20 @@ public abstract class Event {
return date;
}
+ public static void push(ProjectEvent event) {
+ stack.get().push(event);
+ }
+
+ public static void pop() {
+ stack.get().pop();
+ }
+
+ @Nullable
+ public static Event get() {
+ if (!stack.get().isEmpty())
+ return stack.get().peek();
+ else
+ return null;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index d8dac4448f..f76f0e4828 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -16,6 +16,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Stack;
import java.util.concurrent.Callable;
import javax.annotation.Nullable;
@@ -90,6 +91,15 @@ public class Build extends AbstractEntity implements Referenceable {
private static final Logger logger = LoggerFactory.getLogger(Build.class);
+ private static ThreadLocal<Stack<Build>> stack = new ThreadLocal<Stack<Build>>() {
+
+ @Override
+ protected Stack<Build> initialValue() {
+ return new Stack<Build>();
+ }
+
+ };
+
public static final String STATUS = "status";
public static final String ARTIFACTS_DIR = "artifacts";
@@ -685,4 +695,20 @@ public class Build extends AbstractEntity implements Referenceable {
return Build.class.getName() + ":" + buildId;
}
+ public static void push(Build build) {
+ stack.get().push(build);
+ }
+
+ public static void pop() {
+ stack.get().pop();
+ }
+
+ @Nullable
+ public static Build get() {
+ if (!stack.get().isEmpty())
+ return stack.get().peek();
+ else
+ return null;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java
index decbcee275..2293a5e903 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java
@@ -112,7 +112,7 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>
@Override
public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
- cellItem.add(new Label(componentId, "#" + rowModel.getObject().getBuildNumber()));
+ cellItem.add(new Label(componentId, rowModel.getObject().getBuildNumber()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java
index 65974600ce..6f90d4ab95 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java
@@ -71,7 +71,7 @@ class ProjectDependencyListViewPanel extends Panel {
@Override
protected Component newLabel(String componentId) {
- return new Label(componentId, "#" + rowModel.getObject().getBuildNumber());
+ return new Label(componentId, rowModel.getObject().getBuildNumber());
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java
index 2a9ee1778e..18dd28bc4d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java
@@ -10,13 +10,15 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
+import io.onedev.server.ci.CISpecAware;
+import io.onedev.server.ci.job.JobAware;
import io.onedev.server.ci.job.JobReport;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
@SuppressWarnings("serial")
-abstract class ReportEditPanel extends Panel {
+abstract class ReportEditPanel extends Panel implements CISpecAware, JobAware {
private final List<JobReport> reports;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java
index af7144568d..040faa0d70 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java
@@ -24,6 +24,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.CISpecAware;
+import io.onedev.server.ci.job.Job;
+import io.onedev.server.ci.job.JobAware;
import io.onedev.server.ci.job.JobReport;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
@@ -69,6 +73,16 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {
target.add(ReportListEditPanel.this);
}
+ @Override
+ public CISpec getCISpec() {
+ return ReportListEditPanel.this.getCISpec();
+ }
+
+ @Override
+ public Job getJob() {
+ return ReportListEditPanel.this.getJob();
+ }
+
};
}
@@ -130,6 +144,16 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {
target.add(ReportListEditPanel.this);
}
+ @Override
+ public CISpec getCISpec() {
+ return ReportListEditPanel.this.getCISpec();
+ }
+
+ @Override
+ public Job getJob() {
+ return ReportListEditPanel.this.getJob();
+ }
+
};
}
@@ -189,6 +213,22 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {
}.sortable("tbody"));
}
+ private CISpec getCISpec() {
+ CISpecAware ciSpecAware = findParent(CISpecAware.class);
+ if (ciSpecAware != null)
+ return ciSpecAware.getCISpec();
+ else
+ return null;
+ }
+
+ private Job getJob() {
+ JobAware jobAware = findParent(JobAware.class);
+ if (jobAware != null)
+ return jobAware.getJob();
+ else
+ return null;
+ }
+
@Override
public void onEvent(IEvent<?> event) {
super.onEvent(event);
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
index 8902e3aaa9..a12b284507 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
@@ -58,7 +58,7 @@ public class JobHtmlReport extends JobReport {
}
@SuppressWarnings("unused")
- private List<InputSuggestion> suggestVariables(String matchWith) {
+ private static List<InputSuggestion> suggestVariables(String matchWith) {
return Job.suggestVariables(matchWith);
}