Changeset - d075c64c765d
[Not reviewed]
0 5 0
Branko Majic (branko) - 4 years ago 2020-05-05 23:49:00
branko@majic.rs
MAR-152: Drop support for Debian 8 Jessie from the mail_forwader role.
5 files changed with 2 insertions and 72 deletions:
0 comments (0 inline, 0 general)
docs/rolereference.rst
Show inline comments
 
@@ -1311,7 +1311,6 @@ Distribution compatibility
 

	
 
Role is compatible with the following distributions:
 

	
 
- Debian 8 (Jessie)
 
- Debian 9 (Stretch)
 

	
 

	
roles/mail_forwarder/molecule/default/molecule.yml
Show inline comments
 
@@ -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
roles/mail_forwarder/molecule/default/prepare.yml
Show inline comments
 
@@ -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"
roles/mail_forwarder/molecule/default/tests/test_connectivity_from_client.py
Show inline comments
 
@@ -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
roles/mail_forwarder/molecule/default/tests/test_connectivity_from_relay.py
Show inline comments
 
@@ -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
0 comments (0 inline, 0 general)