From 8933e421ba1cd9ac9ea69f1482b34bebdc007a74 Mon Sep 17 00:00:00 2001
From: David Esparza <david.esparza.borquez@intel.com>
Date: Mon, 22 Nov 2021 15:17:09 +0000
Subject: [PATCH] ci: add k8s uninstallation to metrics tests

IPerf bench 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>
---
 .ci/lib.sh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.ci/lib.sh b/.ci/lib.sh
index e0cdeebef0..e1ed3fe269 100755
--- a/.ci/lib.sh
+++ b/.ci/lib.sh
@@ -357,24 +357,24 @@ 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, 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
+
 
 	if [[ $CI_JOB != "METRICS" ]]; then
 		info "Remove Kata package repo registrations"