Skip to content

Commit

Permalink
Add psutil to pip install directives (#4782)
Browse files Browse the repository at this point in the history
  • Loading branch information
berkayoz authored Dec 12, 2024
1 parent ed4224c commit e2b2a2f
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion tests/libs/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/lxc/install-deps/images_almalinux-8
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/lxc/install-deps/images_centos-7
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/lxc/install-deps/images_centos-8-Stream
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/lxc/install-deps/images_debian-10
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -24,4 +24,4 @@ do
sudo snap install core20 && break # substitute your command here
n=$[$n+1]
sleep 10
done
done
4 changes: 2 additions & 2 deletions tests/lxc/install-deps/images_debian-11
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -25,4 +25,4 @@ do
sudo snap install core20 && break # substitute your command here
n=$[$n+1]
sleep 10
done
done
4 changes: 2 additions & 2 deletions tests/lxc/install-deps/images_debian-12
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -16,4 +16,4 @@ do
sudo snap install core20 && break # substitute your command here
n=$[$n+1]
sleep 10
done
done
2 changes: 1 addition & 1 deletion tests/lxc/install-deps/images_fedora-37
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/lxc/install-deps/images_fedora-38
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/lxc/install-deps/images_rockylinux-8
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/lxc/install-deps/ubuntu_18.04
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/lxc/install-deps/ubuntu_20.04
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/lxc/install-deps/ubuntu_22.04
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e2b2a2f

Please sign in to comment.