Skip to content

Commit 54f705a

Browse files
ntkatholentkathole
committed
fix: Ray offline store tests are duplicated across 3 workflows
Signed-off-by: ntkathole <[email protected]>
1 parent 867fca7 commit 54f705a

7 files changed

Lines changed: 193 additions & 23 deletions

File tree

‎.github/workflows/pr_ray_integration_tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- labeled
99

1010
jobs:
11-
integration-test-ray-offline:
11+
integration-test-ray:
1212
if:
1313
((github.event.action == 'labeled' && (github.event.label.name == 'approved' || github.event.label.name == 'lgtm' || github.event.label.name == 'ok-to-test')) ||
1414
(github.event.action != 'labeled' && (contains(github.event.pull_request.labels.*.name, 'ok-to-test') || contains(github.event.pull_request.labels.*.name, 'approved') || contains(github.event.pull_request.labels.*.name, 'lgtm')))) &&
@@ -27,5 +27,5 @@ jobs:
2727
pixi-version: v0.63.1
2828
environments: ray-tests
2929
cache: true
30-
- name: Run Ray offline store integration tests
31-
run: make test-python-universal-ray-offline
30+
- name: Run Ray integration tests (offline store + compute engine)
31+
run: make test-python-ray-integration

‎.secrets.baseline‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Makefile‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ test-python-integration: ## Run Python integration tests (CI)
186186
-k "(not snowflake or not test_historical_features_main)" \
187187
-m "not rbac_remote_integration_test" \
188188
--ignore=sdk/python/tests/integration/registration \
189+
--ignore=sdk/python/tests/integration/compute_engines/ray_compute \
189190
--log-cli-level=INFO -s \
190191
sdk/python/tests
191192

@@ -402,14 +403,9 @@ test-python-universal-postgres-offline: ## Run Python Postgres integration tests
402403
not test_spark" \
403404
sdk/python/tests
404405

405-
test-python-universal-ray-offline: ## Run Python Ray offline store integration tests
406+
test-python-ray-integration: ## Run all Python Ray integration tests (offline store + compute engine)
406407
pixi run -e ray-tests test
407408

408-
test-python-ray-compute-engine: ## Run Python Ray compute engine tests
409-
PYTHONPATH='.' \
410-
python -m pytest -v --integration \
411-
sdk/python/tests/integration/compute_engines/ray_compute/
412-
413409
test-python-universal-postgres-online: ## Run Python Postgres integration tests
414410
PYTHONPATH='.' \
415411
FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.postgres_online_store.postgres_repo_configuration \

‎pixi.lock‎

Lines changed: 180 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,12 @@ test = { cmd = "python -m pytest -n 8 --integration -m 'not ray_offline_stores_o
288288
feast = { path = ".", editable = true, extras = ["ray", "grpcio", "test"] }
289289

290290
[tool.pixi.feature.ray-tests.tasks]
291-
test = { cmd = "python -m pytest -n 1 --integration --ignore=sdk/python/tests/integration/offline_store/test_dqm_validation.py sdk/python/tests/integration/offline_store", env = { PYTHONPATH = ".", FULL_REPO_CONFIGS_MODULE = "sdk.python.tests.integration.feature_repos.ray_repo_configuration", FEAST_IS_LOCAL_TEST = "True" } }
291+
test-offline = { cmd = "python -m pytest -v --integration --ignore=sdk/python/tests/integration/offline_store/test_dqm_validation.py sdk/python/tests/integration/offline_store", env = { PYTHONPATH = ".", FULL_REPO_CONFIGS_MODULE = "sdk.python.tests.integration.feature_repos.ray_repo_configuration", FEAST_IS_LOCAL_TEST = "True" } }
292+
test-compute = { cmd = "python -m pytest -v --integration sdk/python/tests/integration/compute_engines/ray_compute", env = { PYTHONPATH = ".", FEAST_IS_LOCAL_TEST = "True" } }
293+
test = { depends-on = ["test-offline", "test-compute"] }
292294

293295
[tool.pixi.feature.registration-tests.pypi-dependencies]
294-
feast = { path = ".", editable = true, extras = ["aws", "gcp", "grpcio", "postgres", "mysql", "spark", "test"] }
296+
feast = { path = ".", editable = true, extras = ["aws", "gcp", "grpcio", "postgres", "mysql", "snowflake", "spark", "test"] }
295297
grpcio-testing = ">=1.56.2,<=1.62.3"
296298

297299
[tool.pixi.feature.registration-tests.tasks]

‎sdk/python/tests/integration/compute_engines/ray_compute/repo_configuration.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@
66
from tests.integration.feature_repos.integration_test_repo_config import (
77
IntegrationTestRepoConfig,
88
)
9-
from tests.integration.feature_repos.universal.online_store.redis import (
10-
RedisOnlineStoreCreator,
11-
)
129

1310

1411
def get_ray_compute_engine_test_config() -> IntegrationTestRepoConfig:
1512
"""Get test configuration for Ray compute engine."""
1613
return IntegrationTestRepoConfig(
1714
provider="local",
18-
online_store_creator=RedisOnlineStoreCreator,
15+
online_store={"type": "sqlite"},
1916
offline_store_creator=RayDataSourceCreator,
2017
batch_engine={
2118
"type": "ray.engine",

‎sdk/python/tests/integration/feature_repos/repo_configuration.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@
100100
("local", RemoteOfflineTlsStoreDataSourceCreator),
101101
]
102102

103-
# Ray offline store tests are run separately via `make test-python-universal-ray`
104-
# so we don't include them in the default offline store list.
105-
106103
if os.getenv("FEAST_IS_LOCAL_TEST", "False") == "True":
107104
AVAILABLE_OFFLINE_STORES.extend(
108105
[

0 commit comments

Comments
 (0)