Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
NEXUS_SERVER=nexus_server
NEXUS_MINION_PORT=11972
NEXUS_CONSOLE_PORT=11973
NEXUS_WEB_PORT=8086
DBHOST=localhost
DBPORT=5432
DBUSER=postgres
Expand All @@ -77,7 +78,7 @@ jobs:
EOF

- name: Build all binaries
run: make build
run: make build-test

- name: Run unit tests
run: make test
Expand All @@ -87,8 +88,8 @@ jobs:

- name: Start Docker services for integration tests
run: |
MINEXUS_ENV=test make compose-run
echo "Starting Docker services with healthchecks..."
docker compose up -d nexus_server minion

echo "Waiting for services to be healthy..."
timeout 120 bash -c 'until docker compose ps --format json | grep -q "nexus_server.*healthy"; do
Expand All @@ -102,7 +103,7 @@ jobs:
run: docker compose ps

- name: Run integration tests
run: make test-integration
run: MINEXUS_ENV=test make test-integration

- name: Upload coverage reports
uses: actions/upload-artifact@v4
Expand Down
7 changes: 4 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,12 @@ services:
networks:
- default
healthcheck:
test: ["CMD-SHELL", "sleep 1 && nc -z localhost ${NEXUS_MINION_PORT:-11972} && nc -z localhost ${NEXUS_CONSOLE_PORT:-11973} && nc -z localhost ${NEXUS_WEB_PORT:-8086} && echo 'All three ports accessible' || exit 1"]
#test: ["CMD-SHELL", "nc -z nexus_server ${NEXUS_MINION_PORT:-11972} && nc -z nexus_server ${NEXUS_CONSOLE_PORT:-11973} && nc -z nexus_server ${NEXUS_WEB_PORT:-8086} && echo 'All three ports accessible' || exit 1"]
test: ["CMD-SHELL", "nc -z nexus_server ${NEXUS_MINION_PORT:-11972} && nc -z nexus_server ${NEXUS_CONSOLE_PORT:-11973} && echo 'All three ports accessible' || exit 1"]
interval: 3s
timeout: 15s
timeout: 5s
retries: 10
start_period: 10s
start_period: 11s

# Minion client - depends on nexus server being healthy
minion:
Expand Down