Skip to content

Commit

Permalink
ci(test): Remove wait timeout for docker compose (#3437)
Browse files Browse the repository at this point in the history
  • Loading branch information
Zheaoli authored Oct 31, 2023
1 parent d37e3e1 commit 8677a38
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/services/azblob/azurite_azblob/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup azurite azblob service
shell: bash
working-directory: fixtures/azblob
run: docker compose -f docker-compose-azurite.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-azurite.yml up -d --wait
- name: Setup test bucket
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/etcd/etcd-cluster/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup etcd cluster
shell: bash
working-directory: fixtures/etcd
run: docker compose -f docker-compose-cluster.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-cluster.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/etcd/etcd-tls/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
- name: Setup etcd tls
shell: bash
working-directory: fixtures/etcd
run: docker compose -f docker-compose-standalone-tls.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-standalone-tls.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/etcd/etcd/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup etcd cluster
shell: bash
working-directory: fixtures/etcd
run: docker compose -f docker-compose-standalone.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-standalone.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/http/caddy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup http in caddy
shell: bash
working-directory: fixtures/http
run: docker compose -f docker-compose-caddy.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-caddy.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/http/nginx/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup http in nginx
shell: bash
working-directory: fixtures/http
run: docker compose -f docker-compose-nginx.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-nginx.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/memcached/memcached/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup memcached server
shell: bash
working-directory: fixtures/memcached
run: docker compose -f docker-compose-memcached.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-memcached.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup MongoDB Server
shell: bash
working-directory: fixtures/mongodb
run: docker compose -f docker-compose-basic-auth.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-basic-auth.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/mongodb/mongodb_with_no_auth/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup MongoDB Server
shell: bash
working-directory: fixtures/mongodb
run: docker compose -f docker-compose-no-auth.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-no-auth.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/mysql/mysql/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ runs:
working-directory: fixtures/mysql
run: |
apt update && apt install -y mysql-client
docker compose -f docker-compose.yml up -d --wait --wait-timeout 20
docker compose -f docker-compose.yml up -d --wait
while ! mysql -h localhost -P 3306 --protocol=tcp -u root -p'password' -e "SELECT 1"; do
echo "Waiting for MySQL..."
sleep 1
Expand Down
2 changes: 1 addition & 1 deletion .github/services/postgresql/postgresql/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup PostgreSQL Server
shell: bash
working-directory: fixtures/postgresql
run: docker compose -f docker-compose.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/redis/dragonfly/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup Dragonfly Server
shell: bash
working-directory: fixtures/redis
run: docker compose -f docker-compose-dragonfly.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-dragonfly.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/redis/kvrocks/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup Kvrocks Server
shell: bash
working-directory: fixtures/redis
run: docker compose -f docker-compose-kvrocks.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-kvrocks.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/redis/redis/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup Redis Server
shell: bash
working-directory: fixtures/redis
run: docker compose -f docker-compose-redis.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-redis.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/redis/redis_with_cluster/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup Redis Cluster
shell: bash
working-directory: fixtures/redis
run: docker compose -f docker-compose-redis-cluster.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-redis-cluster.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/s3/minio_s3/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:
- name: Setup MinIO Server
shell: bash
working-directory: fixtures/s3
run: docker compose -f docker-compose-minio.yml up -d --wait --wait-timeout 20
run: docker compose -f docker-compose-minio.yml up -d --wait
- name: Setup test bucket
shell: bash
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/services/s3/minio_s3_with_anonymous/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:
shell: bash
working-directory: fixtures/s3
run: |
docker compose -f docker-compose-minio.yml up -d --wait --wait-timeout 20
docker compose -f docker-compose-minio.yml up -d --wait
- name: Setup test bucket
shell: bash
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/services/sftp/sftp/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:
shell: bash
working-directory: fixtures/sftp
run: |
docker compose -f docker-compose-sftp.yml up -d --wait --wait-timeout 20
docker compose -f docker-compose-sftp.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/services/sftp/sftp_with_default_root/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:
shell: bash
working-directory: fixtures/sftp
run: |
docker compose -f docker-compose-sftp-with-default-root.yml up -d --wait --wait-timeout 20
docker compose -f docker-compose-sftp-with-default-root.yml up -d --wait
- name: Setup
shell: bash
run: |
Expand Down

0 comments on commit 8677a38

Please sign in to comment.