Changeset - c5f613cafb67
[Not reviewed]
0 6 0
Branko Majic (branko) - 2 months ago 2024-02-10 13:28:36
branko@majic.rs
MAR-191: Drop support for Debian 10 Buster from the common role:

- Fix incorrect comment on the pkg-resources/pkg_resources package as
well - this one is not distro-dependent.
6 files changed with 3 insertions and 35 deletions:
0 comments (0 inline, 0 general)
docs/rolereference.rst
Show inline comments
 
@@ -494,7 +494,6 @@ Distribution compatibility
 

	
 
Role is compatible with the following distributions:
 

	
 
- Debian 10 (Buster)
 
- Debian 11 (Bullseye)
 

	
 

	
roles/common/meta/main.yml
Show inline comments
 
@@ -22,5 +22,4 @@ galaxy_info:
 
  platforms:
 
    - name: Debian
 
      versions:
 
        - 10
 
        - 11
roles/common/molecule/default/molecule.yml
Show inline comments
 
@@ -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
roles/common/molecule/default/prepare.yml
Show inline comments
 
@@ -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
 

	
roles/common/molecule/default/tests/test_default.py
Show inline comments
 
@@ -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:
roles/common/tasks/main.yml
Show inline comments
 
@@ -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
0 comments (0 inline, 0 general)