diff --git a/group.yml b/group.yml index e5d4d00872..ebf953fffd 100644 --- a/group.yml +++ b/group.yml @@ -522,7 +522,7 @@ csv_namespace: openshift # whether and how to check if all buildroots have consistent versions of golang compilers (rpm build only) # "x.y" (default): only major and minor version; "exact": the z-version must be the same; "no": do not check -check_golang_versions: "x.y" +check_golang_versions: exact # Until feature freeze, prefer to use the golang builder that the upstream CI build is using # if different from what ART has configured, encouraging deliberate transitioning. @@ -535,7 +535,7 @@ canonical_builders_from_upstream: True # If it will ship via errata (state=release), we want to build signed. # For early access without an errata (state=pre-release), that is not required software_lifecycle: - phase: pre-release + phase: release external_scanners: sast_scanning: diff --git a/releases.yml b/releases.yml index 2fcebab13f..b1b677ef3c 100644 --- a/releases.yml +++ b/releases.yml @@ -301,12 +301,6 @@ releases: permits: - code: OUTDATED_RPMS_IN_STREAM_BUILD component: '*' - - code: CONFLICTING_GROUP_RPM_INSTALLED - component: rhcos - - code: CONFLICTING_GROUP_RPM_INSTALLED - component: openshift-clients - - code: CONFLICTING_GROUP_RPM_INSTALLED - component: local-storage-mustgather members: images: - distgit_key: '*'