From f2aee942cadf7af9d8ab0ad9b24228e711894943 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 12 Sep 2020 20:28:12 +0200 Subject: [PATCH] Drop EOL Debian 8 --- .sync.yml | 1 - .travis.yml | 8 -------- manifests/pyvenv.pp | 3 +-- metadata.json | 1 - spec/defines/pyvenv_spec.rb | 2 +- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.sync.yml b/.sync.yml index 68741032..57c710b5 100644 --- a/.sync.yml +++ b/.sync.yml @@ -4,7 +4,6 @@ docker_sets: - set: ubuntu1604-64 - set: ubuntu1804-64 - - set: debian8-64 - set: debian9-64 - set: centos7-64 spec/spec_helper_acceptance.rb: diff --git a/.travis.yml b/.travis.yml index b8ba2d89..45f5db54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,14 +39,6 @@ jobs: bundler_args: --without development release env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1804-64 CHECK=beaker services: docker - - rvm: 2.5.3 - bundler_args: --without development release - env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian8-64 CHECK=beaker - services: docker - - rvm: 2.5.3 - bundler_args: --without development release - env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian8-64 CHECK=beaker - services: docker - rvm: 2.5.3 bundler_args: --without development release env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian9-64 CHECK=beaker diff --git a/manifests/pyvenv.pp b/manifests/pyvenv.pp index 8b8d59d5..5b0c91f3 100644 --- a/manifests/pyvenv.pp +++ b/manifests/pyvenv.pp @@ -47,8 +47,7 @@ if ( $facts['os']['family'] == 'Debian') { $python3_venv_package="python${normalized_python_version}-venv" case $facts['os']['distro']['codename'] { - 'xenial','bionic','cosmic','disco', - 'jessie','stretch','buster': { + 'xenial','bionic','cosmic','disco','stretch','buster': { ensure_packages ($python3_venv_package) Package[$python3_venv_package] -> File[$venv_dir] } diff --git a/metadata.json b/metadata.json index a4896b3c..80701c0e 100644 --- a/metadata.json +++ b/metadata.json @@ -32,7 +32,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "8", "9" ] }, diff --git a/spec/defines/pyvenv_spec.rb b/spec/defines/pyvenv_spec.rb index aee88e8a..36452839 100644 --- a/spec/defines/pyvenv_spec.rb +++ b/spec/defines/pyvenv_spec.rb @@ -18,7 +18,7 @@ it { is_expected.to contain_file('/opt/env') } it { is_expected.to contain_exec('python_virtualenv_/opt/env').with_command('pyvenv-3.5 --clear /opt/env && /opt/env/bin/pip --log /opt/env/pip.log install --upgrade pip && /opt/env/bin/pip --log /opt/env/pip.log install --upgrade setuptools') } - if %w[xenial bionic cosmic disco jessie stretch buster].include?(facts[:lsbdistcodename]) + if %w[xenial bionic cosmic disco stretch buster].include?(facts[:lsbdistcodename]) it { is_expected.to contain_package('python3.5-venv').that_comes_before('File[/opt/env]') } end end