Skip to content

Commit d6ddfd3

Browse files
committed
gha: use same approach for redis container start
This makes the orquesta workflow consistent with ci workflow changes added in #6245
1 parent 7c0b0ee commit d6ddfd3

File tree

1 file changed

+12
-23
lines changed

1 file changed

+12
-23
lines changed

.github/workflows/orquesta-integration-tests.yaml

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,18 @@ jobs:
8282
- 5672:5672/tcp # AMQP standard port
8383
- 15672:15672/tcp # Management: HTTP, CLI
8484

85-
# Used for the coordination backend for integration tests
86-
# NOTE: To speed things up, we only start redis for integration tests
87-
# where it's needed
88-
# redis:
89-
# # Docker Hub image
90-
# image: redis
91-
# # Set health checks to wait until redis has started
92-
# options: >-
93-
# --name "redis"
94-
# --health-cmd "redis-cli ping"
95-
# --health-interval 10s
96-
# --health-timeout 5s
97-
# --health-retries 5
98-
# ports:
99-
# - 6379:6379/tcp
85+
redis:
86+
# Docker Hub image
87+
image: redis
88+
# Set health checks to wait until redis has started
89+
options: >-
90+
--name "redis"
91+
--health-cmd "redis-cli ping"
92+
--health-interval 10s
93+
--health-timeout 5s
94+
--health-retries 5
95+
ports:
96+
- 6379:6379/tcp
10097

10198
env:
10299
TASK: '${{ matrix.task }}'
@@ -147,11 +144,6 @@ jobs:
147144
cp conf/st2.dev.conf "${ST2_CONF}" ; sed -i -e "s/stanley/${ST2_CI_USER}/" "${ST2_CONF}"
148145
149146
sudo -E ./scripts/ci/add-itest-user-key.sh
150-
- name: Run Redis Service Container
151-
timeout-minutes: 2
152-
run: |
153-
docker run --rm --detach -p 127.0.0.1:6379:6379/tcp --name redis redis:latest
154-
until [ "$(docker inspect -f {{.State.Running}} redis)" == "true" ]; do sleep 0.1; done
155147
- name: Permissions Workaround
156148
run: |
157149
echo "$ST2_CI_REPO_PATH"
@@ -194,9 +186,6 @@ jobs:
194186
name: logs-py${{ matrix.python-version }}
195187
path: logs.tar.gz
196188
retention-days: 7
197-
- name: Stop Redis Service Container
198-
if: "${{ always() }}"
199-
run: docker rm --force redis || true
200189

201190
slack-notification:
202191
name: Slack notification for failed master builds

0 commit comments

Comments
 (0)