Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions tests/rptest/test_suite_quick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ quick:
- tests/
- transactions/
- cfr_tests/
- utils/skip_in_cdt_test.py

excluded:
- tests/rpk_tuner_test.py
Expand Down
7 changes: 7 additions & 0 deletions tests/rptest/tests/acls_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
from rptest.services.redpanda import LoggingConfig, SecurityConfig, TLSProvider
from rptest.services.redpanda_installer import RedpandaInstaller, wait_for_num_versions
from rptest.tests.redpanda_test import RedpandaTest
from rptest.utils.mode_checks import skip_file_in_cdt


class MTLSProvider(TLSProvider):
Expand Down Expand Up @@ -853,3 +854,9 @@ def test_describe_quotas(self):
assert resp["ErrorCode"] != KError.CLUSTER_AUTHORIZATION_FAILED.value, (
f"Response: {resp}"
)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="ACL/authz suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
8 changes: 7 additions & 1 deletion tests/rptest/tests/audit_log_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
schema2_def,
)
from rptest.util import expect_exception, wait_until, wait_until_result
from rptest.utils.mode_checks import skip_fips_mode
from rptest.utils.mode_checks import skip_fips_mode, skip_file_in_cdt
from rptest.utils.rpk_config import read_redpanda_cfg
from rptest.utils.schema_registry_utils import Mode, get_subjects, put_mode

Expand Down Expand Up @@ -4406,3 +4406,9 @@ def test_audit_log_upgrade_all_nodes(self):
)

self._test_audit_on_all_nodes("post_upgrade_restart")


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="audit-logging suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
7 changes: 7 additions & 0 deletions tests/rptest/tests/cluster_features_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from rptest.util import expect_exception, wait_until_result
from rptest.utils.node_operations import NodeDecommissionWaiter
from rptest.utils.rpenv import sample_license, sample_license_v1
from rptest.utils.mode_checks import skip_file_in_cdt

FEATURE_ALPHA_NAME = "__test_alpha"
FEATURE_BRAVO_NAME = "__test_bravo"
Expand Down Expand Up @@ -2024,3 +2025,9 @@ def cluster_at_steady_state():
"feature_manager likely failed to wake on member removal."
),
)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="feature-flag suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
8 changes: 7 additions & 1 deletion tests/rptest/tests/enterprise_features_license_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
)
from rptest.tests.redpanda_test import RedpandaTest
from rptest.util import expect_exception
from rptest.utils.mode_checks import skip_fips_mode
from rptest.utils.mode_checks import skip_fips_mode, skip_file_in_cdt


class EnterpriseFeaturesTestBase(RedpandaTest):
Expand Down Expand Up @@ -345,3 +345,9 @@ def test_license_violation(self):
)

self.check_feature(feature, enabled=False, license_valid=False)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="enterprise-license enforcement suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
7 changes: 7 additions & 0 deletions tests/rptest/tests/gbac_claim_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
make_redpanda_service,
)
from rptest.services.stub_oidc_provider import StubOIDCProvider
from rptest.utils.mode_checks import skip_file_in_cdt


class StubOIDCTestBase(Test):
Expand Down Expand Up @@ -1184,3 +1185,9 @@ def test_invalid_group_claim_path(self) -> None:

producer = self.make_producer(client_id)
self.assert_produce_denied(producer, topic)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="group-based access-control suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
7 changes: 7 additions & 0 deletions tests/rptest/tests/leadership_transfer_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from rptest.services.redpanda import RESTART_LOG_ALLOW_LIST, ResourceSettings
from rptest.tests.redpanda_test import RedpandaTest
from rptest.util import wait_until_result
from rptest.utils.mode_checks import skip_file_in_cdt


class ReplicaMetadata(TypedDict):
Expand Down Expand Up @@ -1103,3 +1104,9 @@ def get_leaders_preference(topic: str) -> str:
assert t2r == expected, (
f"Expected topic-to-rack leaders {expected}. Got {t2r} instead"
)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="leadership-transfer suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
7 changes: 7 additions & 0 deletions tests/rptest/tests/maintenance_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from rptest.services.cluster import cluster
from rptest.services.redpanda import RESTART_LOG_ALLOW_LIST
from rptest.tests.maintenance import MaintenanceTestBase
from rptest.utils.mode_checks import skip_file_in_cdt


class MaintenanceTest(MaintenanceTestBase):
Expand Down Expand Up @@ -228,3 +229,9 @@ def test_leader_distribution(self, use_rpk):
backoff_sec=2,
err_msg="Leaders distributed very unevenly",
)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="maintenance-mode suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
12 changes: 11 additions & 1 deletion tests/rptest/tests/pandaproxy_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@
from rptest.tests.group_membership_test import GroupCoordinatorTransferUtils
from rptest.tests.redpanda_test import RedpandaTest
from rptest.util import search_logs_with_timeout
from rptest.utils.mode_checks import in_fips_environment, skip_debug_mode
from rptest.utils.mode_checks import (
in_fips_environment,
skip_debug_mode,
skip_file_in_cdt,
)
from rptest.utils.utf8 import CONTROL_CHARS_MAP


Expand Down Expand Up @@ -2447,3 +2451,9 @@ def test_fetch_consumer_group(self):
assert item["offset"] == produced_offset, (
"Pandaproxy consumer fetch consumed the wrong offset"
)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="pandaproxy HTTP-API suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
8 changes: 7 additions & 1 deletion tests/rptest/tests/rbac_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from rptest.tests.redpanda_test import RedpandaTest
from rptest.util import expect_exception, expect_http_error, wait_until_result
from rptest.utils.log_utils import wait_until_nag_is_set
from rptest.utils.mode_checks import skip_fips_mode
from rptest.utils.mode_checks import skip_fips_mode, skip_file_in_cdt

ALICE = SaslCredentials("alice", "itsMeH0nest012", "SCRAM-SHA-256")

Expand Down Expand Up @@ -1231,3 +1231,9 @@ def test_role_survives_restart(self):
backoff_sec=1,
retry_on_exc=True,
)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="RBAC suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
8 changes: 7 additions & 1 deletion tests/rptest/tests/redpanda_oauth_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
from rptest.tests.tls_metrics_test import FaketimeTLSProvider
from rptest.util import expect_exception, wait_until_result
from rptest.utils.log_utils import wait_until_nag_is_set
from rptest.utils.mode_checks import skip_fips_mode
from rptest.utils.mode_checks import skip_fips_mode, skip_file_in_cdt

CLIENT_ID = "myapp"
TOKEN_AUDIENCE = "account"
Expand Down Expand Up @@ -2331,3 +2331,9 @@ def test_license_nag(self, authn_config):
timeout_sec=self.LICENSE_CHECK_INTERVAL_SEC * 2,
err_msg="License nag failed to appear",
)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="OAuth/OIDC auth suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
16 changes: 15 additions & 1 deletion tests/rptest/tests/schema_registry_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@
wait_until_result,
)
from rptest.utils.log_utils import wait_until_nag_is_set
from rptest.utils.mode_checks import skip_debug_mode, skip_fips_mode
from rptest.utils.mode_checks import (
skip_debug_mode,
skip_file_in_cdt,
skip_fips_mode,
)

Headers: TypeAlias = dict[str, str] | None

Expand Down Expand Up @@ -11947,3 +11951,13 @@ def test_transport_compatibility(self):

self._flip_transport(use_rpc=False)
self._verify_phase(after_rpc2, "kafka2", "Kafka2Rec", n)


# Opt the entire schema-registry HTTP-API suite out of CDT: it is exhaustive and
# adds significant runtime on real cloud infra without adding any cloud-infra
# coverage (the dockerized CI run already exercises it end to end). The test
# methods live on the base classes above; skip_file_in_cdt marks each module
# class's own methods, so the thin concrete subclasses inherit the mark.
skip_file_in_cdt(

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A module-scope opt-out also pulls in SchemaRegistryTransportStressTest (and its *RpcTransport*/*KafkaClientTransport* subclasses), which does concurrent SR read/write while transferring leadership of _schemas to check resilience under real network/timing. That is arguably one of the SR tests where real EC2 (vs. loopback docker) network + scheduling behavior does add signal, unlike the pure HTTP-API surface the PR body describes.

Is opting the transport-stress tests out of CDT intentional? If so, a one-line note in the accounting justifying it would help; if not, consider a method-scope @skip_in_cdt on the HTTP-API methods instead of a whole-file opt-out, so the resilience tests keep their real-hardware coverage.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A module-scope opt-out also pulls in SchemaRegistryTransportStressTest (and its *RpcTransport*/*KafkaClientTransport* subclasses), which does concurrent SR read/write while transferring leadership of _schemas to check resilience under real network/timing. That is arguably one of the SR tests where real EC2 (vs. loopback docker) network + scheduling behavior does add signal, unlike the pure HTTP-API surface the PR body describes.

Is opting the transport-stress tests out of CDT intentional? If so, a one-line note in the accounting justifying it would help; if not, consider a method-scope @skip_in_cdt on the HTTP-API methods instead of a whole-file opt-out, so the resilience tests keep their real-hardware coverage.

reason="exhaustive SR HTTP-API suite; no cloud-infra signal (dockerized CI covers it)"
)
8 changes: 7 additions & 1 deletion tests/rptest/tests/scram_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
)
from rptest.util import expect_exception, expect_http_error
from rptest.utils.log_utils import wait_until_nag_is_set
from rptest.utils.mode_checks import in_fips_environment
from rptest.utils.mode_checks import in_fips_environment, skip_file_in_cdt
from rptest.utils.utf8 import (
generate_string_with_control_character,
)
Expand Down Expand Up @@ -1668,3 +1668,9 @@ def test_scram_reauth(self):
)
assert REAUTH_METRIC in metrics.keys()
assert metrics[REAUTH_METRIC] > 0, "Expected client reauth on some broker..."


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="SASL/SCRAM auth suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
8 changes: 7 additions & 1 deletion tests/rptest/tests/security_report_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
AuditLogTestBase,
AuditLogTestSecurityConfig,
)
from rptest.utils.mode_checks import skip_fips_mode
from rptest.utils.mode_checks import skip_fips_mode, skip_file_in_cdt


def make_from_dict(class_name, values):
Expand Down Expand Up @@ -1088,3 +1088,9 @@ def test_security_report(self):
},
audit_log_expected=audit_log_expected,
)


# No-cloud suite: opt out of CDT (dockerized CI already covers it).
skip_file_in_cdt(
reason="security-report suite: no cloud-infra signal in CDT; dockerized CI covers it"
)
Loading