From e6c5200fa10064d6f7f484b83395d71127554e98 Mon Sep 17 00:00:00 2001 From: Achal Shah Date: Thu, 10 Mar 2022 14:12:02 -0800 Subject: [PATCH] ci: Use the default redis port for tests and remove unnecessary github action Signed-off-by: Achal Shah --- .github/workflows/master_only.yml | 4 ---- .github/workflows/pr_integration_tests.yml | 4 ---- .../tests/integration/feature_repos/repo_configuration.py | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml index 51431cbf3a1..97ee2c8d2da 100644 --- a/.github/workflows/master_only.yml +++ b/.github/workflows/master_only.yml @@ -126,10 +126,6 @@ jobs: run: pip install pip-tools - name: Install dependencies run: make install-python-ci-dependencies - - name: Start Redis - uses: supercharge/redis-github-action@1.4.0 - with: - redis-port: 12345 - name: Setup Redis Cluster run: | docker pull vishnunair/docker-redis-cluster:latest diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml index 51b3383826d..90d806c11c1 100644 --- a/.github/workflows/pr_integration_tests.yml +++ b/.github/workflows/pr_integration_tests.yml @@ -154,10 +154,6 @@ jobs: run: | make compile-protos-go make install-python-ci-dependencies - - name: Start Redis - uses: supercharge/redis-github-action@1.4.0 - with: - redis-port: 12345 - name: Setup Redis Cluster run: | docker pull vishnunair/docker-redis-cluster:latest diff --git a/sdk/python/tests/integration/feature_repos/repo_configuration.py b/sdk/python/tests/integration/feature_repos/repo_configuration.py index 760d2affdc5..61cad5606f1 100644 --- a/sdk/python/tests/integration/feature_repos/repo_configuration.py +++ b/sdk/python/tests/integration/feature_repos/repo_configuration.py @@ -48,7 +48,7 @@ DYNAMO_CONFIG = {"type": "dynamodb", "region": "us-west-2"} # Port 12345 will chosen as default for redis node configuration because Redis Cluster is started off of nodes # 6379 -> 6384. This causes conflicts in cli integration tests so we manually keep them separate. -REDIS_CONFIG = {"type": "redis", "connection_string": "localhost:12345,db=0"} +REDIS_CONFIG = {"type": "redis", "connection_string": "localhost:6379,db=0"} REDIS_CLUSTER_CONFIG = { "type": "redis", "redis_type": "redis_cluster",