fix: Remove redis service to prevent more conflicts and add redis nod…

…e to master_only (feast-dev#2354) * Fix redis on master.yml Signed-off-by: Kevin Zhang <[email protected]> * Remove hack in make_feature_store_yaml Signed-off-by: Kevin Zhang <[email protected]> * Fix error Signed-off-by: Kevin Zhang <[email protected]> * Fix tests Signed-off-by: Kevin Zhang <[email protected]>
achals · Mar 3, 2022 · 993616f · 993616f
1 parent ce3bc59
commit 993616f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml
@@ -65,16 +65,6 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}
-    services:
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python
@@ -120,6 +110,11 @@ jobs:
         run: pip install pip-tools
       - name: Install dependencies
         run: make install-python-ci-dependencies
+      - name: Start Redis
+        uses: supercharge/[email protected]
+        with:
+          redis-version: ${{ matrix.redis-version }}
+          redis-port: 12345
       - name: Setup Redis Cluster
         run: |
           docker pull vishnunair/docker-redis-cluster:latest

diff --git a/sdk/python/tests/integration/registration/test_cli.py b/sdk/python/tests/integration/registration/test_cli.py
@@ -134,9 +134,11 @@ def make_feature_store_yaml(project, test_repo_config, repo_dir_name: Path):
         isinstance(config_dict["online_store"], dict)
         and "redis_type" in config_dict["online_store"]
     ):
-        del config_dict["online_store"]["redis_type"]
+        if str(config_dict["online_store"]["redis_type"]) == "RedisType.redis_cluster":
+            config_dict["online_store"]["redis_type"] = "redis_cluster"
+        elif str(config_dict["online_store"]["redis_type"]) == "RedisType.redis":
+            config_dict["online_store"]["redis_type"] = "redis"
     config_dict["repo_path"] = str(config_dict["repo_path"])
-
     return yaml.safe_dump(config_dict)