From d075c64c765d0ec51c9679740c41f999160adf40 2020-05-05 23:49:00 From: Branko Majic Date: 2020-05-05 23:49:00 Subject: [PATCH] MAR-152: Drop support for Debian 8 Jessie from the mail_forwader role. --- diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 0020be1034224ff553f732493de2c3065403c25b..0e952823ddf11617a44788b85b8c0704bf380039 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -1311,7 +1311,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 8 (Jessie) - Debian 9 (Stretch) diff --git a/roles/mail_forwarder/molecule/default/molecule.yml b/roles/mail_forwarder/molecule/default/molecule.yml index d1aecfd9650a08002379b31e87e4dad4275ebd03..04b21eb3ae05ef0e77e5b26660d13318a9e8ce79 100644 --- a/roles/mail_forwarder/molecule/default/molecule.yml +++ b/roles/mail_forwarder/molecule/default/molecule.yml @@ -17,7 +17,7 @@ platforms: - name: mail-server groups: - mail-servers - box: debian/contrib-jessie64 + box: debian/contrib-stretch64 memory: 256 cpus: 1 interfaces: @@ -29,7 +29,7 @@ platforms: - name: client1 groups: - clients - box: debian/contrib-jessie64 + box: debian/contrib-stretch64 memory: 256 cpus: 1 interfaces: @@ -38,42 +38,6 @@ platforms: network_name: private_network type: static - - name: parameters-mandatory-jessie64 - groups: - - parameters-mandatory - box: debian/contrib-jessie64 - memory: 256 - cpus: 1 - interfaces: - - auto_config: true - ip: 10.31.127.20 - network_name: private_network - type: static - - - name: parameters-optional-jessie64 - groups: - - parameters-optional - box: debian/contrib-jessie64 - memory: 256 - cpus: 1 - interfaces: - - auto_config: true - ip: 10.31.127.21 - network_name: private_network - type: static - - - name: parameters-no-incoming-jessie64 - groups: - - parameters-no-incoming - box: debian/contrib-jessie64 - memory: 256 - cpus: 1 - interfaces: - - auto_config: true - ip: 10.31.127.22 - network_name: private_network - type: static - - name: parameters-mandatory-stretch64 groups: - parameters-mandatory diff --git a/roles/mail_forwarder/molecule/default/prepare.yml b/roles/mail_forwarder/molecule/default/prepare.yml index b4dbf17b1d43eaea73a941f62e5e3282f3074511..d03a7e104b95a78cc37fe3cba4de1b77124ccc4f 100644 --- a/roles/mail_forwarder/molecule/default/prepare.yml +++ b/roles/mail_forwarder/molecule/default/prepare.yml @@ -34,9 +34,6 @@ with_dict: 10.31.127.10: "mail-server domain1" 10.31.127.11: "client1" - 10.31.127.20: "parameters-mandatory-jessie64" - 10.31.127.21: "parameters-optional-jessie64" - 10.31.127.22: "parameters-no-incoming-jessie64" 10.31.127.30: "parameters-mandatory-stretch64" 10.31.127.31: "parameters-optional-stretch64" 10.31.127.32: "parameters-no-incoming-stretch64" diff --git a/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_client.py b/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_client.py index 93d5dc0e64b475b9a0c26c67926f4e0c1de03ebc..f76e85986311f8ab98643b6bf81f604e6694511f 100644 --- a/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_client.py +++ b/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_client.py @@ -15,18 +15,6 @@ def test_connectivity_from_client(host): with host.sudo(): - ping = host.run('hping3 -S -p 25 -c 1 parameters-mandatory-jessie64') - assert ping.rc != 0 - assert "100% packet loss" in ping.stderr - - ping = host.run('hping3 -S -p 25 -c 1 parameters-optional-jessie64') - assert ping.rc != 0 - assert "100% packet loss" in ping.stderr - - ping = host.run('hping3 -S -p 25 -c 1 parameters-no-incoming-jessie64') - assert "100% packet loss" in ping.stderr - assert ping.rc != 0 - ping = host.run('hping3 -S -p 25 -c 1 parameters-mandatory-stretch64') assert ping.rc != 0 assert "100% packet loss" in ping.stderr diff --git a/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_relay.py b/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_relay.py index 34618b6f0d5b03344bdc16b625bc153a6e7efc5b..04c0cc996cdab4f769718e06b3c6e4a06b1f4667 100644 --- a/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_relay.py +++ b/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_relay.py @@ -15,17 +15,6 @@ def test_connectivity_from_relay(host): with host.sudo(): - ping = host.run('hping3 -S -p 25 -c 1 parameters-mandatory-jessie64') - assert ping.rc != 0 - assert "100% packet loss" in ping.stderr - - ping = host.run('hping3 -S -p 25 -c 1 parameters-optional-jessie64') - assert ping.rc == 0 - - ping = host.run('hping3 -S -p 25 -c 1 parameters-no-incoming-jessie64') - assert "100% packet loss" in ping.stderr - assert ping.rc != 0 - ping = host.run('hping3 -S -p 25 -c 1 parameters-mandatory-stretch64') assert ping.rc != 0 assert "100% packet loss" in ping.stderr @@ -44,9 +33,6 @@ def test_mail_reception_from_relay(host): relay. """ - send = host.run('swaks --suppress-data --to root@parameters-optional-jessie64 --server parameters-optional-jessie64') - assert send.rc == 0 - send = host.run('swaks --suppress-data --to root@parameters-optional-stretch64 --server parameters-optional-stretch64') assert send.rc == 0 @@ -58,10 +44,6 @@ def test_open_relay(host): no_recipients_accepted = 24 - send = host.run('swaks --suppress-data --to root@client1 --server parameters-optional-jessie64') - assert send.rc == no_recipients_accepted - assert "Relay access denied" in send.stdout - send = host.run('swaks --suppress-data --to root@client1 --server parameters-optional-stretch64') assert send.rc == no_recipients_accepted assert "Relay access denied" in send.stdout