Skip to content

cherry-pick #6462 fix: jenkins stages durationMillis<0 #6464

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

Merged
abeizn merged 1 commit into from
Nov 15, 2023
Merged

cherry-pick #6462 fix: jenkins stages durationMillis<0 #6464

Show file tree
Hide file tree
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
4 changes: 0 additions & 4 deletions backend/plugins/jenkins/e2e/stages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ func TestJenkinsStagesDataFlow(t *testing.T) {
dataflowTester.FlushTabler(&models.JenkinsBuild{})
dataflowTester.ImportCsvIntoTabler("./raw_tables/_tool_jenkins_builds_for_stages.csv", models.JenkinsBuild{})

// import tool table
dataflowTester.ImportCsvIntoTabler("./snapshot_tables/_tool_jenkins_build_commits.csv", models.JenkinsBuildCommit{})
dataflowTester.ImportCsvIntoTabler("./snapshot_tables/cicd_tasks.csv", devops.CICDTask{})

// verify extraction
dataflowTester.FlushTabler(&models.JenkinsStage{})
dataflowTester.Subtask(tasks.ExtractApiStagesMeta, taskData)
Expand Down
11 changes: 9 additions & 2 deletions backend/plugins/jenkins/tasks/stage_convertor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,14 @@ func ConvertStages(taskCtx plugin.SubTaskContext) (err errors.Error) {
if body.Name == "" {
return nil, err
}
durationSec := int64(body.DurationMillis / 1000)
var durationMillis int
if body.DurationMillis > 0 {
durationMillis = body.DurationMillis
} else {
durationMillis = 0
}

durationSec := int64(durationMillis / 1000)
jenkinsTaskResult := devops.GetResult(&devops.ResultRule{
Success: []string{SUCCESS},
Failure: []string{FAILED, FAILURE, ABORTED},
Expand All @@ -125,7 +132,7 @@ func ConvertStages(taskCtx plugin.SubTaskContext) (err errors.Error) {
PipelineId: buildIdGen.Generate(body.ConnectionId, body.BuildName),
Result: jenkinsTaskResult,
Status: jenkinsTaskStatus,
DurationSec: uint64(body.DurationMillis / 1000),
DurationSec: uint64(durationMillis / 1000),
StartedDate: startedDate,
FinishedDate: jenkinsTaskFinishedDate,
CicdScopeId: jobIdGen.Generate(body.ConnectionId, data.Options.JobFullName),
Expand Down