-
Notifications
You must be signed in to change notification settings - Fork 227
OCPBUGS-81632: Remove cert manager sigstore exception in tests #6458
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.
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
openshift-merge-bot
merged 6 commits into
openshift:main
from
ggiguash:cert-manager-sigstore
Apr 8, 2026
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f9295cd
update last_rebase_cert_manager.sh
ggiguash fc45a04
Update cert-manager to 4.21 version
ggiguash a16df74
Remove cert-manager images from insecureAcceptAnything exception
ggiguash 6e5db92
Add optional sigstore scenarios (disabled until release)
ggiguash 0191fc3
Update /etc/containers/registries.d/registry.redhat.io.yaml
ggiguash afbb6d9
Use exit_if_image_not_found in the scenario
ggiguash File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletions
14
assets/optional/cert-manager/release-cert-manager-aarch64.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| { | ||
| "release": { | ||
| "base": "1.18.0" | ||
| "base": "1.18.1" | ||
| }, | ||
| "images": { | ||
| "cert-manager-operator": "registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:9f37a838089d2e3c199a4fd97bea028cb6b66b4214e8233884716efe0a998298", | ||
| "cert-manager-istiocsr": "registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:78564158857ed7f1534597f3ee7faaee23b692f9ed5aa0259e19196f5400167d", | ||
| "cert-manager-acmesolver": "registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:b001612ad6362a1b7273e178d9870ab3d020a40ee3339a0f95fef1cd3913356e", | ||
| "cert-manager-webhook": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:8227c8925d00d1c81c95e7017209fdc6b5b1925cde2fa4fe3752fb6c81510a2d", | ||
| "cert-manager-ca-injector": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:8227c8925d00d1c81c95e7017209fdc6b5b1925cde2fa4fe3752fb6c81510a2d", | ||
| "cert-manager-controller": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:8227c8925d00d1c81c95e7017209fdc6b5b1925cde2fa4fe3752fb6c81510a2d" | ||
| "cert-manager-operator": "registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:22f4e686a81fc809e70e3f73206ec221f8081e842243f173308dc1fbc7f02a3e", | ||
| "cert-manager-istiocsr": "registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:95f5dfa4331fcfb96357ed28f4d7f0fd00d9419d9252e3cff3962aec6cedbeb9", | ||
| "cert-manager-acmesolver": "registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:3258027c0fb9426c9ee3567f6dc0d02b85cb661c23300b230f5b1400b43bac25", | ||
| "cert-manager-webhook": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:f1b903ff69100fa938d6bdf4d730d35158eec905351344a246e30ef14c847222", | ||
| "cert-manager-ca-injector": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:f1b903ff69100fa938d6bdf4d730d35158eec905351344a246e30ef14c847222", | ||
| "cert-manager-controller": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:f1b903ff69100fa938d6bdf4d730d35158eec905351344a246e30ef14c847222" | ||
| } | ||
| } |
14 changes: 7 additions & 7 deletions
14
assets/optional/cert-manager/release-cert-manager-x86_64.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| { | ||
| "release": { | ||
| "base": "1.18.0" | ||
| "base": "1.18.1" | ||
| }, | ||
| "images": { | ||
| "cert-manager-operator": "registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:8eecb53c8c81c0fa8f198260acb273759c0d12b5c01642a128923c5716df19d2", | ||
| "cert-manager-istiocsr": "registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:0f20d178f980a3fa4527bc1613b8639385e36c367e30c93b4cbb4c4a434d3405", | ||
| "cert-manager-acmesolver": "registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:3a40eb434e032fb2135f369b6fc65266ae0f409db92fd65d12cf13c7f32b5020", | ||
| "cert-manager-webhook": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:40b47054e42363a365b491ccfe0d86f109e19fc317058ba834ffe0f5c733880b", | ||
| "cert-manager-ca-injector": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:40b47054e42363a365b491ccfe0d86f109e19fc317058ba834ffe0f5c733880b", | ||
| "cert-manager-controller": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:40b47054e42363a365b491ccfe0d86f109e19fc317058ba834ffe0f5c733880b" | ||
| "cert-manager-operator": "registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:57a1aea49d7cc275b37b8f52d602a3a9d1601ec6a21a3268dd4903566cb2e335", | ||
| "cert-manager-istiocsr": "registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:41df7aabbce42599bad7fdc721cd12aa6e12d17e1c0658fb3294a1f68483d656", | ||
| "cert-manager-acmesolver": "registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:155383c4664ea3ed18d0f079be720ad68a5de044448a744d7579af7ff0fc7e0a", | ||
| "cert-manager-webhook": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:09c857f0c20721d6b447f5f567182befc1ca6157128225849117a5c830feab23", | ||
| "cert-manager-ca-injector": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:09c857f0c20721d6b447f5f567182befc1ca6157128225849117a5c830feab23", | ||
| "cert-manager-controller": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:09c857f0c20721d6b447f5f567182befc1ca6157128225849117a5c830feab23" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| #!/bin/bash -x | ||
| ./scripts/auto-rebase/rebase_cert_manager.sh to "registry.redhat.io/redhat/redhat-operator-index:v4.20" | ||
| ./scripts/auto-rebase/rebase_cert_manager.sh to "registry.redhat.io/redhat/redhat-operator-index:v4.21" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
test/scenarios-bootc/el10/releases/el102-lrel@optional-sigstore.sh.disabled
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from scenario.sh and uses functions defined there. | ||
|
|
||
| # Enable container signature verification for current release images, | ||
| # including the optional components. | ||
| # These are ec / rc / z-stream, thus must all to be signed. | ||
| # shellcheck disable=SC2034 # used elsewhere | ||
| IMAGE_SIGSTORE_ENABLED=true | ||
|
|
||
| start_image="rhel102-bootc-brew-lrel-optional" | ||
|
|
||
| scenario_create_vms() { | ||
| if ! does_image_exist "${start_image}"; then | ||
| echo "Image '${start_image}' not found - skipping test" | ||
| return 0 | ||
| fi | ||
| prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" | ||
| launch_vm --boot_blueprint rhel102-bootc | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| if ! does_image_exist "${start_image}"; then | ||
| echo "Image '${start_image}' not found - skipping test" | ||
| return 0 | ||
| fi | ||
| remove_vm host1 | ||
| } | ||
|
ggiguash marked this conversation as resolved.
|
||
|
|
||
| scenario_run_tests() { | ||
| if ! does_image_exist "${start_image}"; then | ||
| echo "Image '${start_image}' not found - skipping test" | ||
| return 0 | ||
| fi | ||
| # Run a minimal test for this scenario as its main functionality is | ||
| # to verify container image signature check is enabled | ||
| run_tests host1 \ | ||
| --variable "EXPECTED_OS_VERSION:10.2" \ | ||
| --variable "IMAGE_SIGSTORE_ENABLED:True" \ | ||
| suites/standard1/containers-policy.robot | ||
| } | ||
41 changes: 41 additions & 0 deletions
41
test/scenarios-bootc/el9/releases/el98-lrel@optional-sigstore.sh.disabled
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from scenario.sh and uses functions defined there. | ||
|
|
||
| # Enable container signature verification for current release images, | ||
| # including the optional components. | ||
| # These are ec / rc / z-stream, thus must all to be signed. | ||
| # shellcheck disable=SC2034 # used elsewhere | ||
| IMAGE_SIGSTORE_ENABLED=true | ||
|
|
||
| start_image="rhel98-bootc-brew-lrel-optional" | ||
|
|
||
| scenario_create_vms() { | ||
| if ! does_image_exist "${start_image}"; then | ||
| echo "Image '${start_image}' not found - skipping test" | ||
| return 0 | ||
| fi | ||
| prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" | ||
| launch_vm --boot_blueprint rhel98-bootc | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| if ! does_image_exist "${start_image}"; then | ||
| echo "Image '${start_image}' not found - skipping test" | ||
| return 0 | ||
| fi | ||
| remove_vm host1 | ||
| } | ||
|
ggiguash marked this conversation as resolved.
|
||
|
|
||
| scenario_run_tests() { | ||
| if ! does_image_exist "${start_image}"; then | ||
| echo "Image '${start_image}' not found - skipping test" | ||
| return 0 | ||
| fi | ||
| # Run a minimal test for this scenario as its main functionality is | ||
| # to verify container image signature check is enabled | ||
| run_tests host1 \ | ||
| --variable "EXPECTED_OS_VERSION:9.8" \ | ||
| --variable "IMAGE_SIGSTORE_ENABLED:True" \ | ||
| suites/standard1/containers-policy.robot | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.