Repository navigation
Description
User Story
As a maintainer retiring e2e/rust, I want the tests that need a specially configured gateway, but no gateway restart, on testkit, so each one runs on an environment built for it instead of a wrapper script that rewrites gateway config.
Description
This is the first part of PR6 in the #5297 plan. The gateway-restart and additional-CA tests stay for a later PR, because they wait on decisions A and Q-CA. The corporate-proxy tests are a separate PR. Each environment below sets up the gateway and publishes how to reach it; the test never edits gateway config itself.
| Legacy test | Action | Destination | Notes |
|---|---|---|---|
otlp_relay::agent_span_reaches_collector_with_attribution |
port | tests/suites/features/otlp-relay |
Runs on a row whose gateway has a collector configured. |
otlp_relay::span_emitted_before_exit_is_delivered |
port | tests/suites/features/otlp-relay |
|
otlp_relay::relay_is_inert_without_collector |
port | tests/suites/conformance/src/otlp.rs |
Default-config behavior. |
config_push::streamed_policy_update_reaches_the_supervisor |
port | tests/suites/features/config-push |
Keeps only its push-session check; the push-mode row from #5622 also runs conformance. |
policy_activation::invalid_image_provider_bundle_waits_for_repair_before_launch |
port | tests/suites/features/policy-activation |
Build from testkit::python_image() so it needs no Internet or apt. |
provider_refresh_handles::long_running_process_survives_rotations_and_reconfigure_revokes |
port | tests/suites/features/provider-refresh |
Separate from the Keycloak provider-refresh suite. |
provider_token_exchange:: independent grants across sandboxes; A/B/A route recovery (2 tests) |
port | tests/suites/features/provider-token-exchange |
One package for both. |
provider_readiness::acknowledged_provider_changes_apply_to_fresh_clients_and_revoke_retained_references |
port | tests/suites/features/provider-readiness |
Keeps its wrong host/port/path denials. See the note below. |
stable_external_placeholders:: persistent rotation and revocation; ordinary revoked assertion (2 tests) |
port | tests/suites/features/provider-readiness |
Shares the fixture with provider_readiness; tests stay separate. |
provider_readiness and stable_external_placeholders: today they restart the gateway to swap in a supervisor image that trusts a test CA. Try the additional-CA environment ([openshell.supervisor.network] additional_ca_bundle) instead. Make the wrong-host controls with a second host name or IP in the test VM. If the additional CA can't replace the swap, move these tests to the restart PR and update this issue.
Helpers and environment this PR adds
- Environments: OTLP collector (
OPENSHELL_TEST_OTLP_ENDPOINT), SPIFFE (OPENSHELL_TEST_SPIFFE_{GATEWAY_SOCKET,PROVIDER_LISTEN,PROVIDER_SOCKET},OPENSHELL_TEST_TOKEN_PORT; the gateway also readsOPENSHELL_GATEWAY_SPIFFE_WORKLOAD_API_SOCKETfrom its process environment), additional CA (OPENSHELL_TEST_ADDITIONAL_CA_{CERT,KEY}). All use the sharedgateway_overridesrole. tests/support/otlp: reads the endpoint and starts the collector, based onopenshell-otel-test-support.- A provider-refresh helper in testkit (configure, rotate, status). Move the private copy in
features/keycloak-provider-refreshto it. - Suite-local fixtures: a rotating OAuth issuer (on
HttpRecorder::serve), a SPIFFE workload API stub. The stub signs tokens throughopenshell-crypto's JWT support.
Files deleted
config_push.rs, otlp_relay.rs, policy_activation.rs, provider_readiness.rs, provider_refresh_handles.rs, provider_token_exchange.rs, stable_external_placeholders.rs.
Context
- Part of test(e2e): decide which e2e/rust tests to port and in what order #5297. Stacks on test(testkit): share TLS host servers, a gateway settings role and the environment contract table #5728 (TLS host servers,
gateway_overridesrole, contract table). - Uses
Sandbox::logs_untilandpolicy::setfrom test(e2e): port network, L7 and policy-update tests from e2e/rust to conformance #5665, and the container-engine helpers from test(e2e): port Docker and Podman driver feature tests from e2e/rust #5695. Merge them in if they haven't landed. - Rows already run one test at a time, so tests that bind addresses the environment chose don't collide. Use test(runner): apply per-family nextest config and a thread count to runner rows #5295's test groups once rows run in parallel.
Definition of Done
- Every test in the table is ported as listed, or moved to the restart PR with this issue updated.
- Each new environment variable has a row in the
tests/supportcontract table. - The listed files are deleted, and every reference to them in wrapper scripts,
tasks/*.tomland nextest config is removed. - Each feature package has rows in
.github/workflows/e2e-suites.ymlon the drivers its legacy tests covered.
Activity