From 9323855daf567c366b8a6dedb6db62b78c11ce1b Mon Sep 17 00:00:00 2001
From: "Paul S. Schweigert" <paul@paulschweigert.com>
Date: Fri, 19 Jan 2024 15:35:14 -0500
Subject: [PATCH] remove jupyter container from notebook tests

Signed-off-by: Paul S. Schweigert <paul@paulschweigert.com>
---
 .github/workflows/docker-build.yaml | 21 +++++++++++++++------
 docker-compose-dev.yaml             | 13 -------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index d15029a91..4ac02badc 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -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: |
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
index cfc0a54c5..40a137596 100644
--- a/docker-compose-dev.yaml
+++ b/docker-compose-dev.yaml
@@ -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: