From 09718c59c3615ac43690c4643921485cc4a7fa01 Mon Sep 17 00:00:00 2001
From: David Barroso <dbarrosop@dravetech.com>
Date: Fri, 10 Apr 2020 10:00:44 +0200
Subject: [PATCH] removed plugins' tests

---
 .github/workflows/main.yaml |  3 ---
 Makefile                    | 19 ++++++++--------
 docker-compose.yaml         | 45 -------------------------------------
 3 files changed, 9 insertions(+), 58 deletions(-)
 delete mode 100644 docker-compose.yaml

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index a4ac8473..59d92d59 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -55,9 +55,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
           architecture: x64
 
-      - name: Start containers
-        run: docker-compose up -d
-
       - name: Install Poetry
         uses: dschep/install-poetry-action@v1.2
 
diff --git a/Makefile b/Makefile
index b7487bb8..90586e83 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,11 @@ DOCKER_COMPOSE_FILE=docker-compose.yaml
 DOCKER_COMPOSE=PYTHON=${PYTHON} docker-compose -f ${DOCKER_COMPOSE_FILE}
 NORNIR_DIRS=nornir tests docs
 
-.PHONY: start_dev_env
-start_dev_env:
-	${DOCKER_COMPOSE} \
-		up -d
+PYTHON:=3.7
 
-.PHONY: stop_dev_env
-stop_dev_env:
-	${DOCKER_COMPOSE} \
-		down
+.PHONY: docker
+docker:
+	docker build --build-arg PYTHON=$(PYTHON) -t nornir-dev:latest -f Dockerfile .
 
 .PHONY: pytest
 pytest:
@@ -36,10 +32,13 @@ mypy:
 .PHONY: nbval
 nbval:
 	poetry run pytest --nbval --sanitize-with docs/nbval_sanitize.cfg \
-		docs/plugins \
 		docs/howto \
 		docs/tutorials/intro/initializing_nornir.ipynb \
 		docs/tutorials/intro/inventory.ipynb
 
 .PHONY: tests
-tests: stop_dev_env start_dev_env black sphinx pylama mypy nbval pytest
+tests: black sphinx pylama mypy nbval pytest
+
+.PHONY: docker-tests
+docker-tests: docker
+	docker run --name nornir-tests --rm nornir-dev:latest make tests
diff --git a/docker-compose.yaml b/docker-compose.yaml
deleted file mode 100644
index 50d3096b..00000000
--- a/docker-compose.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-version: '2.1'
-
-services:
-    dev1.group_1:
-        hostname: dev1.group_1
-        image: dbarroso/stupid_ssh_container
-        ports:
-            - "65020:22"
-
-    dev2.group_1:
-        hostname: dev2.group_1
-        image: dbarroso/stupid_ssh_container
-        ports:
-            - "65021:22"
-
-    dev3.group_2:
-        hostname: dev3.group_2
-        image: dbarroso/stupid_ssh_container
-        ports:
-            - "65022:22"
-
-    dev4.group_2:
-        hostname: dev4.group_2
-        image: dbarroso/stupid_ssh_container
-        ports:
-            - "65023:22"
-
-    dev5.no_group:
-        hostname: dev5.no_group
-        image: dbarroso/stupid_ssh_container
-        ports:
-            - "65024:22"
-
-    netconf1.no_group:
-        hostname: netconf1.no_group
-        image: sysrepo/sysrepo-netopeer2:v0.7.7
-        ports:
-            - "65025:830"
-
-    httpbin:
-        hostname: httpbin
-        image: bungoume/httpbin-container
-        ports:
-            - "65080:80"