Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ci): consul test cases run before cluster already #11041

Merged
merged 13 commits into from
Mar 15, 2024
Merged

fix(ci): consul test cases run before cluster already #11041

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cfb8739
[2023-12-22][add health-check schema check]
theweakgod Dec 22, 2023
adce66f
[2023-12-22][add health-check schema check]
theweakgod Dec 22, 2023
622e0d3
Merge branch 'apache:master' into master
theweakgod Jan 9, 2024
326d40d
Merge branch 'master' of github.com:theweakgod/apisix
theweakgod Jan 9, 2024
b3391c7
Merge branch 'master' of github.com:theweakgod/apisix
theweakgod Jan 17, 2024
8fee37a
Merge branch 'master' of github.com:theweakgod/apisix
theweakgod Jan 24, 2024
efd7ce2
Merge branch 'master' of github.com:theweakgod/apisix
theweakgod Jan 29, 2024
ef9b3de
remove redundant code
theweakgod Jan 29, 2024
9b5aef2
Merge branch 'apache:master' into master
theweakgod Feb 4, 2024
a2309a0
Merge branch 'apache:master' into master
theweakgod Feb 8, 2024
0dc2a41
Merge branch 'apache:master' into master
theweakgod Feb 20, 2024
941909d
Merge branch 'apache:master' into master
theweakgod Mar 14, 2024
9e60874
Fix executing consul2.t before cluster already
theweakgod Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ci/pod/docker-compose.first.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ services:
- "8302:8302"
- "9600:8600"
command: [ "consul", "agent", "-server", "-bootstrap-expect=1", "-bind", "0.0.0.0", "-client", "0.0.0.0", "-node", "node-1", "-log-level", "info", "-data-dir=/consul/data", "-enable-script-checks" ]
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8500/"]
interval: 10s
timeout: 10s
retries: 5
networks:
consul_cluster_net:
aliases:
Expand All @@ -79,6 +84,9 @@ services:
ports:
- "9501:8500"
command: [ "consul", "agent", "-server", "-bind", "0.0.0.0", "-client", "0.0.0.0", "-retry-join", "consul.cluster", "-node", "node-2", "-log-level", "info", "-data-dir=/consul/data", "-enable-script-checks" ]
depends_on:
consul_node_1:
condition: service_healthy
networks:
consul_cluster_net:
aliases:
Expand All @@ -92,6 +100,9 @@ services:
ports:
- "9502:8500"
command: [ "consul", "agent", "-server", "-bind", "0.0.0.0", "-client", "0.0.0.0", "-retry-join", "consul.cluster", "-node", "node-3", "-log-level", "info", "-data-dir=/consul/data", "-enable-script-checks" ]
depends_on:
consul_node_1:
condition: service_healthy
networks:
consul_cluster_net:
aliases:
Expand Down
Loading