Merge pull request #1634 from mathbunnyru/asalikhov/test_all

Run tests on all children images

Author: mathbunnyru

.github/workflows/docker-amd64.yml

@@ -18,10 +18,8 @@ on:
       - "tensorflow-notebook/**"
 
       - "tagging/**"
-      - "test/**"
-      - "conftest.py"
+      - "tests/**"
       - "Makefile"
-      - "pytest.ini"
       - "requirements-dev.txt"
   push:
     branches:
@@ -40,10 +38,8 @@ on:
       - "tensorflow-notebook/**"
 
       - "tagging/**"
-      - "test/**"
-      - "conftest.py"
+      - "tests/**"
       - "Makefile"
-      - "pytest.ini"
       - "requirements-dev.txt"
   workflow_dispatch:
 

.github/workflows/docker.yml

@@ -18,10 +18,8 @@ on:
       - "tensorflow-notebook/**"
 
       - "tagging/**"
-      - "test/**"
-      - "conftest.py"
+      - "tests/**"
       - "Makefile"
-      - "pytest.ini"
       - "requirements-dev.txt"
   push:
     branches:
@@ -40,10 +38,8 @@ on:
       - "tensorflow-notebook/**"
 
       - "tagging/**"
-      - "test/**"
-      - "conftest.py"
+      - "tests/**"
       - "Makefile"
-      - "pytest.ini"
       - "requirements-dev.txt"
   workflow_dispatch:
 

Makefile

@@ -113,7 +113,7 @@ build-all-multi: $(foreach I, $(MULTI_IMAGES), build-multi/$(I)) $(foreach I, $(
 
 
 check-outdated/%: ## check the outdated mamba/conda packages in a stack and produce a report (experimental)
-	@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test/test_outdated.py
+	@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest tests/base-notebook/test_outdated.py
 check-outdated-all: $(foreach I, $(ALL_IMAGES), check-outdated/$(I)) ## check all the stacks for outdated packages
 
 
@@ -205,9 +205,8 @@ run-sudo-shell/%: ## run a bash in interactive mode as root in a stack
 
 
 
-test/%: ## run tests against a stack (only common tests or common tests + specific tests)
+test/%: ## run tests against a stack
 	@echo "::group::test/$(OWNER)/$(notdir $@)"
-	@if [ ! -d "$(notdir $@)/test" ]; then TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest --numprocesses=auto -m "not info" test; \
-	else TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest --numprocesses=auto -m "not info" test $(notdir $@)/test; fi
+	tests/run_tests.py --short-image-name "$(notdir $@)" --owner "$(OWNER)"
 	@echo "::endgroup::"
 test-all: $(foreach I, $(ALL_IMAGES), test/$(I)) ## test all stacks

all-spark-notebook/.dockerignore

@@ -1,3 +1,2 @@
 # Documentation
 README.md
-test

base-notebook/.dockerignore

@@ -1,3 +1,2 @@
 # Documentation
 README.md
-test

datascience-notebook/.dockerignore

@@ -1,3 +1,2 @@
 # Documentation
 README.md
-test

docs/contributing/tests.md

@@ -1,3 +1,2 @@
 # Documentation
 README.md
-test

minimal-notebook/.dockerignore

@@ -1,3 +1,2 @@
 # Documentation
 README.md
-test

pyspark-notebook/.dockerignore

@@ -1,3 +1,2 @@
 # Documentation
 README.md
-test