Skip to content

Commit a1b1d53

Browse files
authored
Merge pull request #124 from cisagov/maintenance/remove_support_for_debian_stretch
Remove support for Debian Stretch
2 parents be55684 + c5319d3 commit a1b1d53

File tree

4 files changed

+0
-88
lines changed

4 files changed

+0
-88
lines changed

meta/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ galaxy_info:
2020
- any
2121
- name: Debian
2222
versions:
23-
- stretch
2423
- buster
2524
- bullseye
2625
# Kali linux isn't an option here, but it is based on

molecule/default/Dockerfile_debian_9.j2

Lines changed: 0 additions & 12 deletions
This file was deleted.

molecule/default/molecule-no-systemd.yml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ platforms:
1919
- image: amazonlinux:2
2020
name: amazonlinux2
2121
platform: amd64
22-
- dockerfile: Dockerfile_debian_9.j2
23-
image: debian:stretch-slim
24-
name: debian9
25-
platform: amd64
2622
- image: debian:buster-slim
2723
name: debian10
2824
platform: amd64
@@ -50,37 +46,6 @@ platforms:
5046
- image: ubuntu:jammy
5147
name: ubuntu22
5248
platform: amd64
53-
provisioner:
54-
name: ansible
55-
inventory:
56-
host_vars:
57-
debian9:
58-
# auto_legacy is still the default behavior until Ansible 2.12
59-
# is released, but Molecule overrides this and forces the use
60-
# of auto.
61-
#
62-
# In auto_legacy mode Ansible will prefer the /usr/bin/python
63-
# interpreter if it exists, while in auto mode it will prefer
64-
# the Python interpreter specified in an internal map. In
65-
# most cases we only have Python3 installed, and the internal
66-
# map specifies /usr/bin/python3, so it is immaterial whether
67-
# we use auto_legacy or auto.
68-
#
69-
# The one place where it _does_ matter is our Debian9 AKA CyHy
70-
# instances. Here the /usr/bin/python _and_ /usr/bin/python3
71-
# interpreters are both installed. In Ansible 2.10 a Debian
72-
# entry was added to the internal map, so now auto_legacy
73-
# selects the /usr/bin/python interpreter while auto selects
74-
# the /usr/bin/python3 interpreter. We want to maintain the
75-
# auto_legacy behavior in this case since CyHy is still
76-
# Python2.
77-
#
78-
# See:
79-
# * https://github.com/ansible-community/molecule/blob/3.0.8/molecule/provisioner/ansible.py#L389
80-
# * https://docs.ansible.com/ansible/latest/reference_appendices/interpreter_discovery.html#interpreter-discovery
81-
# * https://github.com/ansible/ansible/blob/v2.10.1/lib/ansible/config/base.yml#L1492-L1542
82-
# * https://github.com/ansible/ansible/blob/v2.10.1/lib/ansible/executor/interpreter_discovery.py
83-
ansible_python_interpreter: auto_legacy
8449
scenario:
8550
name: default
8651
verifier:

molecule/default/molecule-with-systemd.yml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ platforms:
2424
privileged: yes
2525
volumes:
2626
- /sys/fs/cgroup:/sys/fs/cgroup:rw
27-
- cgroupns_mode: host
28-
command: /lib/systemd/systemd
29-
image: geerlingguy/docker-debian9-ansible:latest
30-
name: debian9-systemd
31-
platform: amd64
32-
pre_build_image: yes
33-
privileged: yes
34-
volumes:
35-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
3627
- cgroupns_mode: host
3728
command: /lib/systemd/systemd
3829
image: geerlingguy/docker-debian10-ansible:latest
@@ -114,37 +105,6 @@ platforms:
114105
privileged: yes
115106
volumes:
116107
- /sys/fs/cgroup:/sys/fs/cgroup:rw
117-
provisioner:
118-
name: ansible
119-
inventory:
120-
host_vars:
121-
debian9-systemd:
122-
# auto_legacy is still the default behavior until Ansible 2.12
123-
# is released, but Molecule overrides this and forces the use
124-
# of auto.
125-
#
126-
# In auto_legacy mode Ansible will prefer the /usr/bin/python
127-
# interpreter if it exists, while in auto mode it will prefer
128-
# the Python interpreter specified in an internal map. In
129-
# most cases we only have Python3 installed, and the internal
130-
# map specifies /usr/bin/python3, so it is immaterial whether
131-
# we use auto_legacy or auto.
132-
#
133-
# The one place where it _does_ matter is our Debian9 AKA CyHy
134-
# instances. Here the /usr/bin/python _and_ /usr/bin/python3
135-
# interpreters are both installed. In Ansible 2.10 a Debian
136-
# entry was added to the internal map, so now auto_legacy
137-
# selects the /usr/bin/python interpreter while auto selects
138-
# the /usr/bin/python3 interpreter. We want to maintain the
139-
# auto_legacy behavior in this case since CyHy is still
140-
# Python2.
141-
#
142-
# See:
143-
# * https://github.com/ansible-community/molecule/blob/3.0.8/molecule/provisioner/ansible.py#L389
144-
# * https://docs.ansible.com/ansible/latest/reference_appendices/interpreter_discovery.html#interpreter-discovery
145-
# * https://github.com/ansible/ansible/blob/v2.10.1/lib/ansible/config/base.yml#L1492-L1542
146-
# * https://github.com/ansible/ansible/blob/v2.10.1/lib/ansible/executor/interpreter_discovery.py
147-
ansible_python_interpreter: auto_legacy
148108
scenario:
149109
name: default
150110
verifier:

0 commit comments

Comments
 (0)