Upgrade yadm testbed

* Update software in Dockerfile
* Add j2cli
* Bump supported versions of linters
This commit is contained in:
Tim Byrne 2019-09-25 23:12:59 -05:00
parent cfda485b34
commit 2508378617
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
5 changed files with 17 additions and 16 deletions

View File

@ -3,6 +3,6 @@ language: minimal
services: services:
- docker - docker
before_install: before_install:
- docker pull yadm/testbed:latest - docker pull yadm/testbed:2019-09-25
script: script:
- docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed - docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed:2019-09-25

View File

@ -28,10 +28,11 @@ RUN \
; ;
RUN pip3 install \ RUN pip3 install \
envtpl \ envtpl \
flake8==3.5.0 \ j2cli \
pylint==1.9.2 \ flake8==3.7.8 \
pytest==3.6.4 \ pylint==2.4.1 \
yamllint==1.15.0 \ pytest==5.1.3 \
yamllint==1.17.0 \
; ;
# Force GNUPG version 1 at path /usr/bin/gpg # Force GNUPG version 1 at path /usr/bin/gpg

View File

@ -107,7 +107,7 @@ testhost: require-docker
--hostname testhost \ --hostname testhost \
--rm -it \ --rm -it \
-v "/tmp/testhost:/bin/yadm:ro" \ -v "/tmp/testhost:/bin/yadm:ro" \
yadm/testbed:latest \ yadm/testbed:2019-09-25 \
bash -l bash -l
.PHONY: scripthost .PHONY: scripthost
@ -124,7 +124,7 @@ scripthost: require-docker
--rm -it \ --rm -it \
-v "$$PWD/script.gz:/script.gz:rw" \ -v "$$PWD/script.gz:/script.gz:rw" \
-v "/tmp/testhost:/bin/yadm:ro" \ -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" bash -c "script /tmp/script -q -c 'bash -l'; gzip < /tmp/script > /script.gz"
@echo @echo
@echo "Script saved to $$PWD/script.gz" @echo "Script saved to $$PWD/script.gz"
@ -137,10 +137,10 @@ testenv:
virtualenv --python=python3 testenv virtualenv --python=python3 testenv
testenv/bin/pip3 install --upgrade pip setuptools testenv/bin/pip3 install --upgrade pip setuptools
testenv/bin/pip3 install --upgrade \ testenv/bin/pip3 install --upgrade \
flake8==3.5.0 \ flake8==3.7.8 \
pylint==1.9.2 \ pylint==2.4.1 \
pytest \ pytest==5.1.3 \
yamllint==1.15.0 \ yamllint==1.17.0 \
; ;
@echo @echo
@echo 'To activate this test environment type:' @echo 'To activate this test environment type:'

View File

@ -4,4 +4,4 @@ services:
testbed: testbed:
volumes: volumes:
- .:/yadm:ro - .:/yadm:ro
image: yadm/testbed:latest image: yadm/testbed:2019-09-25

View File

@ -19,19 +19,19 @@ def shellcheck_version():
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def pylint_version(): def pylint_version():
"""Version of pylint supported""" """Version of pylint supported"""
return '1.9.2' return '2.4.1'
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def flake8_version(): def flake8_version():
"""Version of flake8 supported""" """Version of flake8 supported"""
return '3.5.0' return '3.7.8'
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def yamllint_version(): def yamllint_version():
"""Version of yamllint supported""" """Version of yamllint supported"""
return '1.15.0' return '1.17.0'
@pytest.fixture(scope='session') @pytest.fixture(scope='session')