Update CI images to use debian bullseye and alpine 3.14

Author: philpep

images/alpine/Dockerfile

@@ -1,6 +1,6 @@
-FROM alpine:3.11
+FROM alpine:3.14
 
-RUN apk add --update --no-cache python openrc openssh && \
+RUN apk add --update --no-cache python3 openrc openssh && \
     sed -i "s/^#PermitRootLogin prohibit-password/PermitRootLogin without-password/g" /etc/ssh/sshd_config && \
     rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_rsa_key && \
     ssh-keygen -q -N "" -t dsa -f /etc/ssh/ssh_host_ecdsa_key && \

images/debian_buster/Dockerfile renamed to images/debian_bullseye/Dockerfile

@@ -1,12 +1,12 @@
-FROM debian:buster
+FROM debian:bullseye
 
 ENV container docker
 
 # ntpd is linked to /bin/false, so the service is not running but is enabled
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
     lsb-release \
-    python \
+    python3 \
     openssh-server \
     puppet \
     salt-minion \
@@ -15,8 +15,9 @@ RUN apt-get update && \
     sudo \
     supervisor \
     systemd-sysv \
-    python-pip \
-    python-virtualenv \
+    virtualenv \
+    iproute2 \
+    iputils-ping \
     iptables \
     iptables-persistent && \
     rm -rf /var/lib/apt/lists/*
@@ -33,7 +34,7 @@ RUN mkdir -p /var/run/sshd && \
     systemctl enable supervisor.service && \
     systemctl enable netfilter-persistent.service && \
     ln -fsn /bin/false /usr/sbin/ntpd && \
-    echo "python hold" | dpkg --set-selections && \
+    echo "python3 hold" | dpkg --set-selections && \
     echo "LANG=fr_FR.ISO-8859-15" > /etc/default/locale && \
     echo "LANGUAGE=fr_FR" >> /etc/default/locale && \
     echo "fr_FR.ISO-8859-15 ISO-8859-15" >> /etc/locale.gen && \
@@ -65,8 +66,8 @@ RUN echo "*nat\n:PREROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0
 # Expiration date for user "user"
 RUN chage -E 20000 user
 
-# Some python virtualenv
-RUN python -m virtualenv /v && /v/bin/pip install 'pytest>2,<3'
+# Some python3 virtualenv
+RUN virtualenv /v && /v/bin/pip install 'pytest>5,<6'
 
 ENV LANG fr_FR.ISO-8859-15
 ENV LANGUAGE fr_FR

test/conftest.py

@@ -58,7 +58,7 @@ def has_docker():
     "alpine",
     "archlinux",
     "centos_7",
-    "debian_buster",
+    "debian_bullseye",
     "ubuntu_xenial",
 ]
 
@@ -215,7 +215,7 @@ def pytest_generate_tests(metafunc):
                 break
         else:
             # Default
-            hosts = ["docker://debian_buster"]
+            hosts = ["docker://debian_bullseye"]
         metafunc.parametrize("host", hosts, indirect=True, scope="function")
 
 

test/test_backends.py

@@ -23,36 +23,36 @@
 from testinfra.utils.ansible_runner import AnsibleRunner
 
 HOSTS = [
-    "ssh://debian_buster",
-    "safe-ssh://debian_buster",
-    "docker://debian_buster",
-    "paramiko://debian_buster",
-    "ansible://debian_buster",
-    "ansible://debian_buster?force_ansible=True",
+    "ssh://debian_bullseye",
+    "safe-ssh://debian_bullseye",
+    "docker://debian_bullseye",
+    "paramiko://debian_bullseye",
+    "ansible://debian_bullseye",
+    "ansible://debian_bullseye?force_ansible=True",
 ]
 USER_HOSTS = [
-    "ssh://user@debian_buster",
-    "safe-ssh://user@debian_buster",
-    "docker://user@debian_buster",
-    "paramiko://user@debian_buster",
-    "ansible://user@debian_buster",
-    "ansible://user@debian_buster?force_ansible=True",
+    "ssh://user@debian_bullseye",
+    "safe-ssh://user@debian_bullseye",
+    "docker://user@debian_bullseye",
+    "paramiko://user@debian_bullseye",
+    "ansible://user@debian_bullseye",
+    "ansible://user@debian_bullseye?force_ansible=True",
 ]
 SUDO_HOSTS = [
-    "ssh://user@debian_buster?sudo=True",
-    "safe-ssh://user@debian_buster?sudo=True",
-    "docker://user@debian_buster?sudo=True",
-    "paramiko://user@debian_buster?sudo=True",
-    "ansible://user@debian_buster?sudo=True",
-    "ansible://user@debian_buster?force_ansible=True&sudo=True",
+    "ssh://user@debian_bullseye?sudo=True",
+    "safe-ssh://user@debian_bullseye?sudo=True",
+    "docker://user@debian_bullseye?sudo=True",
+    "paramiko://user@debian_bullseye?sudo=True",
+    "ansible://user@debian_bullseye?sudo=True",
+    "ansible://user@debian_bullseye?force_ansible=True&sudo=True",
 ]
 SUDO_USER_HOSTS = [
-    "ssh://debian_buster?sudo=True&sudo_user=user",
-    "safe-ssh://debian_buster?sudo=True&sudo_user=user",
-    "docker://debian_buster?sudo=True&sudo_user=user",
-    "paramiko://debian_buster?sudo=True&sudo_user=user",
-    "ansible://debian_buster?sudo=True&sudo_user=user",
-    "ansible://debian_buster?force_ansible=True&sudo=True&sudo_user=user",
+    "ssh://debian_bullseye?sudo=True&sudo_user=user",
+    "safe-ssh://debian_bullseye?sudo=True&sudo_user=user",
+    "docker://debian_bullseye?sudo=True&sudo_user=user",
+    "paramiko://debian_bullseye?sudo=True&sudo_user=user",
+    "ansible://debian_bullseye?sudo=True&sudo_user=user",
+    "ansible://debian_bullseye?force_ansible=True&sudo=True&sudo_user=user",
 ]
 
 
@@ -75,7 +75,7 @@ def test_command(host):
 
 @pytest.mark.testinfra_hosts(*HOSTS)
 def test_encoding(host):
-    # buster image is fr_FR@ISO-8859-15
+    # bullseye image is fr_FR@ISO-8859-15
     cmd = host.run("ls -l %s", "/é")
     if host.backend.get_connection_type() == "docker":
         # docker bug ?
@@ -99,7 +99,7 @@ def test_encoding(host):
         )
 
 
-@pytest.mark.testinfra_hosts("ansible://debian_buster?force_ansible=True")
+@pytest.mark.testinfra_hosts("ansible://debian_bullseye?force_ansible=True")
 def test_ansible_any_error_fatal(host):
     os.environ["ANSIBLE_ANY_ERRORS_FATAL"] = "True"
     try:

test/test_modules.py

@@ -31,7 +31,7 @@
             "alpine",
             "archlinux",
             "centos_7",
-            "debian_buster",
+            "debian_bullseye",
             "ubuntu_xenial",
         )
     ]
@@ -51,16 +51,16 @@ def test_package(host, docker_image):
         "alpine": "8.",
         "archlinux": "8.",
         "centos_7": "7.",
-        "debian_buster": "1:7.9",
+        "debian_bullseye": "1:8.4",
         "ubuntu_xenial": "1:7.2",
     }[docker_image]
     assert ssh.is_installed
     assert ssh.version.startswith(version)
     release = {
-        "alpine": "r0",
+        "alpine": "r2",
         "archlinux": None,
         "centos_7": ".el7",
-        "debian_buster": None,
+        "debian_bullseye": None,
         "ubuntu_xenial": None,
     }[docker_image]
     if release is None:
@@ -71,9 +71,9 @@ def test_package(host, docker_image):
 
 
 def test_held_package(host):
-    python = host.package("python")
+    python = host.package("python3")
     assert python.is_installed
-    assert python.version.startswith("2.7.")
+    assert python.version.startswith("3.9.")
 
 
 @pytest.mark.testinfra_hosts("docker://centos_7")
@@ -95,7 +95,7 @@ def test_uninstalled_package_version(host):
         host.package("sudo").version
     assert (
         "The package sudo is not installed, dpkg-query output: "
-        "deinstall ok config-files 1.8."
+        "deinstall ok config-files 1.9."
     ) in str(excinfo.value)
 
 
@@ -104,10 +104,10 @@ def test_systeminfo(host, docker_image):
     assert host.system_info.type == "linux"
 
     release, distribution, codename, arch = {
-        "alpine": (r"^3\.11\.", "alpine", None, "x86_64"),
+        "alpine": (r"^3\.14\.", "alpine", None, "x86_64"),
         "archlinux": ("rolling", "arch", None, "x86_64"),
         "centos_7": (r"^7$", "centos", None, "x86_64"),
-        "debian_buster": (r"^10", "debian", "buster", "x86_64"),
+        "debian_bullseye": (r"^11", "debian", "bullseye", "x86_64"),
         "ubuntu_xenial": (r"^16\.04$", "ubuntu", "xenial", "x86_64"),
     }[docker_image]
 
@@ -178,16 +178,16 @@ def test_service(host, name, running, enabled):
 
 def test_salt(host):
     ssh_version = host.salt("pkg.version", "openssh-server", local=True)
-    assert ssh_version.startswith("1:7.9")
+    assert ssh_version.startswith("1:8.4")
 
 
 def test_puppet_resource(host):
     resource = host.puppet_resource("package", "openssh-server")
-    assert resource["openssh-server"]["ensure"].startswith("1:7.9")
+    assert resource["openssh-server"]["ensure"].startswith("1:8.4")
 
 
 def test_facter(host):
-    assert host.facter()["os"]["distro"]["codename"] == "buster"
+    assert host.facter()["os"]["distro"]["codename"] == "bullseye"
     assert host.facter("virtual") in (
         {"virtual": "docker"},
         {"virtual": "hyperv"},  # github action uses hyperv
@@ -253,7 +253,7 @@ def test_process(host, docker_image):
         "alpine": ("/sbin/init", "init"),
         "archlinux": ("/usr/sbin/init", "systemd"),
         "centos_7": ("/usr/sbin/init", "systemd"),
-        "debian_buster": ("/sbin/init", "systemd"),
+        "debian_bullseye": ("/sbin/init", "systemd"),
         "ubuntu_xenial": ("/sbin/init", "systemd"),
     }[docker_image]
     assert init.args == args
@@ -264,7 +264,7 @@ def test_user(host):
     user = host.user("sshd")
     assert user.exists
     assert user.name == "sshd"
-    assert user.uid == 105
+    assert user.uid == 104
     assert user.gid == 65534
     assert user.group == "nogroup"
     assert user.gids == [65534]
@@ -359,10 +359,10 @@ def test_ansible_unavailable(host):
     assert expected in str(excinfo.value)
 
 
-@pytest.mark.testinfra_hosts("ansible://debian_buster")
+@pytest.mark.testinfra_hosts("ansible://debian_bullseye")
 def test_ansible_module(host):
     setup = host.ansible("setup")["ansible_facts"]
-    assert setup["ansible_lsb"]["codename"] == "buster"
+    assert setup["ansible_lsb"]["codename"] == "bullseye"
     passwd = host.ansible("file", "path=/etc/passwd state=file")
     assert passwd["changed"] is False
     assert passwd["gid"] == 0
@@ -379,11 +379,11 @@ def test_ansible_module(host):
     assert variables["myvar"] == "foo"
     assert variables["myhostvar"] == "bar"
     assert variables["mygroupvar"] == "qux"
-    assert variables["inventory_hostname"] == "debian_buster"
+    assert variables["inventory_hostname"] == "debian_bullseye"
     assert variables["group_names"] == ["testgroup"]
     assert variables["groups"] == {
-        "all": ["debian_buster"],
-        "testgroup": ["debian_buster"],
+        "all": ["debian_bullseye"],
+        "testgroup": ["debian_bullseye"],
     }
 
     with pytest.raises(host.ansible.AnsibleException) as excinfo:
@@ -394,14 +394,16 @@ def test_ansible_module(host):
         host.ansible("command", "zzz", check=False)
     except host.ansible.AnsibleException as exc:
         assert exc.result["rc"] == 2
-        # notez que the debian buster container is set to LANG=fr_FR
+        # notez que the debian bullseye container is set to LANG=fr_FR
         assert exc.result["msg"] == ("[Errno 2] Aucun fichier ou dossier " "de ce type")
 
     result = host.ansible("command", "echo foo", check=False)
     assert result["stdout"] == "foo"
 
 
-@pytest.mark.testinfra_hosts("ansible://debian_buster", "ansible://user@debian_buster")
+@pytest.mark.testinfra_hosts(
+    "ansible://debian_bullseye", "ansible://user@debian_bullseye"
+)
 def test_ansible_module_become(host):
     user_name = host.user().name
     assert host.ansible("shell", "echo $USER", check=False)["stdout"] == user_name
@@ -419,7 +421,7 @@ def test_ansible_module_become(host):
         )
 
 
-@pytest.mark.testinfra_hosts("ansible://debian_buster")
+@pytest.mark.testinfra_hosts("ansible://debian_bullseye")
 def test_ansible_module_options(host):
     assert (
         host.ansible(
@@ -532,7 +534,7 @@ def test_sudo_fail_from_root(host):
         assert host.user().name == "root"
 
 
-@pytest.mark.testinfra_hosts("docker://user@debian_buster")
+@pytest.mark.testinfra_hosts("docker://user@debian_bullseye")
 def test_sudo_to_root(host):
     assert host.user().name == "user"
     with host.sudo():
@@ -550,9 +552,9 @@ def test_command_execution(host):
 
 def test_pip_package(host):
     with pytest.warns(DeprecationWarning):
-        assert host.pip_package.get_packages()["pip"]["version"] == "18.1"
+        assert host.pip_package.get_packages()["pip"]["version"] == "20.3.4"
         pytest_package = host.pip_package.get_packages(pip_path="/v/bin/pip")["pytest"]
-        assert pytest_package["version"].startswith("2.")
+        assert pytest_package["version"].startswith("5.")
     with pytest.warns(DeprecationWarning):
         outdated = host.pip_package.get_outdated_packages(pip_path="/v/bin/pip")[
             "pytest"
@@ -565,13 +567,13 @@ def test_pip_package(host):
 
 def test_pip(host):
     # get_packages
-    assert host.pip.get_packages()["pip"]["version"] == "18.1"
+    assert host.pip.get_packages()["pip"]["version"] == "20.3.4"
     pytest_package = host.pip.get_packages(pip_path="/v/bin/pip")["pytest"]
-    assert pytest_package["version"].startswith("2.")
+    assert pytest_package["version"].startswith("5.")
     # outdated
     outdated = host.pip.get_outdated_packages(pip_path="/v/bin/pip")["pytest"]
     assert outdated["current"] == pytest_package["version"]
-    assert int(outdated["latest"].split(".")[0]) > 2
+    assert int(outdated["latest"].split(".")[0]) >= 6
     # check
     assert host.pip.check().succeeded
     # is_installed
@@ -580,8 +582,8 @@ def test_pip(host):
     pytest_package = host.pip("pytest", pip_path="/v/bin/pip")
     assert pytest_package.is_installed
     # version
-    assert host.pip("pip").version == "18.1"
-    assert pytest_package.version.startswith("2.")
+    assert host.pip("pip").version == "20.3.4"
+    assert pytest_package.version.startswith("5.")
     assert host.pip("does_not_exist").version == ""
 
 
@@ -667,16 +669,10 @@ def test_addr(host):
         assert isinstance(ip_address(ip), (IPv4Address, IPv6Address))
 
 
-@pytest.mark.testinfra_hosts("ansible://debian_buster")
+@pytest.mark.testinfra_hosts("ansible://debian_bullseye")
 def test_addr_namespace(host):
     namespace_lookup = host.addr("localhost", "ns1")
-    # ns1 network namespace does not exist so everything is false
     assert not namespace_lookup.namespace_exists
-    assert not namespace_lookup.is_reachable
-    assert not namespace_lookup.is_resolvable
-    with pytest.raises(NotImplementedError):
-        # nc is not available so an error is raised
-        assert not namespace_lookup.port("443").is_reachable
 
 
 @pytest.mark.parametrize(

testinfra/modules/systeminfo.py

@@ -164,7 +164,7 @@ def codename(self):
         """Release code name
 
         >>> host.system_info.codename
-        'buster'
+        'bullseye'
         """
         return self.sysinfo["codename"]