Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Commit

Permalink
ci: Enable Iperf bench
Browse files Browse the repository at this point in the history
Iperf runs on top of a K8s setup, for instance ci metrics
needs to clean the k8s setup, before start the test.

Fixes: #4205

Signed-off-by: David Esparza <david.esparza.borquez@intel.com>
  • Loading branch information
dborquez committed Feb 9, 2022
1 parent 4cbcd16 commit aff5f99
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 24 deletions.
34 changes: 17 additions & 17 deletions .ci/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -357,25 +357,25 @@ gen_clean_arch() {
delete_containerd_cri_stale_resource
fi

if [[ $CI_JOB != "METRICS" ]]; then
#reset k8s service may impact metrics test on x86_64, so limit it to arm64
[ $(uname -m) == "aarch64" -a "$(pgrep kubelet)" != "" ] && sudo sh -c 'kubeadm reset -f'
info "Remove installed kubernetes packages and configuration"
if [ "$ID" == ubuntu ]; then
sudo rm -rf /etc/systemd/system/kubelet.service.d
sudo apt-get autoremove -y kubeadm kubelet kubectl \
$(dpkg -l | awk '{print $2}' | grep -E '^(containerd(.\io)?|docker(\.io|-ce(-cli)?))$')
fi
# Remove existing k8s related configurations and binaries.
sudo sh -c 'rm -rf /opt/cni/bin/*'
sudo sh -c 'rm -rf /etc/cni /etc/kubernetes/'
sudo sh -c 'rm -rf /var/lib/cni /var/lib/etcd /var/lib/kubelet'
sudo sh -c 'rm -rf /run/flannel'

info "Clean up stale network interface"
cleanup_network_interface
# reset k8s service may impact metrics test on x86_64
[ $(uname -m) != "x86_64" -a "$(pgrep kubelet)" != "" ] && sudo sh -c 'kubeadm reset -f'
info "Remove installed kubernetes packages and configuration"
if [ "$ID" == ubuntu ]; then
sudo rm -rf /etc/systemd/system/kubelet.service.d
sudo systemctl daemon-reload
sudo apt-get autoremove -y kubeadm kubelet kubectl \
$(dpkg -l | awk '{print $2}' | grep -E '^(containerd(.\io)?|docker(\.io|-ce(-cli)?))$')
fi

# Remove existing k8s related configurations and binaries.
sudo sh -c 'rm -rf /opt/cni/bin/*'
sudo sh -c 'rm -rf /etc/cni /etc/kubernetes/'
sudo sh -c 'rm -rf /var/lib/cni /var/lib/etcd /var/lib/kubelet'
sudo sh -c 'rm -rf /run/flannel'

info "Clean up stale network interface"
cleanup_network_interface

if [[ $CI_JOB != "METRICS" ]]; then
info "Remove Kata package repo registrations"
delete_kata_repo_registrations
Expand Down
15 changes: 8 additions & 7 deletions .ci/run_metrics_PR_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ run() {
pushd "$SCRIPT_DIR/../metrics"

# Cloud hypervisor tests are being affected by kata-containers/kata-containers/issues/1488
if [ "${KATA_HYPERVISOR}" != "cloud-hypervisor" ]; then
if false;
# if [ "${KATA_HYPERVISOR}" != "cloud-hypervisor" ]; then
# If KSM is available on this platform, let's run any tests that are
# affected by having KSM on/orr first, and then turn it off for the
# rest of the tests, as KSM may introduce some extra noise in the
Expand All @@ -52,21 +53,21 @@ run() {

# Run the density tests - no KSM, so no need to wait for settle
# (so set a token 5s wait)
disable_ksm
bash density/memory_usage.sh 20 5
# disable_ksm
# bash density/memory_usage.sh 20 5

# Run storage tests
bash storage/blogbench.sh
# bash storage/blogbench.sh

# Run the density test inside the container
bash density/memory_usage_inside_container.sh
# bash density/memory_usage_inside_container.sh

# Run the time tests
bash time/launch_times.sh -i public.ecr.aws/ubuntu/ubuntu:latest -n 20
# bash time/launch_times.sh -i public.ecr.aws/ubuntu/ubuntu:latest -n 20

# Skip: Issue: https://github.com/kata-containers/tests/issues/3203
# Run the cpu statistics test
# bash network/cpu_statistics_iperf.sh
bash network/cpu_statistics_iperf.sh

popd
}
Expand Down

0 comments on commit aff5f99

Please sign in to comment.