diff --git a/docs/rolereference.rst b/docs/rolereference.rst index faf41a9db2018a9b01ff72245b7883fb7c816368..c1fa5f4562122854d3b253475aa91176526d8065 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -436,14 +436,6 @@ Parameters ``pip-tools`` and related packages are coming out. For Python 2, see the dedicatd parameter ``pip_check_requirements`` above. - Take note that on Debian Jessie and Stretch there will be - differences in what the system uses because of differing Python 3 - versions and deprecation around Python 3 minor version releases. The - listed defaults are conservative on the side of being usable on both - Debian Jessie and Debian Stretch as of time of this writing. For - Debian Stretch machines you will most likely end up updating the - list almost immediatelly. - **pipreqcheck_uid** (integer, optional, ``whatever OS picks``) UID for user running the pip requirements upgrade checks. User is created with name ``pipreqcheck``. @@ -474,7 +466,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 8 (Jessie) - Debian 9 (Stretch) diff --git a/roles/common/molecule/default/group_vars/parameters-optional.yml b/roles/common/molecule/default/group_vars/parameters-optional.yml index 23aa5cd33714bdcb21712593ef6ee85264e28502..0dcfd196da82e0f423d63c46189619672c1522ee 100644 --- a/roles/common/molecule/default/group_vars/parameters-optional.yml +++ b/roles/common/molecule/default/group_vars/parameters-optional.yml @@ -31,8 +31,7 @@ os_groups: common_packages: - units - gnutls-bin - - "{{ 'libmariadb-client-lgpl-dev-compat' if ansible_distribution_release == 'jessie' - else 'libmariadbclient-dev-compat' if ansible_distribution_release == 'stretch' }}" + - libmariadbclient-dev-compat - emacs24-nox ca_certificates: cacert1: "{{ lookup('file', 'tests/data/x509/ca1.cert.pem') }}" diff --git a/roles/common/molecule/default/molecule.yml b/roles/common/molecule/default/molecule.yml index fc1fd8f3adb1971252bf40d9ba4ff83de2bb3a43..7d05105c236af91314c6e7d383aefe71e656d9ba 100644 --- a/roles/common/molecule/default/molecule.yml +++ b/roles/common/molecule/default/molecule.yml @@ -14,7 +14,7 @@ lint: platforms: - name: helper - box: debian/contrib-jessie64 + box: debian/contrib-stretch64 memory: 512 cpus: 1 interfaces: @@ -23,30 +23,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.3 - 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.4 - network_name: private_network - type: static - - name: parameters-mandatory-stretch64 groups: - parameters-mandatory diff --git a/roles/common/molecule/default/tests/test_parameters_mandatory.py b/roles/common/molecule/default/tests/test_parameters_mandatory.py index 8d40e530704cfc33b942d86f8282e0e18d8006e0..325e454aa2a79ccf6a38204088c1255c25724216 100644 --- a/roles/common/molecule/default/tests/test_parameters_mandatory.py +++ b/roles/common/molecule/default/tests/test_parameters_mandatory.py @@ -50,18 +50,6 @@ def test_ssh_login_mechanisms(host): assert err.allowed_types == ['publickey'] -def test_mariadb_mysql_config_symlink(host): - """ - Tests if symbolic link has been set-up for mariadb_config binary to be - accessible as mysql_config as well. (should not be present with just - mandatory options set). - """ - - mysql_config = host.file('/usr/bin/mysql_config') - - assert not mysql_config.exists - - def test_emacs_electric_indent_mode(host): """ Tests if Emacs electric indent mode has been disabled via custom diff --git a/roles/common/molecule/default/tests/test_parameters_optional.py b/roles/common/molecule/default/tests/test_parameters_optional.py index 2044e34ea6e49625bcc199d30a46132d8bb959ec..6b730003f8bcf320a56a42e381f027be9d7ee728 100644 --- a/roles/common/molecule/default/tests/test_parameters_optional.py +++ b/roles/common/molecule/default/tests/test_parameters_optional.py @@ -41,18 +41,9 @@ def test_common_installed_packages_common(host): Tests that user-provided common packages have been installed. """ - debian_release = host.ansible("setup")["ansible_facts"]["ansible_distribution_release"] - assert host.package('units').is_installed assert host.package('gnutls-bin').is_installed - - # Different name of package in different Debian releases. - if debian_release == 'jessie': - assert host.package('libmariadb-client-lgpl-dev-compat').is_installed - elif debian_release == 'stretch': - assert host.package('libmariadbclient-dev-compat').is_installed - else: - raise Exception("Cannot run this test on debian release: %s" % debian_release) + assert host.package('libmariadbclient-dev-compat').is_installed def test_ssh_login_mechanisms(host): @@ -75,21 +66,6 @@ def test_ssh_login_mechanisms(host): assert err.allowed_types == ['publickey'] -def test_mariadb_mysql_config_symlink(host): - """ - Tests if symbolic link has been set-up for mariadb_config binary to be - accessible as mysql_config as well. - - Only applicable to Debian Jessie. - """ - - if host.ansible("setup")["ansible_facts"]["ansible_distribution_release"] == 'jessie': - mysql_config = host.file('/usr/bin/mysql_config') - - assert mysql_config.is_symlink - assert mysql_config.linked_to == '/usr/bin/mariadb_config' - - def test_emacs_electric_indent_mode(host): """ Tests if Emacs electric indent mode has been disabled via custom diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 3da852f28b682b76a767cb082b2c1866c431dafd..6955bbaead75c03b5ee1859b33113382a7ce9c49 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -102,13 +102,6 @@ name: "{{ common_packages }}" state: "present" -- name: Set-up MariaDB mysql_config symbolic link for compatibility (workaround for Debian bug 766996) - file: - src: "/usr/bin/mariadb_config" - dest: "/usr/bin/mysql_config" - state: link - when: "'libmariadb-client-lgpl-dev-compat' in common_packages and ansible_distribution_release == 'jessie'" - - name: Disable electric-indent-mode for Emacs by default for all users copy: src: "01disable-electric-indent-mode.el"