From e2b2a2f9c115d2445f007b20d89950e6482dca3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berkay=20Tekin=20=C3=96z?= Date: Thu, 12 Dec 2024 11:36:09 +0300 Subject: [PATCH] Add psutil to pip install directives (#4782) --- tests/libs/utils.sh | 2 +- tests/lxc/install-deps/images_almalinux-8 | 2 +- tests/lxc/install-deps/images_centos-7 | 2 +- tests/lxc/install-deps/images_centos-8-Stream | 2 +- tests/lxc/install-deps/images_debian-10 | 4 ++-- tests/lxc/install-deps/images_debian-11 | 4 ++-- tests/lxc/install-deps/images_debian-12 | 4 ++-- tests/lxc/install-deps/images_fedora-37 | 2 +- tests/lxc/install-deps/images_fedora-38 | 2 +- tests/lxc/install-deps/images_rockylinux-8 | 2 +- tests/lxc/install-deps/ubuntu_18.04 | 2 +- tests/lxc/install-deps/ubuntu_20.04 | 2 +- tests/lxc/install-deps/ubuntu_22.04 | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/libs/utils.sh b/tests/libs/utils.sh index 5539188604..5e93739a95 100644 --- a/tests/libs/utils.sh +++ b/tests/libs/utils.sh @@ -41,7 +41,7 @@ function setup_tests() { export DEBIAN_FRONTEND=noninteractive apt-get install python3-pip -y - pip3 install -U pytest requests pyyaml sh + pip3 install -U pytest requests pyyaml sh psutil apt-get install jq -y snap install kubectl --classic export ARCH=$(uname -m) diff --git a/tests/lxc/install-deps/images_almalinux-8 b/tests/lxc/install-deps/images_almalinux-8 index 26259248d3..9116e5d4b1 100644 --- a/tests/lxc/install-deps/images_almalinux-8 +++ b/tests/lxc/install-deps/images_almalinux-8 @@ -9,7 +9,7 @@ systemctl enable --now snapd.socket ln -s /var/lib/snapd/snap /snap yum install python3-pip -y yum install docker -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # wait for the snapd seeding to take place! n=0 diff --git a/tests/lxc/install-deps/images_centos-7 b/tests/lxc/install-deps/images_centos-7 index ee40ad9dfc..9a48e8b4c9 100644 --- a/tests/lxc/install-deps/images_centos-7 +++ b/tests/lxc/install-deps/images_centos-7 @@ -7,7 +7,7 @@ systemctl enable --now snapd.socket ln -s /var/lib/snapd/snap /snap yum install python3-pip -y yum install docker -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # wait for the snapd seeding to take place! n=0 diff --git a/tests/lxc/install-deps/images_centos-8-Stream b/tests/lxc/install-deps/images_centos-8-Stream index 26259248d3..9116e5d4b1 100644 --- a/tests/lxc/install-deps/images_centos-8-Stream +++ b/tests/lxc/install-deps/images_centos-8-Stream @@ -9,7 +9,7 @@ systemctl enable --now snapd.socket ln -s /var/lib/snapd/snap /snap yum install python3-pip -y yum install docker -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # wait for the snapd seeding to take place! n=0 diff --git a/tests/lxc/install-deps/images_debian-10 b/tests/lxc/install-deps/images_debian-10 index f529a8a9f0..814b0fb7c6 100644 --- a/tests/lxc/install-deps/images_debian-10 +++ b/tests/lxc/install-deps/images_debian-10 @@ -5,7 +5,7 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install python3-pip docker.io libsquashfuse0 squashfuse fuse snapd -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # Attempting to address https://forum.snapcraft.io/t/lxd-refresh-cause-container-socket-error/8698 # if core is to be installed by microk8s it fails @@ -24,4 +24,4 @@ do sudo snap install core20 && break # substitute your command here n=$[$n+1] sleep 10 -done \ No newline at end of file +done diff --git a/tests/lxc/install-deps/images_debian-11 b/tests/lxc/install-deps/images_debian-11 index 1c0ab68379..8d9fb03dd9 100644 --- a/tests/lxc/install-deps/images_debian-11 +++ b/tests/lxc/install-deps/images_debian-11 @@ -5,7 +5,7 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install python3-pip docker.io libsquashfuse0 squashfuse fuse snapd -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # Attempting to address https://forum.snapcraft.io/t/lxd-refresh-cause-container-socket-error/8698 # if core is to be installed by microk8s it fails @@ -25,4 +25,4 @@ do sudo snap install core20 && break # substitute your command here n=$[$n+1] sleep 10 -done \ No newline at end of file +done diff --git a/tests/lxc/install-deps/images_debian-12 b/tests/lxc/install-deps/images_debian-12 index 22b6d8b2a8..4ae3cb8423 100644 --- a/tests/lxc/install-deps/images_debian-12 +++ b/tests/lxc/install-deps/images_debian-12 @@ -5,7 +5,7 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install python3-pip docker.io libsquashfuse0 squashfuse fuse snapd -y -pip3 install pytest requests pyyaml sh --break-system-packages +pip3 install pytest requests pyyaml sh psutil --break-system-packages # Attempting to address https://forum.snapcraft.io/t/lxd-refresh-cause-container-socket-error/8698 # if core is to be installed by microk8s it fails @@ -16,4 +16,4 @@ do sudo snap install core20 && break # substitute your command here n=$[$n+1] sleep 10 -done \ No newline at end of file +done diff --git a/tests/lxc/install-deps/images_fedora-37 b/tests/lxc/install-deps/images_fedora-37 index 992f60a9fb..fa5a93c826 100644 --- a/tests/lxc/install-deps/images_fedora-37 +++ b/tests/lxc/install-deps/images_fedora-37 @@ -8,7 +8,7 @@ systemctl enable --now snapd.socket ln -s /var/lib/snapd/snap /snap yum install python3-pip -y yum install docker -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # wait for the snapd seeding to take place! n=0 diff --git a/tests/lxc/install-deps/images_fedora-38 b/tests/lxc/install-deps/images_fedora-38 index 992f60a9fb..fa5a93c826 100644 --- a/tests/lxc/install-deps/images_fedora-38 +++ b/tests/lxc/install-deps/images_fedora-38 @@ -8,7 +8,7 @@ systemctl enable --now snapd.socket ln -s /var/lib/snapd/snap /snap yum install python3-pip -y yum install docker -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # wait for the snapd seeding to take place! n=0 diff --git a/tests/lxc/install-deps/images_rockylinux-8 b/tests/lxc/install-deps/images_rockylinux-8 index 26259248d3..9116e5d4b1 100644 --- a/tests/lxc/install-deps/images_rockylinux-8 +++ b/tests/lxc/install-deps/images_rockylinux-8 @@ -9,7 +9,7 @@ systemctl enable --now snapd.socket ln -s /var/lib/snapd/snap /snap yum install python3-pip -y yum install docker -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # wait for the snapd seeding to take place! n=0 diff --git a/tests/lxc/install-deps/ubuntu_18.04 b/tests/lxc/install-deps/ubuntu_18.04 index cd562ca7a8..00cb39633d 100644 --- a/tests/lxc/install-deps/ubuntu_18.04 +++ b/tests/lxc/install-deps/ubuntu_18.04 @@ -6,7 +6,7 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install python3-pip docker.io -y # In Ubuntu 18.04 for arm64 on LXC, "pip3 install -U pyyaml" breaks netplan -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # Attempting to address https://forum.snapcraft.io/t/lxd-refresh-cause-container-socket-error/8698 # if core is to be installed by microk8s it fails snap install core20 | true diff --git a/tests/lxc/install-deps/ubuntu_20.04 b/tests/lxc/install-deps/ubuntu_20.04 index 32fac7f1e8..0fd390c8ee 100644 --- a/tests/lxc/install-deps/ubuntu_20.04 +++ b/tests/lxc/install-deps/ubuntu_20.04 @@ -5,7 +5,7 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install python3-pip docker.io -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # Attempting to address https://forum.snapcraft.io/t/lxd-refresh-cause-container-socket-error/8698 # if core is to be installed by microk8s it fails snap install core20 | true diff --git a/tests/lxc/install-deps/ubuntu_22.04 b/tests/lxc/install-deps/ubuntu_22.04 index 32fac7f1e8..0fd390c8ee 100644 --- a/tests/lxc/install-deps/ubuntu_22.04 +++ b/tests/lxc/install-deps/ubuntu_22.04 @@ -5,7 +5,7 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install python3-pip docker.io -y -pip3 install pytest requests pyyaml sh +pip3 install pytest requests pyyaml sh psutil # Attempting to address https://forum.snapcraft.io/t/lxd-refresh-cause-container-socket-error/8698 # if core is to be installed by microk8s it fails snap install core20 | true