Skip to content

[DO-NOT-MERGE] sandboxed-containers-operator: fix kbs-client connectivity test in install-trustee-operator #83841

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
wainersm wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[DO-NOT-MERGE] sandboxed-containers-operator: fix kbs-client connectivity test in install-trustee-operator #83841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc3571a
sandboxed-containers-operator: install trustee by default
wainersm Aug 20, 2026
ffa9b91
sandboxed-containers-operator: run signed image test only on CoCo jobs
wainersm Aug 20, 2026
d8d9d0c
[DO NOT MERGE] TEST ONLY
wainersm Aug 20, 2026
f7b4e03
sandboxed-containers-operator: fix kbs-client connectivity test
wainersm Aug 21, 2026
f440932
sandboxed-containers-operator: fix trustee connectivity test on newer…
wainersm Aug 21, 2026
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
16 changes: 6 additions & 10 deletions ...tainers-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ tests:
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
workflow: sandboxed-containers-operator-e2e-azure
timeout: 24h0m0s
- as: azure-ipi-peerpods
Expand Down Expand Up @@ -91,7 +90,6 @@ tests:
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
WORKLOAD_TO_TEST: peer-pods
workflow: sandboxed-containers-operator-e2e-azure
timeout: 24h0m0s
Expand All @@ -118,7 +116,6 @@ tests:
CUSTOM_AZURE_REGION: eastus
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-2.rhaos4.19.el9
MUST_GATHER_IMAGE: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9:latest
Expand All @@ -128,9 +125,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-azure
timeout: 24h0m0s
Expand Down Expand Up @@ -170,7 +168,6 @@ tests:
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
WORKLOAD_TO_TEST: peer-pods
workflow: sandboxed-containers-operator-e2e-aro
timeout: 24h0m0s
Expand All @@ -197,7 +194,6 @@ tests:
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
HYPERSHIFT_AZURE_LOCATION: eastus
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-2.rhaos4.19.el9
LOCATION: eastus
Expand All @@ -207,9 +203,10 @@ tests:
RUNTIMECLASS: kata-remote
SLEEP_DURATION: 0h
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-aro
timeout: 24h0m0s
Expand Down Expand Up @@ -247,7 +244,6 @@ tests:
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
WORKLOAD_TO_TEST: peer-pods
workflow: sandboxed-containers-operator-e2e-aws
timeout: 24h0m0s
Expand Down
12 changes: 6 additions & 6 deletions ...ners-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate417.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ tests:
CUSTOM_AZURE_REGION: eastus
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
INITDATA: ""
INSTALL_KATA_RPM: "false"
KATA_RPM_VERSION: ""
MUST_GATHER_IMAGE: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9:latest
Expand All @@ -129,9 +128,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-azure
timeout: 24h0m0s
Expand Down Expand Up @@ -198,7 +198,6 @@ tests:
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
HYPERSHIFT_AZURE_LOCATION: eastus
INITDATA: ""
INSTALL_KATA_RPM: "false"
KATA_RPM_VERSION: ""
LOCATION: eastus
Expand All @@ -209,9 +208,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-aro
timeout: 24h0m0s
Expand Down
12 changes: 6 additions & 6 deletions ...ners-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate418.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ tests:
CUSTOM_AZURE_REGION: eastus
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
INITDATA: ""
INSTALL_KATA_RPM: "false"
KATA_RPM_VERSION: ""
MUST_GATHER_IMAGE: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9:latest
Expand All @@ -129,9 +128,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-azure
timeout: 24h0m0s
Expand Down Expand Up @@ -198,7 +198,6 @@ tests:
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
HYPERSHIFT_AZURE_LOCATION: eastus
INITDATA: ""
INSTALL_KATA_RPM: "false"
KATA_RPM_VERSION: ""
LOCATION: eastus
Expand All @@ -209,9 +208,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-aro
timeout: 24h0m0s
Expand Down
12 changes: 6 additions & 6 deletions ...ners-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate419.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ tests:
CUSTOM_AZURE_REGION: eastus
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-2.rhaos4.19.el9
MUST_GATHER_IMAGE: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9:latest
Expand All @@ -129,9 +128,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-azure
timeout: 24h0m0s
Expand Down Expand Up @@ -198,7 +198,6 @@ tests:
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
HYPERSHIFT_AZURE_LOCATION: eastus
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-2.rhaos4.19.el9
LOCATION: eastus
Expand All @@ -209,9 +208,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-aro
timeout: 24h0m0s
Expand Down
12 changes: 6 additions & 6 deletions ...ners-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate420.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ tests:
CUSTOM_AZURE_REGION: eastus
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-2.rhaos4.19.el9
MUST_GATHER_IMAGE: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9:latest
Expand All @@ -129,9 +128,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-azure
timeout: 24h0m0s
Expand Down Expand Up @@ -198,7 +198,6 @@ tests:
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
HYPERSHIFT_AZURE_LOCATION: eastus
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-2.rhaos4.19.el9
LOCATION: eastus
Expand All @@ -209,9 +208,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-aro
timeout: 24h0m0s
Expand Down
12 changes: 6 additions & 6 deletions ...ners-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate421.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ tests:
CUSTOM_AZURE_REGION: eastus
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-4.rhaos4.19.el9
MUST_GATHER_IMAGE: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9:latest
Expand All @@ -129,9 +128,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-azure
timeout: 24h0m0s
Expand Down Expand Up @@ -198,7 +198,6 @@ tests:
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
HYPERSHIFT_AZURE_LOCATION: eastus
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-4.rhaos4.19.el9
LOCATION: eastus
Expand All @@ -209,9 +208,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-aro
timeout: 24h0m0s
Expand Down
16 changes: 8 additions & 8 deletions ...ners-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate422.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ tests:
report_template: '{{if eq .Status.State "success"}}SUCCESS{{else}}ERROR{{end}}
{{trimPrefix "periodic-ci-openshift-sandboxed-containers-operator-" .Spec.Job}}
<{{.Status.URL}}|View logs>'
restrict_network_access: false
restrict_network_access: true
steps:
cluster_profile: azure-qe
env:
Expand All @@ -119,19 +119,19 @@ tests:
CUSTOM_AZURE_REGION: eastus
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-2.rhaos4.22.el9
KATA_RPM_VERSION: 3.31.0-5.rhaos4.22.el9
MUST_GATHER_IMAGE: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9:latest
MUST_GATHER_ON_FAILURE_ONLY: "false"
OSC_INSTALL: "true"
RUNTIMECLASS: kata-remote
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-azure
timeout: 24h0m0s
Expand Down Expand Up @@ -198,7 +198,6 @@ tests:
ENABLE_MUST_GATHER: "true"
ENABLEPEERPODS: "true"
HYPERSHIFT_AZURE_LOCATION: eastus
INITDATA: ""
INSTALL_KATA_RPM: "true"
KATA_RPM_VERSION: 3.31.0-2.rhaos4.22.el9
LOCATION: eastus
Expand All @@ -209,9 +208,10 @@ tests:
SLEEP_DURATION: 0h
TEST_FILTERS: ~DisconnectedOnly&;~Disruptive&;~C00133&
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_SCENARIOS: sig-kata.*run and verify cosigned pod
TEST_TIMEOUT: "90"
TRUSTEE_URL: ""
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:latest
TRUSTEE_INSTALL: "true"
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-aro
timeout: 24h0m0s
Expand Down
18 changes: 13 additions & 5 deletions ...ntainers-operator/create-prowjob/sandboxed-containers-operator-create-prowjob-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,6 @@ validate_and_set_defaults() {
exit 1
fi

# Allow override of test scenarios
TEST_SCENARIOS="${TEST_SCENARIOS:-sig-kata.*Kata Author}"

# exclude C00133 from test by default
TEST_FILTERS="${TEST_FILTERS:-~DisconnectedOnly&;~Disruptive&;~C00133&}"
local -a _test_filter_segments
Expand Down Expand Up @@ -238,7 +235,7 @@ show_usage() {
echo " INSTALL_KATA_RPM - Install Kata RPM: true or false (default: true)"
echo " KATA_RPM_VERSION - Kata RPM version (default: 3.17.0-3.rhaos4.19.el9)"
echo " SLEEP_DURATION - Sleep duration after tests (default: 0h)"
echo " TEST_SCENARIOS - Test scenarios filter (default: sig-kata.*Kata Author)"
echo " TEST_SCENARIOS - Test scenarios filter (default: \"sig-kata.*Kata Author\" or \"sig-kata.*run and verify cosigned pod\")"
echo " TEST_FILTERS - openshift-extended-test filters (default: ~DisconnectedOnly&;~Disruptive&)"
echo " Append ;~Cnnnnn& to skip a Polarion-style id appearing in case lines"
echo " TEST_TIMEOUT - Test timeout in minutes (default: 90)"
Expand Down Expand Up @@ -320,6 +317,17 @@ generate_workflow() {
env_vars+=("AWS_REGION_OVERRIDE: ${AWS_REGION_OVERRIDE}")
fi

local test_scenarios
if [[ -n "${TEST_SCENARIOS:-}" ]]; then
test_scenarios="$TEST_SCENARIOS"
else
if [[ "$workload" = "coco" ]]; then
test_scenarios="sig-kata.*run and verify cosigned pod"
else
test_scenarios="sig-kata.*Kata Author"
fi
fi

# Common
env_vars+=(
"CATALOG_SOURCE_IMAGE: ${CATALOG_SOURCE_IMAGE:-\"\"}"
Expand All @@ -333,7 +341,7 @@ generate_workflow() {
"SLEEP_DURATION: ${SLEEP_DURATION}"
"TEST_FILTERS: ${TEST_FILTERS}"
"TEST_RELEASE_TYPE: ${TEST_RELEASE_TYPE}"
"TEST_SCENARIOS: ${TEST_SCENARIOS}"
"TEST_SCENARIOS: ${test_scenarios}"
"TEST_TIMEOUT: \"${TEST_TIMEOUT}\""
"TRUSTEE_URL: ${TRUSTEE_URL:-\"\"}"
)
Expand Down
Loading