From 85a4074426694431d9a3ef1b80c31d9fd24c5386 Mon Sep 17 00:00:00 2001 From: Achal Shah Date: Thu, 10 Mar 2022 10:22:05 -0800 Subject: [PATCH] ci: Reintroduce redis services at 6379 Signed-off-by: Achal Shah --- .github/workflows/master_only.yml | 10 ++++++++++ .github/workflows/pr_integration_tests.yml | 19 ++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml index e5c89aadfd0..51431cbf3a1 100644 --- a/.github/workflows/master_only.yml +++ b/.github/workflows/master_only.yml @@ -66,6 +66,16 @@ 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 diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml index ab8b812373f..ed45acfd891 100644 --- a/.github/workflows/pr_integration_tests.yml +++ b/.github/workflows/pr_integration_tests.yml @@ -84,6 +84,16 @@ 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 with: @@ -92,11 +102,6 @@ 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 @@ -147,6 +152,10 @@ 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