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.

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

Remove jupyter container from notebook tests #1176

Merged
merged 3 commits into from
Jan 19, 2024
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
1 change: 0 additions & 1 deletion .github/workflows/build-containers-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
matrix:
dockerfile:
- Dockerfile-ray-node
- Dockerfile-notebook
- repository/Dockerfile
- gateway/Dockerfile
python:
Expand Down
21 changes: 15 additions & 6 deletions .github/workflows/docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,32 @@ name: Docker notebook tests
on:
pull_request:
branches: [ main ]

jobs:
tests:
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the containers
run: docker compose -f docker-compose-dev.yaml --profile jupyter build
run: docker compose -f docker-compose-dev.yaml build
- name: Run the jupyter profile
run: docker compose -f docker-compose-dev.yaml --profile jupyter up -d
run: docker compose -f docker-compose-dev.yaml up -d
- name: Give containers time to initialize
shell: bash
run: sleep 90
- name: Test notebooks in the docker environment
- uses: actions/setup-python@v5
with:
python-version: '3.9'
- name: install dependencies
shell: bash
run: pip install client/ && pip install nbmake pytest
- name: Run basic notebooks
shell: bash
run: pytest --nbmake docs/getting_started/basic/
- name: Run experimental notebooks
shell: bash
run: docker exec qs-jupyter "bash" "-c" "pip install nbmake pytest && pytest --nbmake --ignore=/home/jovyan/serverless/guides/07_working_with_datasets.ipynb /home/jovyan/serverless/"
run: pytest --nbmake docs/getting_started/experimental/
- name: Dump logs on failure
if: ${{ failure() }}
run: |
Expand Down
32 changes: 0 additions & 32 deletions Dockerfile-notebook

This file was deleted.

13 changes: 0 additions & 13 deletions docker-compose-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
# compose config for running images based on local files
services:
jupyter:
container_name: qs-jupyter
build:
context: ./
dockerfile: Dockerfile-notebook
profiles: ["jupyter", "full"]
ports:
- 8888:8888
environment:
- JUPYTER_TOKEN=123
- GATEWAY_HOST=http://gateway:8000
networks:
- safe-tier
ray-head:
container_name: ray-head
build:
Expand Down