From 805ec651191d8728b275c4d2276df895212ea3a8 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 1 Mar 2022 15:19:28 -0800 Subject: [PATCH 1/3] Update redis port Signed-off-by: Kevin Zhang --- .github/workflows/pr_integration_tests.yml | 5 +++++ .../tests/integration/feature_repos/repo_configuration.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml index 000f9e97286..1a914473c1d 100644 --- a/.github/workflows/pr_integration_tests.yml +++ b/.github/workflows/pr_integration_tests.yml @@ -102,6 +102,11 @@ jobs: # code from the PR. ref: refs/pull/${{ github.event.pull_request.number }}/merge submodules: recursive + - name: Start Redis + uses: supercharge/redis-github-action@1.4.0 + with: + redis-version: ${{ matrix.redis-version }} + redis-port: 12345 - name: Setup Python uses: actions/setup-python@v2 id: setup-python diff --git a/sdk/python/tests/integration/feature_repos/repo_configuration.py b/sdk/python/tests/integration/feature_repos/repo_configuration.py index 963374f2663..dde26d4cb88 100644 --- a/sdk/python/tests/integration/feature_repos/repo_configuration.py +++ b/sdk/python/tests/integration/feature_repos/repo_configuration.py @@ -46,7 +46,7 @@ ) DYNAMO_CONFIG = {"type": "dynamodb", "region": "us-west-2"} -REDIS_CONFIG = {"type": "redis", "connection_string": "localhost:6379,db=0"} +REDIS_CONFIG = {"type": "redis", "connection_string": "localhost:12345,db=0"} REDIS_CLUSTER_CONFIG = { "type": "redis", "redis_type": "redis_cluster", From 3a506e58f898c1aaf2a9b27ab97484d5c25dad23 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 1 Mar 2022 16:10:00 -0800 Subject: [PATCH 2/3] Add comment detailing why 12345 is port selected Signed-off-by: Kevin Zhang --- sdk/python/tests/integration/feature_repos/repo_configuration.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/python/tests/integration/feature_repos/repo_configuration.py b/sdk/python/tests/integration/feature_repos/repo_configuration.py index dde26d4cb88..ff41f93a99a 100644 --- a/sdk/python/tests/integration/feature_repos/repo_configuration.py +++ b/sdk/python/tests/integration/feature_repos/repo_configuration.py @@ -46,6 +46,7 @@ ) DYNAMO_CONFIG = {"type": "dynamodb", "region": "us-west-2"} +# Port 12345 is 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_CLUSTER_CONFIG = { "type": "redis", From d4b90b08c76a4265dd838caedcfa88fbeb4f1b19 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Tue, 1 Mar 2022 16:29:01 -0800 Subject: [PATCH 3/3] Keep redis at 6379 for now until we can test against new github workflow Signed-off-by: Kevin Zhang --- .../tests/integration/feature_repos/repo_configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/python/tests/integration/feature_repos/repo_configuration.py b/sdk/python/tests/integration/feature_repos/repo_configuration.py index ff41f93a99a..83fc3e03f02 100644 --- a/sdk/python/tests/integration/feature_repos/repo_configuration.py +++ b/sdk/python/tests/integration/feature_repos/repo_configuration.py @@ -46,8 +46,8 @@ ) DYNAMO_CONFIG = {"type": "dynamodb", "region": "us-west-2"} -# Port 12345 is 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"} +# 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:6379,db=0"} REDIS_CLUSTER_CONFIG = { "type": "redis", "redis_type": "redis_cluster",