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

fix: Flaky tests for 5.20 enterprise integration tests #217

Closed
wants to merge 12 commits into from
Closed

fix: Flaky tests for 5.20 enterprise integration tests #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7f38303
fix: Rework health checks to use cypher-shell
exaby73 Jul 23, 2024
52c6e71
chore: add database property to cypher-shell command
exaby73 Jul 23, 2024
6c3165d
feat: Update health check cmd to use status endpoint
exaby73 Jul 23, 2024
c14a7cf
wip: attempt logging in healthcheck
exaby73 Jul 23, 2024
9b9ed34
revert: Healthcheck changes
exaby73 Jul 23, 2024
39162eb
fix: env vars
exaby73 Jul 23, 2024
2da7166
fix: env vars
exaby73 Jul 23, 2024
10fd047
wip: Attempt to use server1 as connection
exaby73 Jul 23, 2024
5abccfc
wip: Downgrade to 5.10
exaby73 Jul 23, 2024
510994a
revert: back to localhost
exaby73 Jul 23, 2024
7573fa6
wip: Update healthcheck to reflect docker-compose.yml
exaby73 Jul 23, 2024
ff55b7e
wip: Add 60 second sleep before tests
exaby73 Jul 26, 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
36 changes: 19 additions & 17 deletions .github/workflows/integration-test-cluster-neo4j-5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
env:
CONNECTION: neo4j://neo4j:testtest@localhost:7687
name: "Running on PHP 8.1 with a Neo4j 5.20-enterprise cluster"
name: "Running on PHP 8.1 with a Neo4j 5.10-enterprise cluster"

steps:
- uses: actions/checkout@v2
Expand All @@ -27,6 +27,8 @@ jobs:
progress: yes
php_version: 8.1
version: 2
- name: Wait for 60 seconds for Neo4j cluster to start
run: echo "Sleeping for 60 seconds" && sleep 60
- uses: php-actions/phpunit@v3
with:
configuration: phpunit.xml.dist
Expand All @@ -38,7 +40,7 @@ jobs:

services:
server1:
image: neo4j:5.20-enterprise
image: neo4j:5.10-enterprise
ports:
- 7687:7687
- 7473:7473
Expand All @@ -47,19 +49,19 @@ jobs:
NEO4J_initial_server_mode__constraint: PRIMARY
NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
NEO4j_server_bolt_advertised_address: localhost:7687
NEO4j_server_http_advertised_address: localhost:7474
NEO4J_server_bolt_advertised__address: localhost:7687
NEO4J_server_http_advertised__address: localhost:7474
NEO4J_PLUGINS: '["apoc"]'
NEO4J_AUTH: neo4j/testtest
options: >-
--hostname server1
--health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
--health-cmd "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1"
--health-start-period "60s"
--health-interval "30s"
--health-timeout "15s"
--health-retries "5"
server2:
image: neo4j:5.20-enterprise
image: neo4j:5.10-enterprise
ports:
- 8687:7687
- 8473:7473
Expand All @@ -68,19 +70,19 @@ jobs:
NEO4J_initial_server_mode__constraint: PRIMARY
NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
NEO4j_server_bolt_advertised_address: localhost:8687
NEO4j_server_http_advertised_address: localhost:8474
NEO4J_server_bolt_advertised__address: localhost:8687
NEO4J_server_http_advertised__address: localhost:8474
NEO4J_PLUGINS: '["apoc"]'
NEO4J_AUTH: neo4j/testtest
options: >-
--hostname server2
--health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
--health-cmd "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1"
--health-start-period "60s"
--health-interval "30s"
--health-timeout "15s"
--health-retries "5"
server3:
image: neo4j:5.20-enterprise
image: neo4j:5.10-enterprise
ports:
- 9474:7474
- 9473:7473
Expand All @@ -89,19 +91,19 @@ jobs:
NEO4J_initial_server_mode__constraint: PRIMARY
NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
NEO4j_server_bolt_advertised_address: localhost:9687
NEO4j_server_http_advertised_address: localhost:9474
NEO4J_server_bolt_advertised__address: localhost:9687
NEO4J_server_http_advertised__address: localhost:9474
NEO4J_PLUGINS: '["apoc"]'
NEO4J_AUTH: neo4j/testtest
options: >-
--hostname server3
--health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
--health-cmd "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1"
--health-start-period "60s"
--health-interval "30s"
--health-timeout "15s"
--health-retries "5"
read-server4:
image: neo4j:5.20-enterprise
image: neo4j:5.10-enterprise
ports:
- 10474:7474
- 10473:7473
Expand All @@ -110,13 +112,13 @@ jobs:
NEO4J_initial_server_mode__constraint: SECONDARY
NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
NEO4j_server_bolt_advertised_address: localhost:10687
NEO4j_server_http_advertised_address: localhost:10474
NEO4J_server_bolt_advertised__address: localhost:10687
NEO4J_server_http_advertised__address: localhost:10474
NEO4J_PLUGINS: '["apoc"]'
NEO4J_AUTH: neo4j/testtest
options: >-
--hostname read-server4
--health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
--health-cmd "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1"
--health-start-period "60s"
--health-interval "30s"
--health-timeout "15s"
Expand Down
20 changes: 10 additions & 10 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ services:
- "11474:7474"
environment:
<<: *common-env
NEO4j_server_bolt_advertised_address: localhost:11687
NEO4j_server_http_advertised_address: localhost:11474
NEO4J_server_bolt_advertised__address: localhost:11687
NEO4J_server_http_advertised__address: localhost:11474

server1:
<<: *common-cluster
Expand All @@ -73,8 +73,8 @@ services:
- "7474:7474"
environment:
<<: *common-core-env
NEO4j_server_bolt_advertised_address: localhost:7687
NEO4j_server_http_advertised_address: localhost:7474
NEO4J_server_bolt_advertised__address: localhost:7687
NEO4J_server_http_advertised__address: localhost:7474

server2:
<<: *common-cluster
Expand All @@ -85,8 +85,8 @@ services:
- "8474:7474"
environment:
<<: *common-core-env
NEO4j_server_bolt_advertised_address: localhost:8687
NEO4j_server_http_advertised_address: localhost:8474
NEO4J_server_bolt_advertised__address: localhost:8687
NEO4J_server_http_advertised__address: localhost:8474

server3:
<<: *common-cluster
Expand All @@ -97,8 +97,8 @@ services:
- "9687:7687"
environment:
<<: *common-core-env
NEO4j_server_bolt_advertised_address: localhost:9687
NEO4j_server_http_advertised_address: localhost:9474
NEO4J_server_bolt_advertised__address: localhost:9687
NEO4J_server_http_advertised__address: localhost:9474

server4:
<<: *common-cluster
Expand All @@ -110,5 +110,5 @@ services:
environment:
<<: *common-cluster-env
NEO4J_initial_server_mode__constraint: 'SECONDARY'
NEO4j_server_bolt_advertised_address: localhost:10687
NEO4j_server_http_advertised_address: localhost:10474
NEO4J_server_bolt_advertised__address: localhost:10687
NEO4J_server_http_advertised__address: localhost:10474
Loading