Skip to content

Prevent aggregated, informing jobs #788

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

Prevent aggregated, informing jobs #788

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
13 changes: 13 additions & 0 deletions cmd/release-controller/config_validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ func validateReleaseConfigs(configDir string) error {
errors = append(errors, verifyPeriodicFields(releaseConfigs)...)
errors = append(errors, findDuplicatePeriodics(releaseConfigs)...)
errors = append(errors, validateQualifiers(releaseConfigs)...)
errors = append(errors, validateOptionalAggregatedJobs(releaseConfigs)...)
return utilerrors.NewAggregate(errors)
}

Expand Down Expand Up @@ -169,6 +170,18 @@ func validateReleaseQualifiersConfig(configPath string) []error {
return errors
}

func validateOptionalAggregatedJobs(releaseConfigs []releasecontroller.ReleaseConfig) []error {
var errors []error
for _, config := range releaseConfigs {
for name, verify := range config.Verify {
if verify.Optional && verify.AggregatedProwJob != nil {
errors = append(errors, fmt.Errorf("%s: verification job %q cannot be both optional and an aggregatedProwJob", config.Name, name))
}
}
}
return errors
}

func validateQualifier(name releasequalifiers.QualifierId, qualifier releasequalifiers.ReleaseQualifier) error {
err := qualifier.Validate()
if err != nil {
Expand Down
173 changes: 173 additions & 0 deletions cmd/release-controller/config_validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,179 @@ func TestValidateUpgradeJobs(t *testing.T) {
}
}

func TestValidateOptionalAggregatedJobs(t *testing.T) {
testCases := []struct {
name string
configs []releasecontroller.ReleaseConfig
expectedErr bool
}{
{
name: "optional with aggregatedProwJob is invalid",
configs: []releasecontroller.ReleaseConfig{{
Name: "4.19.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"analysis-job": {
Optional: true,
AggregatedProwJob: &releasecontroller.AggregatedProwJobVerification{
AnalysisJobCount: 10,
},
},
},
}},
expectedErr: true,
},
{
name: "non-optional with aggregatedProwJob is valid",
configs: []releasecontroller.ReleaseConfig{{
Name: "4.19.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"analysis-job": {
Optional: false,
AggregatedProwJob: &releasecontroller.AggregatedProwJobVerification{
AnalysisJobCount: 10,
},
},
},
}},
expectedErr: false,
},
{
name: "optional without aggregatedProwJob is valid",
configs: []releasecontroller.ReleaseConfig{{
Name: "4.19.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"my-optional-job": {
Optional: true,
ProwJob: &releasecontroller.ProwJobVerification{Name: "some-job"},
},
},
}},
expectedErr: false,
},
{
name: "non-optional without aggregatedProwJob is valid",
configs: []releasecontroller.ReleaseConfig{{
Name: "4.19.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"my-blocking-job": {
Optional: false,
ProwJob: &releasecontroller.ProwJobVerification{Name: "some-job"},
},
},
}},
expectedErr: false,
},
{
name: "multiple jobs with one invalid combination",
configs: []releasecontroller.ReleaseConfig{{
Name: "4.19.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"good-job": {
Optional: false,
AggregatedProwJob: &releasecontroller.AggregatedProwJobVerification{
AnalysisJobCount: 10,
},
},
"bad-job": {
Optional: true,
AggregatedProwJob: &releasecontroller.AggregatedProwJobVerification{
AnalysisJobCount: 5,
},
},
},
}},
expectedErr: true,
},
{
name: "invalid combination across multiple configs",
configs: []releasecontroller.ReleaseConfig{
{
Name: "4.18.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"good-job": {
Optional: false,
AggregatedProwJob: &releasecontroller.AggregatedProwJobVerification{
AnalysisJobCount: 10,
},
},
},
},
{
Name: "4.19.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"bad-job": {
Optional: true,
AggregatedProwJob: &releasecontroller.AggregatedProwJobVerification{
AnalysisJobCount: 5,
},
},
},
},
},
expectedErr: true,
},
{
name: "optional with aggregatedProwJob containing custom prowJob is invalid",
configs: []releasecontroller.ReleaseConfig{{
Name: "4.19.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"analysis-job": {
Optional: true,
AggregatedProwJob: &releasecontroller.AggregatedProwJobVerification{
ProwJob: &releasecontroller.ProwJobVerification{
Name: "custom-aggregator",
},
AnalysisJobCount: 10,
},
},
},
}},
expectedErr: true,
},
{
name: "all valid jobs across multiple configs",
configs: []releasecontroller.ReleaseConfig{
{
Name: "4.18.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"blocking-aggregated": {
Optional: false,
AggregatedProwJob: &releasecontroller.AggregatedProwJobVerification{
AnalysisJobCount: 10,
},
},
"optional-regular": {
Optional: true,
ProwJob: &releasecontroller.ProwJobVerification{Name: "some-job"},
},
},
},
{
Name: "4.19.0-0.nightly",
Verify: map[string]releasecontroller.ReleaseVerification{
"blocking-regular": {
Optional: false,
ProwJob: &releasecontroller.ProwJobVerification{Name: "another-job"},
},
},
},
},
expectedErr: false,
},
}
for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {
errs := validateOptionalAggregatedJobs(testCase.configs)
if len(errs) > 0 && !testCase.expectedErr {
t.Errorf("got error when error was not expected: %v", errs)
}
if len(errs) == 0 && testCase.expectedErr {
t.Errorf("did not get error when error was expected")
}
})
}
}

func TestValidateQualifiersConfiguration(t *testing.T) {
testCases := []struct {
name string
Expand Down