Skip to content

Commit fc8f0ee

Browse files
committed
Add sig-monitoring badge
Signed-off-by: avlitman <[email protected]>
1 parent 0a332f2 commit fc8f0ee

File tree

6 files changed

+63
-38
lines changed

6 files changed

+63
-38
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Each of these failures contribute to the number of retests that occur in CI and
4747
![sig-network-retests](https://kubevirt.io/ci-health/output/kubevirt/kubevirt/sig-network-retests.svg)
4848
![sig-operator-retests](https://kubevirt.io/ci-health/output/kubevirt/kubevirt/sig-operator-retests.svg)
4949
![sig-ci-retests](https://kubevirt.io/ci-health/output/kubevirt/kubevirt/sig-ci-retests.svg)
50+
![sig-monitoring-retests](https://kubevirt.io/ci-health/output/kubevirt/kubevirt/sig-monitoring-retests.svg)
5051

5152
Top failed lanes:
5253

pkg/constants/main.go

+27-25
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,34 @@ const (
3636
DefaultSIGRetestRedLevel = 15
3737
DefaultBatchStartDate = "2019-05-06"
3838

39-
TimeToMergeBadgeFileName = "time-to-merge.svg"
40-
MergeQueueLengthBadgeFileName = "merge-queue-length.svg"
41-
RetestsToMergeBadgeFileName = "retests-to-merge.svg"
42-
MergedPRsBadgeFileName = "merged-prs.svg"
43-
MergedPRsNoRetestBadgeFileName = "merged-prs-no-retest.svg"
44-
SIGComputeRetestBadgeFileName = "sig-compute-retests.svg"
45-
SIGNetworkRetestBadgeFileName = "sig-network-retests.svg"
46-
SIGStorageRetestBadgeFileName = "sig-storage-retests.svg"
47-
SIGOperatorRetestBadgeFileName = "sig-operator-retests.svg"
48-
SIGCIRetestBadgeFileName = "sig-ci-retests.svg"
49-
JSONResultsFileName = "results.json"
50-
PlotFileName = "plot.png"
51-
MetricsFileName = "metrics"
39+
TimeToMergeBadgeFileName = "time-to-merge.svg"
40+
MergeQueueLengthBadgeFileName = "merge-queue-length.svg"
41+
RetestsToMergeBadgeFileName = "retests-to-merge.svg"
42+
MergedPRsBadgeFileName = "merged-prs.svg"
43+
MergedPRsNoRetestBadgeFileName = "merged-prs-no-retest.svg"
44+
SIGComputeRetestBadgeFileName = "sig-compute-retests.svg"
45+
SIGNetworkRetestBadgeFileName = "sig-network-retests.svg"
46+
SIGStorageRetestBadgeFileName = "sig-storage-retests.svg"
47+
SIGOperatorRetestBadgeFileName = "sig-operator-retests.svg"
48+
SIGCIRetestBadgeFileName = "sig-ci-retests.svg"
49+
SIGMonitoringRetestBadgeFileName = "sig-monitoring-retests.svg"
50+
JSONResultsFileName = "results.json"
51+
PlotFileName = "plot.png"
52+
MetricsFileName = "metrics"
5253

53-
TimeToMergeBadgeName = "hours to merge"
54-
MergeQueueLengthBadgeName = "avg merge queue length"
55-
RetestsToMergeBadgeName = "retests to merge"
56-
MergedPRsBadgeName = "merged PRs"
57-
MergedPRsNoRetestBadgeName = "Merged PRs with 0 retest vs. Merged PRs"
58-
SIGComputeRetestBadgeName = "SIG Compute"
59-
SIGNetworkRetestBadgeName = "SIG Network"
60-
SIGOperatorRetestBadgeName = "SIG Operator"
61-
SIGStorageRetestBadgeName = "SIG Storage"
62-
SIGCIRetestBadgeName = "SIG CI"
63-
BadgeDataFormat = "%.2f ± std %.2f"
64-
NoRetestBadgeDataFormat = "%.0f / %.0f | %.0f%s"
54+
TimeToMergeBadgeName = "hours to merge"
55+
MergeQueueLengthBadgeName = "avg merge queue length"
56+
RetestsToMergeBadgeName = "retests to merge"
57+
MergedPRsBadgeName = "merged PRs"
58+
MergedPRsNoRetestBadgeName = "Merged PRs with 0 retest vs. Merged PRs"
59+
SIGComputeRetestBadgeName = "SIG Compute"
60+
SIGNetworkRetestBadgeName = "SIG Network"
61+
SIGOperatorRetestBadgeName = "SIG Operator"
62+
SIGStorageRetestBadgeName = "SIG Storage"
63+
SIGCIRetestBadgeName = "SIG CI"
64+
SIGMonitoringRetestBadgeName = "SIG Monitoring"
65+
BadgeDataFormat = "%.2f ± std %.2f"
66+
NoRetestBadgeDataFormat = "%.0f / %.0f | %.0f%s"
6567

6668
AvgMergeQueueLengthMetricName = "cihealth_avg_merge_queue_lenght_total"
6769
AvgTimeToMergeMetricName = "cihealth_avg_time_to_merge_days"

pkg/output/output.go

+10
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,13 @@ func (b *Handler) writeBadges(results *types.Results) error {
166166
b.options.SIGRetestsLevels,
167167
)
168168

169+
err = b.writeSIGRetestBadge(
170+
constants.SIGMonitoringRetestBadgeName,
171+
filepath.Join(basePath, constants.SIGMonitoringRetestBadgeFileName),
172+
results.Data[constants.SIGRetests],
173+
b.options.SIGRetestsLevels,
174+
)
175+
169176
err = b.writeJobFailureBadges(
170177
results.Data[constants.SIGRetests],
171178
b.options.SIGRetestsLevels,
@@ -219,6 +226,9 @@ func (b *Handler) writeSIGRetestBadge(name, filePath string, data types.RunningA
219226
case constants.SIGCIRetestBadgeName:
220227
value = data.SIGCIRetest
221228
total = data.SIGCITotal
229+
case constants.SIGMonitoringRetestBadgeName:
230+
value = data.SIGMonitoringRetest
231+
total = data.SIGMonitoringTotal
222232
}
223233

224234
color := BadgeColor(((value / total) * 100), levels)

pkg/sigretests/main.go

+20-12
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,20 @@ type job struct {
2222
}
2323

2424
type SigRetests struct {
25-
SigCIFailure int
26-
SigComputeFailure int
27-
SigNetworkFailure int
28-
SigStorageFailure int
29-
SigOperatorFailure int
30-
SigComputeSuccess int
31-
SigNetworkSuccess int
32-
SigStorageSuccess int
33-
SigOperatorSuccess int
34-
FailedJobNames []string
35-
FailedJobURLs []string
36-
SuccessJobNames []string
25+
SigCIFailure int
26+
SigComputeFailure int
27+
SigNetworkFailure int
28+
SigStorageFailure int
29+
SigOperatorFailure int
30+
SigMonitoringFailure int
31+
SigComputeSuccess int
32+
SigNetworkSuccess int
33+
SigStorageSuccess int
34+
SigOperatorSuccess int
35+
SigMonitoringSuccess int
36+
FailedJobNames []string
37+
FailedJobURLs []string
38+
SuccessJobNames []string
3739
}
3840

3941
var prowjobs []job
@@ -217,6 +219,12 @@ func FilterJobsPerSigs(jobs []job) (prSigRetests SigRetests) {
217219
} else {
218220
prSigRetests.SigOperatorSuccess += 1
219221
}
222+
case strings.Contains(job.jobName, "sig-monitoring"):
223+
if job.failure {
224+
prSigRetests.SigMonitoringFailure += 1
225+
} else {
226+
prSigRetests.SigMonitoringSuccess += 1
227+
}
220228
}
221229
prSigRetests = sortJobNamesOnResult(job, prSigRetests)
222230
}

pkg/stats/stats.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,12 @@ func (h *Handler) sigRetestsProcessor(results *types.Results) (*types.Results, e
282282
dataItem.SIGStorageRetest = dataItem.SIGStorageRetest + float64(jobsPerSIG.SigStorageFailure)
283283
dataItem.SIGOperatorRetest = dataItem.SIGOperatorRetest + float64(jobsPerSIG.SigOperatorFailure)
284284
dataItem.SIGCIRetest = dataItem.SIGCIRetest + float64(jobsPerSIG.SigCIFailure)
285+
dataItem.SIGMonitoringRetest = dataItem.SIGMonitoringRetest + float64(jobsPerSIG.SigMonitoringFailure)
285286
dataItem.SIGComputeTotal = dataItem.SIGComputeTotal + float64(jobsPerSIG.SigComputeFailure) + float64(jobsPerSIG.SigComputeSuccess)
286287
dataItem.SIGNetworkTotal = dataItem.SIGNetworkTotal + float64(jobsPerSIG.SigNetworkFailure) + float64(jobsPerSIG.SigNetworkSuccess)
287288
dataItem.SIGStorageTotal = dataItem.SIGStorageTotal + float64(jobsPerSIG.SigStorageFailure) + float64(jobsPerSIG.SigStorageSuccess)
288289
dataItem.SIGOperatorTotal = dataItem.SIGOperatorTotal + float64(jobsPerSIG.SigOperatorFailure) + float64(jobsPerSIG.SigOperatorSuccess)
290+
dataItem.SIGMonitoringTotal = dataItem.SIGMonitoringTotal + float64(jobsPerSIG.SigMonitoringFailure) + float64(jobsPerSIG.SigMonitoringSuccess)
289291
dataItem.DataPoints = append(dataItem.DataPoints,
290292
types.DataPoint{
291293
Value: float64(len(jobsPerSIG.FailedJobNames)),
@@ -295,7 +297,7 @@ func (h *Handler) sigRetestsProcessor(results *types.Results) (*types.Results, e
295297
successJobNames = slices.Concat(successJobNames, jobsPerSIG.SuccessJobNames)
296298
failedJobURLs = slices.Concat(failedJobURLs, jobsPerSIG.FailedJobURLs)
297299
}
298-
dataItem.SIGCITotal = dataItem.SIGComputeTotal + dataItem.SIGStorageTotal + dataItem.SIGNetworkTotal + dataItem.SIGOperatorTotal + dataItem.SIGCIRetest
300+
dataItem.SIGCITotal = dataItem.SIGComputeTotal + dataItem.SIGStorageTotal + dataItem.SIGNetworkTotal + dataItem.SIGOperatorTotal + dataItem.SIGCIRetest + dataItem.SIGMonitoringTotal
299301
sortedFailedJobs := types.SortByMostFailed(countFailedJobs(failedJobNames))
300302
for i, job := range sortedFailedJobs {
301303
for _, success := range successJobNames {

pkg/types/main.go

+2
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,13 @@ type RunningAverageDataItem struct {
247247
SIGNetworkRetest float64
248248
SIGOperatorRetest float64
249249
SIGCIRetest float64
250+
SIGMonitoringRetest float64
250251
SIGComputeTotal float64
251252
SIGStorageTotal float64
252253
SIGNetworkTotal float64
253254
SIGOperatorTotal float64
254255
SIGCITotal float64
256+
SIGMonitoringTotal float64
255257
FailedJobLeaderBoard FailedJobs
256258
DataPoints []DataPoint
257259
}

0 commit comments

Comments
 (0)