From 2508378617eeb86ade81077606eebf98dd7f00fc Mon Sep 17 00:00:00 2001
From: Tim Byrne <sultan@locehilios.com>
Date: Wed, 25 Sep 2019 23:12:59 -0500
Subject: [PATCH] Upgrade yadm testbed

* Update software in Dockerfile
* Add j2cli
* Bump supported versions of linters
---
 .travis.yml        |  4 ++--
 Dockerfile         |  9 +++++----
 Makefile           | 12 ++++++------
 docker-compose.yml |  2 +-
 test/conftest.py   |  6 +++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4b4efd4..3c2b8ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,6 @@ language: minimal
 services:
   - docker
 before_install:
-  - docker pull yadm/testbed:latest
+  - docker pull yadm/testbed:2019-09-25
 script:
-  - docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed
+  - docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed:2019-09-25
diff --git a/Dockerfile b/Dockerfile
index 985fc7c..be8ae09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,10 +28,11 @@ RUN \
   ;
 RUN pip3 install \
       envtpl \
-      flake8==3.5.0 \
-      pylint==1.9.2 \
-      pytest==3.6.4 \
-      yamllint==1.15.0 \
+      j2cli \
+      flake8==3.7.8 \
+      pylint==2.4.1 \
+      pytest==5.1.3 \
+      yamllint==1.17.0 \
     ;
 
 # Force GNUPG version 1 at path /usr/bin/gpg
diff --git a/Makefile b/Makefile
index 1242bfd..c6dbca2 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ testhost: require-docker
 		--hostname testhost \
 		--rm -it \
 		-v "/tmp/testhost:/bin/yadm:ro" \
-		yadm/testbed:latest \
+		yadm/testbed:2019-09-25 \
 		bash -l
 
 .PHONY: scripthost
@@ -124,7 +124,7 @@ scripthost: require-docker
 		--rm -it \
 		-v "$$PWD/script.gz:/script.gz:rw" \
 		-v "/tmp/testhost:/bin/yadm:ro" \
-		yadm/testbed:latest \
+		yadm/testbed:2019-09-25 \
 		bash -c "script /tmp/script -q -c 'bash -l'; gzip < /tmp/script > /script.gz"
 	@echo
 	@echo "Script saved to $$PWD/script.gz"
@@ -137,10 +137,10 @@ testenv:
 	virtualenv --python=python3 testenv
 	testenv/bin/pip3 install --upgrade pip setuptools
 	testenv/bin/pip3 install --upgrade \
-		flake8==3.5.0 \
-		pylint==1.9.2 \
-		pytest \
-		yamllint==1.15.0 \
+		flake8==3.7.8 \
+		pylint==2.4.1 \
+		pytest==5.1.3 \
+		yamllint==1.17.0 \
 	;
 	@echo
 	@echo 'To activate this test environment type:'
diff --git a/docker-compose.yml b/docker-compose.yml
index 4fe0b86..4936532 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,4 +4,4 @@ services:
   testbed:
     volumes:
       - .:/yadm:ro
-    image: yadm/testbed:latest
+    image: yadm/testbed:2019-09-25
diff --git a/test/conftest.py b/test/conftest.py
index 0b1f904..e263a69 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -19,19 +19,19 @@ def shellcheck_version():
 @pytest.fixture(scope='session')
 def pylint_version():
     """Version of pylint supported"""
-    return '1.9.2'
+    return '2.4.1'
 
 
 @pytest.fixture(scope='session')
 def flake8_version():
     """Version of flake8 supported"""
-    return '3.5.0'
+    return '3.7.8'
 
 
 @pytest.fixture(scope='session')
 def yamllint_version():
     """Version of yamllint supported"""
-    return '1.15.0'
+    return '1.17.0'
 
 
 @pytest.fixture(scope='session')