diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 4d370df04bc55945d6cdad192a2e36f097b36568..18d8429cd66bc39ef73ee324991803b868192ca0 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -494,7 +494,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 10 (Buster) - Debian 11 (Bullseye) diff --git a/roles/common/meta/main.yml b/roles/common/meta/main.yml index eb25e69fc0971b0aaa1cf7d1a924af95525813e3..c73a6fa97a74eb0ba5e19f7db0c8eaddad2d7527 100644 --- a/roles/common/meta/main.yml +++ b/roles/common/meta/main.yml @@ -22,5 +22,4 @@ galaxy_info: platforms: - name: Debian versions: - - 10 - 11 diff --git a/roles/common/molecule/default/molecule.yml b/roles/common/molecule/default/molecule.yml index 607785e41f9bea17b69a238a8d97ed0d868c2122..63073c4e1ce258359364344926b2c81c53d8d451 100644 --- a/roles/common/molecule/default/molecule.yml +++ b/roles/common/molecule/default/molecule.yml @@ -55,34 +55,6 @@ platforms: network_name: private_network type: static - - name: parameters-mandatory-buster - groups: - - parameters-mandatory - box: debian/contrib-buster64 - memory: 256 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.21 - network_name: private_network - type: static - - - name: parameters-optional-buster - groups: - - parameters-optional - box: debian/contrib-buster64 - memory: 256 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.22 - network_name: private_network - type: static - - name: parameters-mandatory-bullseye groups: - parameters-mandatory diff --git a/roles/common/molecule/default/prepare.yml b/roles/common/molecule/default/prepare.yml index 0bf7d7ad994059b3db60d82e29df91ccec5a4ef1..26e612e2d4cde04e31db5765783029c4310c79f7 100644 --- a/roles/common/molecule/default/prepare.yml +++ b/roles/common/molecule/default/prepare.yml @@ -70,8 +70,6 @@ mode: 0644 state: present with_dict: - 192.168.56.21: parameters-mandatory-buster - 192.168.56.22: parameters-optional-buster 192.168.56.31: parameters-mandatory-bullseye 192.168.56.32: parameters-optional-bullseye diff --git a/roles/common/molecule/default/tests/test_default.py b/roles/common/molecule/default/tests/test_default.py index 457da09a961fc8a1ff8fadacb20020fa57c1bb4f..e9e79a64e361564a811284d68034b1ba29741959 100644 --- a/roles/common/molecule/default/tests/test_default.py +++ b/roles/common/molecule/default/tests/test_default.py @@ -339,7 +339,8 @@ def test_pipreqcheck_virtualenv_packages(host, pip_path, expected_packages): actual_packages = sorted(packages.stdout.lower().strip().split("\n")) # This is a dummy distro-provided package ignored by the - # pip-tools. pkg-resources on Buster, pkg_resources on Bullseye. + # pip-tools. pkg-resources for Python 2.7, pkg_resources for + # Python 3. if "pkg-resources==0.0.0" in actual_packages: actual_packages.remove("pkg-resources==0.0.0") if "pkg_resources==0.0.0" in actual_packages: diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 0333dba87d8d4fd00c63c84a52d186344cb4a177..bc684a8ae7ade2cd0139dde8562ed8395e398580 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -80,9 +80,8 @@ owner: root group: root mode: 0640 - # Checksums: buster, bullseye + # Checksums: bullseye when: | - root_bashrc_stat.stat.checksum == "b737c392222ddac2271cc8d0d8cc0308d08cf458" or root_bashrc_stat.stat.checksum == "1a422a148ad225aa5ba33f8dafd2b7cfcdbd701f" - name: Install sudo