Skip to content

fix(jenkins): scope multi-branch build collection to current project #8781

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
KyriosGN0 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −3
Open

fix(jenkins): scope multi-branch build collection to current project #8781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions backend/plugins/jenkins/tasks/build_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,17 @@ func collectMultiBranchJobApiBuilds(taskCtx plugin.SubTaskContext) errors.Error
logger := taskCtx.GetLogger()

// Jobs added through the multi-branch workflow have _raw_data_table set to "jenkins_api_jobs".
// This check works, but it's not very robust. It would be better to use a more explicit check like a "source" column.
// Filter by _raw_data_params to scope to only this multi-branch project's branch jobs,
// preventing cross-project data mixing when multiple multi-branch pipelines exist.
jobParams := plugin.MarshalScopeParams(JenkinsApiParams{
ConnectionId: data.Options.ConnectionId,
FullName: data.Options.JobFullName,
})
clauses := []dal.Clause{
dal.Select("j.full_name,j.name,j.path,j.class,j.url"),
dal.From("_tool_jenkins_jobs as j"),
dal.Where(`j.connection_id = ? and j.class = ? and j._raw_data_table = ?`,
data.Options.ConnectionId, WORKFLOW_JOB, fmt.Sprintf("_raw_%s", RAW_JOB_TABLE)),
dal.Where(`j.connection_id = ? and j.class = ? and j._raw_data_table = ? and j._raw_data_params = ?`,
data.Options.ConnectionId, WORKFLOW_JOB, fmt.Sprintf("_raw_%s", RAW_JOB_TABLE), jobParams),
}
cursor, err := db.Cursor(clauses...)
if err != nil {
Expand Down
Loading