From 500d0fff417568af089c6e63e93e05b5336541e6 Mon Sep 17 00:00:00 2001 From: Grzegorz Banasiak Date: Wed, 19 Nov 2025 14:58:22 +0100 Subject: [PATCH 1/3] Exclude some challenges when testing with ES release builds --- it/conftest.py | 5 +++++ it/logs/test_logs_unmapped.py | 4 +++- it/test_all_tracks_and_challenges.py | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/it/conftest.py b/it/conftest.py index a34e4c534..14f048d81 100644 --- a/it/conftest.py +++ b/it/conftest.py @@ -24,3 +24,8 @@ def es_cluster_cleanup(es_cluster): es = Elasticsearch(f"http://localhost:{es_cluster.http_port}") es.indices.delete(index="*") es.indices.delete_data_stream(name="*") + + +@pytest.fixture +def es_release_build(es_cluster) -> bool: + return es_cluster.source_build_release diff --git a/it/logs/test_logs_unmapped.py b/it/logs/test_logs_unmapped.py index 2cf365db4..7c07a07ed 100644 --- a/it/logs/test_logs_unmapped.py +++ b/it/logs/test_logs_unmapped.py @@ -24,7 +24,9 @@ @pytest.mark.track("elastic/logs") class TestLogsUnmapped: - def test_logs_chicken(self, es_cluster, rally): + def test_logs_chicken(self, es_cluster, rally, es_release_build): + if es_release_build: + pytest.skip("logging-insist-chicken is not supported on release builds") custom = {"mapping": "unmapped"} ret = rally.race( track="elastic/logs", diff --git a/it/test_all_tracks_and_challenges.py b/it/test_all_tracks_and_challenges.py index 17d549ada..babe611fe 100644 --- a/it/test_all_tracks_and_challenges.py +++ b/it/test_all_tracks_and_challenges.py @@ -36,9 +36,15 @@ class TestTrackRepository: "nyc_taxis": ["update-aggs-only"], } skip_challenges = {"esql": ["query-searchable-snapshot"]} + snapshot_only_challenges = { + "wikipedia": ["esql-full-text-functions"] + } - def test_autogenerated(self, es_cluster, rally, track, challenge, rally_options, es_cluster_cleanup): + def test_autogenerated(self, es_cluster, rally, track, challenge, rally_options, es_cluster_cleanup, es_release_build): track_params = {} + if es_release_build: + if challenge in self.snapshot_only_challenges.get(track, []): + pytest.skip(f"{track}-{challenge} is not supported on release builds") if track not in self.skip_tracks and challenge not in self.skip_challenges.get(track, []): if challenge in self.disable_assertions.get(track, []): rally_options.update({"enable_assertions": False}) From 9ad8d2fb76d77afcafe63b2080bf47b22da37403 Mon Sep 17 00:00:00 2001 From: Grzegorz Banasiak Date: Wed, 19 Nov 2025 15:00:54 +0100 Subject: [PATCH 2/3] format --- it/test_all_tracks_and_challenges.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/it/test_all_tracks_and_challenges.py b/it/test_all_tracks_and_challenges.py index babe611fe..c84d686f7 100644 --- a/it/test_all_tracks_and_challenges.py +++ b/it/test_all_tracks_and_challenges.py @@ -36,9 +36,7 @@ class TestTrackRepository: "nyc_taxis": ["update-aggs-only"], } skip_challenges = {"esql": ["query-searchable-snapshot"]} - snapshot_only_challenges = { - "wikipedia": ["esql-full-text-functions"] - } + snapshot_only_challenges = {"wikipedia": ["esql-full-text-functions"]} def test_autogenerated(self, es_cluster, rally, track, challenge, rally_options, es_cluster_cleanup, es_release_build): track_params = {} From 4225a1ad8c445b3c43399bbd9b0e28b078f2f0e2 Mon Sep 17 00:00:00 2001 From: Grzegorz Banasiak Date: Wed, 19 Nov 2025 17:16:35 +0100 Subject: [PATCH 3/3] Collapse condition --- it/test_all_tracks_and_challenges.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/it/test_all_tracks_and_challenges.py b/it/test_all_tracks_and_challenges.py index c84d686f7..9ec60c55a 100644 --- a/it/test_all_tracks_and_challenges.py +++ b/it/test_all_tracks_and_challenges.py @@ -40,9 +40,8 @@ class TestTrackRepository: def test_autogenerated(self, es_cluster, rally, track, challenge, rally_options, es_cluster_cleanup, es_release_build): track_params = {} - if es_release_build: - if challenge in self.snapshot_only_challenges.get(track, []): - pytest.skip(f"{track}-{challenge} is not supported on release builds") + if es_release_build and challenge in self.snapshot_only_challenges.get(track, []): + pytest.skip(f"{track}-{challenge} is not supported on release builds") if track not in self.skip_tracks and challenge not in self.skip_challenges.get(track, []): if challenge in self.disable_assertions.get(track, []): rally_options.update({"enable_assertions": False})