Skip to content

Commit 3eab8d5

Browse files
authored
Merge pull request #563 from bastelfreak/debian8
Drop EOL Debian 8
2 parents 744df5b + 18782f5 commit 3eab8d5

5 files changed

Lines changed: 2 additions & 13 deletions

File tree

.sync.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
docker_sets:
55
- set: ubuntu1604-64
66
- set: ubuntu1804-64
7-
- set: debian8-64
87
- set: debian9-64
98
- set: centos7-64
109
spec/spec_helper_acceptance.rb:

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ jobs:
3939
bundler_args: --without development release
4040
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1804-64 CHECK=beaker
4141
services: docker
42-
- rvm: 2.5.3
43-
bundler_args: --without development release
44-
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian8-64 CHECK=beaker
45-
services: docker
46-
- rvm: 2.5.3
47-
bundler_args: --without development release
48-
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian8-64 CHECK=beaker
49-
services: docker
5042
- rvm: 2.5.3
5143
bundler_args: --without development release
5244
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian9-64 CHECK=beaker

manifests/pyvenv.pp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
if ( $facts['os']['family'] == 'Debian') {
4848
$python3_venv_package="python${normalized_python_version}-venv"
4949
case $facts['os']['distro']['codename'] {
50-
'xenial','bionic','cosmic','disco',
51-
'jessie','stretch','buster': {
50+
'xenial','bionic','cosmic','disco','stretch','buster': {
5251
ensure_packages ($python3_venv_package)
5352
Package[$python3_venv_package] -> File[$venv_dir]
5453
}

metadata.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
{
3333
"operatingsystem": "Debian",
3434
"operatingsystemrelease": [
35-
"8",
3635
"9"
3736
]
3837
},

spec/defines/pyvenv_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
it { is_expected.to contain_file('/opt/env') }
1919
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') }
2020

21-
if %w[xenial bionic cosmic disco jessie stretch buster].include?(facts[:lsbdistcodename])
21+
if %w[xenial bionic cosmic disco stretch buster].include?(facts[:lsbdistcodename])
2222
it { is_expected.to contain_package('python3.5-venv').that_comes_before('File[/opt/env]') }
2323
end
2424
end

0 commit comments

Comments
 (0)