Skip to content

Commit 6ddb8f6

Browse files
authored
Merge pull request #1700 from simonbaird/ec1708-remove-rpm-checks
Remove cve & test checks from redhat_rpms
2 parents 61ec982 + c4e8ea6 commit 6ddb8f6

File tree

5 files changed

+12
-36
lines changed

5 files changed

+12
-36
lines changed

antora/docs/modules/ROOT/pages/packages/release_cve.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The SLSA Provenance attestation for the image is inspected to ensure CVEs that h
4141
* Rule type: [rule-type-indicator failure]#FAILURE#
4242
* FAILURE message: `Found %q vulnerability of %s security level`
4343
* Code: `cve.cve_blockers`
44-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L114[Source, window="_blank"]
44+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L113[Source, window="_blank"]
4545

4646
[#cve__unpatched_cve_blockers]
4747
=== link:#cve__unpatched_cve_blockers[Blocking unpatched CVE check]
@@ -53,7 +53,7 @@ The SLSA Provenance attestation for the image is inspected to ensure CVEs that d
5353
* Rule type: [rule-type-indicator failure]#FAILURE#
5454
* FAILURE message: `Found %q unpatched vulnerability of %s security level`
5555
* Code: `cve.unpatched_cve_blockers`
56-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L148[Source, window="_blank"]
56+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L147[Source, window="_blank"]
5757

5858
[#cve__cve_results_found]
5959
=== link:#cve__cve_results_found[CVE scan results found]
@@ -65,7 +65,7 @@ Confirm that clair-scan task results are present in the SLSA Provenance attestat
6565
* Rule type: [rule-type-indicator failure]#FAILURE#
6666
* FAILURE message: `Clair CVE scan results were not found`
6767
* Code: `cve.cve_results_found`
68-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L185[Source, window="_blank"]
68+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L183[Source, window="_blank"]
6969

7070
[#cve__cve_warnings]
7171
=== link:#cve__cve_warnings[Non-blocking CVE check]
@@ -89,7 +89,7 @@ The SLSA Provenance attestation for the image is inspected to ensure CVEs that d
8989
* Rule type: [rule-type-indicator warning]#WARNING#
9090
* WARNING message: `Found %q non-blocking unpatched vulnerability of %s security level`
9191
* Code: `cve.unpatched_cve_warnings`
92-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L86[Source, window="_blank"]
92+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L85[Source, window="_blank"]
9393

9494
[#cve__rule_data_provided]
9595
=== link:#cve__rule_data_provided[Rule data provided]
@@ -101,4 +101,4 @@ Confirm the expected rule data keys have been provided in the expected format. T
101101
* Rule type: [rule-type-indicator failure]#FAILURE#
102102
* FAILURE message: `%s`
103103
* Code: `cve.rule_data_provided`
104-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L212[Source, window="_blank"]
104+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/cve/cve.rego#L209[Source, window="_blank"]

antora/docs/modules/ROOT/pages/packages/release_test.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Ensure that task producing the IMAGES_PROCESSED result contains the digests of t
1919
* FAILURE message: `Test '%s' did not process image with digest '%s'.`
2020
* Code: `test.test_all_images`
2121
* Effective from: `2024-05-29T00:00:00Z`
22-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L240[Source, window="_blank"]
22+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L233[Source, window="_blank"]
2323

2424
[#test__no_failed_informative_tests]
2525
=== link:#test__no_failed_informative_tests[No informative tests failed]
@@ -43,7 +43,7 @@ Produce a violation if any tests have their result set to "ERROR". The result ty
4343
* Rule type: [rule-type-indicator failure]#FAILURE#
4444
* FAILURE message: `The Task %q from the build Pipeline reports a test erred`
4545
* Code: `test.no_erred_tests`
46-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L170[Source, window="_blank"]
46+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L166[Source, window="_blank"]
4747

4848
[#test__no_failed_tests]
4949
=== link:#test__no_failed_tests[No tests failed]
@@ -55,7 +55,7 @@ Produce a violation if any non-informative tests have their result set to "FAILE
5555
* Rule type: [rule-type-indicator failure]#FAILURE#
5656
* FAILURE message: `The Task %q from the build Pipeline reports a failed test`
5757
* Code: `test.no_failed_tests`
58-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L145[Source, window="_blank"]
58+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L142[Source, window="_blank"]
5959

6060
[#test__no_test_warnings]
6161
=== link:#test__no_test_warnings[No tests produced warnings]
@@ -80,7 +80,7 @@ Produce a violation if any tests have their result set to "SKIPPED". A skipped r
8080
* FAILURE message: `The Task %q from the build Pipeline reports a test was skipped`
8181
* Code: `test.no_skipped_tests`
8282
* Effective from: `2023-12-08T00:00:00Z`
83-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L193[Source, window="_blank"]
83+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L188[Source, window="_blank"]
8484

8585
[#test__test_results_known]
8686
=== link:#test__test_results_known[No unsupported test result values found]
@@ -92,7 +92,7 @@ Ensure all test data result values are in the set of known/supported result valu
9292
* Rule type: [rule-type-indicator failure]#FAILURE#
9393
* FAILURE message: `The Task %q from the build Pipeline has an unsupported test result %q`
9494
* Code: `test.test_results_known`
95-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L112[Source, window="_blank"]
95+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L110[Source, window="_blank"]
9696

9797
[#test__rule_data_provided]
9898
=== link:#test__rule_data_provided[Rule data provided]
@@ -104,7 +104,7 @@ Confirm the expected rule data keys have been provided in the expected format. T
104104
* Rule type: [rule-type-indicator failure]#FAILURE#
105105
* FAILURE message: `%s`
106106
* Code: `test.rule_data_provided`
107-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L220[Source, window="_blank"]
107+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L214[Source, window="_blank"]
108108

109109
[#test__test_data_found]
110110
=== link:#test__test_data_found[Test data found in task results]
@@ -128,4 +128,4 @@ Each test result is expected to have a `results` key. Verify that the `results`
128128
* Rule type: [rule-type-indicator failure]#FAILURE#
129129
* FAILURE message: `Found tests without results`
130130
* Code: `test.test_results_found`
131-
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L89[Source, window="_blank"]
131+
* https://github.com/conforma/policy/blob/{page-origin-refhash}/policy/release/test/test.rego#L88[Source, window="_blank"]

antora/docs/modules/ROOT/pages/release_policy.adoc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,6 @@ Rules included:
242242
* xref:packages/release_attestation_type.adoc#attestation_type__known_attestation_type[Attestation type: Known attestation type found]
243243
* xref:packages/release_attestation_type.adoc#attestation_type__known_attestation_types_provided[Attestation type: Known attestation types provided]
244244
* xref:packages/release_attestation_type.adoc#attestation_type__pipelinerun_attestation_found[Attestation type: PipelineRun attestation found]
245-
* xref:packages/release_cve.adoc#cve__unpatched_cve_blockers[CVE checks: Blocking unpatched CVE check]
246-
* xref:packages/release_cve.adoc#cve__cve_results_found[CVE checks: CVE scan results found]
247-
* xref:packages/release_cve.adoc#cve__cve_warnings[CVE checks: Non-blocking CVE check]
248-
* xref:packages/release_cve.adoc#cve__rule_data_provided[CVE checks: Rule data provided]
249245
* xref:packages/release_git_branch.adoc#git_branch__git_branch[Git branch checks: Builds have a trusted target branch]
250246
* xref:packages/release_provenance_materials.adoc#provenance_materials__git_clone_source_matches_provenance[Provenance Materials: Git clone source matches materials provenance]
251247
* xref:packages/release_provenance_materials.adoc#provenance_materials__git_clone_task_found[Provenance Materials: Git clone task found]
@@ -292,14 +288,6 @@ Rules included:
292288
* xref:packages/release_tasks.adoc#tasks__required_tasks_list_provided[Tasks: Required tasks list was provided]
293289
* xref:packages/release_tasks.adoc#tasks__successful_pipeline_tasks[Tasks: Successful pipeline tasks]
294290
* xref:packages/release_tasks.adoc#tasks__unsupported[Tasks: Task version unsupported]
295-
* xref:packages/release_test.adoc#test__test_all_images[Test: Image digest is present in IMAGES_PROCESSED result]
296-
* xref:packages/release_test.adoc#test__no_erred_tests[Test: No tests erred]
297-
* xref:packages/release_test.adoc#test__no_failed_tests[Test: No tests failed]
298-
* xref:packages/release_test.adoc#test__no_skipped_tests[Test: No tests were skipped]
299-
* xref:packages/release_test.adoc#test__test_results_known[Test: No unsupported test result values found]
300-
* xref:packages/release_test.adoc#test__rule_data_provided[Test: Rule data provided]
301-
* xref:packages/release_test.adoc#test__test_data_found[Test: Test data found in task results]
302-
* xref:packages/release_test.adoc#test__test_results_found[Test: Test data includes results key]
303291
* xref:packages/release_trusted_task.adoc#trusted_task__data_format[Trusted Task checks: Data format]
304292
* xref:packages/release_trusted_task.adoc#trusted_task__pinned[Trusted Task checks: Task references are pinned]
305293
* xref:packages/release_trusted_task.adoc#trusted_task__tagged[Trusted Task checks: Task references are tagged]

policy/release/cve/cve.rego

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ import data.lib.json as j
7171
# collections:
7272
# - minimal
7373
# - redhat
74-
# - redhat_rpms
7574
# depends_on:
7675
# - cve.cve_results_found
7776
#
@@ -165,7 +164,6 @@ deny contains result if {
165164
# collections:
166165
# - minimal
167166
# - redhat
168-
# - redhat_rpms
169167
# depends_on:
170168
# - cve.cve_results_found
171169
#
@@ -196,7 +194,6 @@ deny contains result if {
196194
# collections:
197195
# - minimal
198196
# - redhat
199-
# - redhat_rpms
200197
# depends_on:
201198
# - attestation_type.known_attestation_type
202199
#
@@ -222,7 +219,6 @@ deny contains result if {
222219
# collections:
223220
# - minimal
224221
# - redhat
225-
# - redhat_rpms
226222
# - policy_data
227223
#
228224
deny contains result if {

policy/release/test/test.rego

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ warn contains result if {
7474
# Confirm at least one task in the build pipeline contains a result named TEST_OUTPUT.
7575
# collections:
7676
# - redhat
77-
# - redhat_rpms
7877
# depends_on:
7978
# - attestation_type.known_attestation_type
8079
#
@@ -99,7 +98,6 @@ deny contains result if {
9998
# named 'result'. For a TEST_OUTPUT result to be valid, this key must exist.
10099
# collections:
101100
# - redhat
102-
# - redhat_rpms
103101
# depends_on:
104102
# - test.test_data_found
105103
#
@@ -121,7 +119,6 @@ deny contains result if {
121119
# xref:cli:ROOT:configuration.adoc#_data_sources[data source].
122120
# collections:
123121
# - redhat
124-
# - redhat_rpms
125122
# depends_on:
126123
# - test.test_data_found
127124
#
@@ -157,7 +154,6 @@ deny contains result if {
157154
# should be available in the logs for the build Pipeline.
158155
# collections:
159156
# - redhat
160-
# - redhat_rpms
161157
# depends_on:
162158
# - test.test_data_found
163159
#
@@ -181,7 +177,6 @@ deny contains result if {
181177
# should be available in the logs for the build Pipeline.
182178
# collections:
183179
# - redhat
184-
# - redhat_rpms
185180
# depends_on:
186181
# - test.test_data_found
187182
#
@@ -207,7 +202,6 @@ deny contains result if {
207202
# information about the test should be available in the logs for the build Pipeline.
208203
# collections:
209204
# - redhat
210-
# - redhat_rpms
211205
# depends_on:
212206
# - test.test_data_found
213207
# effective_on: 2023-12-08T00:00:00Z
@@ -229,7 +223,6 @@ deny contains result if {
229223
# solution: If provided, ensure the rule data is in the expected format.
230224
# collections:
231225
# - redhat
232-
# - redhat_rpms
233226
# - policy_data
234227
#
235228
deny contains result if {
@@ -251,7 +244,6 @@ deny contains result if {
251244
# `IMAGES_PROCESSED` result.
252245
# collections:
253246
# - redhat
254-
# - redhat_rpms
255247
# effective_on: 2024-05-29T00:00:00Z
256248
#
257249
deny contains result if {

0 commit comments

Comments
 (0)