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

[CI FIx] Use Docker Compose V2 #575

Merged
merged 2 commits into from
Apr 3, 2024
Merged

[CI FIx] Use Docker Compose V2 #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d48eed5
use docker compse v2
HonahX Apr 3, 2024
d336d03
more docker-compose to be updated
HonahX Apr 3, 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
2 changes: 1 addition & 1 deletion .github/workflows/python-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ jobs:
run: make test-integration
- name: Show debug logs
if: ${{ failure() }}
run: docker-compose -f dev/docker-compose.yml logs
run: docker compose -f dev/docker-compose.yml logs
22 changes: 11 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ test-s3:
poetry run pytest tests/ -m s3 ${PYTEST_ARGS}

test-integration:
docker-compose -f dev/docker-compose-integration.yml kill
docker-compose -f dev/docker-compose-integration.yml rm -f
docker-compose -f dev/docker-compose-integration.yml up -d
docker compose -f dev/docker-compose-integration.yml kill
docker compose -f dev/docker-compose-integration.yml rm -f
docker compose -f dev/docker-compose-integration.yml up -d
sleep 10
docker-compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
docker compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
poetry run pytest tests/ -v -m integration ${PYTEST_ARGS}

test-integration-rebuild:
docker-compose -f dev/docker-compose-integration.yml kill
docker-compose -f dev/docker-compose-integration.yml rm -f
docker-compose -f dev/docker-compose-integration.yml build --no-cache
docker compose -f dev/docker-compose-integration.yml kill
docker compose -f dev/docker-compose-integration.yml rm -f
docker compose -f dev/docker-compose-integration.yml build --no-cache

test-adlfs:
sh ./dev/run-azurite.sh
Expand All @@ -58,12 +58,12 @@ test-gcs:
poetry run pytest tests/ -m gcs ${PYTEST_ARGS}

test-coverage:
docker-compose -f dev/docker-compose-integration.yml kill
docker-compose -f dev/docker-compose-integration.yml rm -f
docker-compose -f dev/docker-compose-integration.yml up -d
docker compose -f dev/docker-compose-integration.yml kill
docker compose -f dev/docker-compose-integration.yml rm -f
docker compose -f dev/docker-compose-integration.yml up -d
sh ./dev/run-azurite.sh
sh ./dev/run-gcs-server.sh
docker-compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
docker compose -f dev/docker-compose-integration.yml exec -T spark-iceberg ipython ./provision.py
poetry run coverage run --source=pyiceberg/ -m pytest tests/ ${PYTEST_ARGS}
poetry run coverage report -m --fail-under=90
poetry run coverage html
Expand Down
4 changes: 2 additions & 2 deletions dev/run-azurite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ set -ex
if [ $(docker ps -q --filter "name=azurite" --filter "status=running" ) ]; then
echo "Azurite backend running"
else
docker-compose -f dev/docker-compose-azurite.yml kill
docker-compose -f dev/docker-compose-azurite.yml up -d
docker compose -f dev/docker-compose-azurite.yml kill
docker compose -f dev/docker-compose-azurite.yml up -d
while [ -z $(docker ps -q --filter "name=azurite" --filter "status=running" ) ]
do
echo "Waiting for Azurite"
Expand Down
4 changes: 2 additions & 2 deletions dev/run-gcs-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ set -ex
if [ $(docker ps -q --filter "name=gcs-server" --filter "status=running" ) ]; then
echo "Fake GCS Server running"
else
docker-compose -f dev/docker-compose-gcs-server.yml kill
docker-compose -f dev/docker-compose-gcs-server.yml up -d
docker compose -f dev/docker-compose-gcs-server.yml kill
docker compose -f dev/docker-compose-gcs-server.yml up -d
while [ -z $(docker ps -q --filter "name=gcs-server" --filter "status=running" ) ]
do
echo "Waiting for Fake GCS Server"
Expand Down
4 changes: 2 additions & 2 deletions dev/run-minio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ set -ex
if [ $(docker ps -q --filter "name=pyiceberg-minio" --filter "status=running" ) ]; then
echo "Minio backend running"
else
docker-compose -f dev/docker-compose.yml kill
docker-compose -f dev/docker-compose.yml up -d
docker compose -f dev/docker-compose.yml kill
docker compose -f dev/docker-compose.yml up -d
while [ -z $(docker ps -q --filter "name=pyiceberg-minio" --filter "status=running" ) ]
do
echo "Waiting for Minio"
Expand Down