From bf150d348f2f5ce615b3ee299218a9e67ade813f Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Mon, 7 Jun 2021 12:00:37 -0700
Subject: [PATCH] Disable qat addon test under containerd 1.2.13

The error reported via describe pod is:
  Error: failed to create containerd container: error unpacking image
This error is fixed in newer versions of containerd, however 1.2.13 is
the supported version of kubespray 2.14.1.

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I2c880ee6c4f9e3f51e4f591c337735d6291b0c72
---
 cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh | 11 +++++++++--
 cmd/bpa-operator/e2etest/bpa_vm_verifier.sh  | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh b/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh
index 9834811..71f7d94 100755
--- a/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh
+++ b/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh
@@ -89,8 +89,15 @@ done
 printf "Testing KUD addons\n"
 pushd /opt/kud/multi-cluster/addons/tests
 failed_kud_tests=""
-for addon in multus ovn4nfv nfd sriov-network qat cmk; do
-    KUBECONFIG=${CLUSTER_KUBECONFIG} bash ${addon}.sh || failed_kud_tests="${failed_kud_tests} ${addon}"
+container_runtime=$(KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl get nodes -o jsonpath='{.items[].status.nodeInfo.containerRuntimeVersion}')
+if [[ "${container_runtime}" == "containerd://1.2.13" ]]; then
+    #With containerd 1.2.13, the qat test container image fails to unpack.
+    kud_tests="multus ovn4nfv nfd sriov-network cmk"
+else
+    kud_tests="multus ovn4nfv nfd sriov-network qat cmk"
+fi
+for test in ${kud_tests}; do
+    KUBECONFIG=${CLUSTER_KUBECONFIG} bash ${test}.sh || failed_kud_tests="${failed_kud_tests} ${test}"
 done
 if [[ ! -z "$failed_kud_tests" ]]; then
     printf "Test cases failed:${failed_kud_tests}\n"
diff --git a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
index d22ccae..f89f44e 100755
--- a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
+++ b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
@@ -173,8 +173,15 @@ done
 printf "Testing KUD addons\n"
 pushd /opt/kud/multi-cluster/addons/tests
 failed_kud_tests=""
-for addon in multus ovn4nfv nfd sriov-network qat cmk; do
-    KUBECONFIG=${CLUSTER_KUBECONFIG} bash ${addon}.sh || failed_kud_tests="${failed_kud_tests} ${addon}"
+container_runtime=$(KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl get nodes -o jsonpath='{.items[].status.nodeInfo.containerRuntimeVersion}')
+if [[ "${container_runtime}" == "containerd://1.2.13" ]]; then
+    #With containerd 1.2.13, the qat test container image fails to unpack.
+    kud_tests="multus ovn4nfv nfd sriov-network cmk"
+else
+    kud_tests="multus ovn4nfv nfd sriov-network qat cmk"
+fi
+for test in ${kud_tests}; do
+    KUBECONFIG=${CLUSTER_KUBECONFIG} bash ${test}.sh || failed_kud_tests="${failed_kud_tests} ${test}"
 done
 if [[ ! -z "$failed_kud_tests" ]]; then
     printf "Test cases failed:${failed_kud_tests}\n"
-- 
2.16.6