From bddeec8fbf3a528132e6a4ac26695f5fdbeb5cc9 Mon Sep 17 00:00:00 2001 From: Willem Kaufmann Date: Mon, 16 Sep 2024 14:00:55 -0400 Subject: [PATCH] `rptest`: change fips decorator in `test_s3_oracle_self_config` This test will ALWAYS fail in fips mode, due to required path-style outcome for OCI self configuration. Change the decorator from `@ok_to_fail_fips` to `@skip_fips_mode` to avoid wasted CI runtime. (cherry picked from commit 6605685a7a6c40caf4526925f40b58bd59ed7172) --- tests/rptest/tests/cluster_self_config_test.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/rptest/tests/cluster_self_config_test.py b/tests/rptest/tests/cluster_self_config_test.py index b4e8bf8cf0de..7278d7b1af99 100644 --- a/tests/rptest/tests/cluster_self_config_test.py +++ b/tests/rptest/tests/cluster_self_config_test.py @@ -8,13 +8,14 @@ # by the Apache License, Version 2.0 import re -from ducktape.mark import parametrize, matrix, ok_to_fail_fips +from ducktape.mark import parametrize, matrix from rptest.services.admin import Admin from rptest.services.cluster import cluster from rptest.services.redpanda import CloudStorageType, SISettings, get_cloud_storage_type from rptest.tests.end_to_end import EndToEndTest from rptest.services.utils import LogSearchLocal +from rptest.utils.mode_checks import skip_fips_mode class ClusterSelfConfigTest(EndToEndTest): @@ -87,7 +88,7 @@ def test_s3_self_config(self, cloud_storage_type): assert self_config_result and self_config_result in self_config_expected_results # OCI only supports path-style requests, fips mode will always fail. - @ok_to_fail_fips + @skip_fips_mode @cluster(num_nodes=1) @matrix(cloud_storage_type=get_cloud_storage_type( applies_only_on=[CloudStorageType.S3]))