Fixed scripts, skipped netpol tests and new si-tests and mos-spt
Related-PROD: PROD-36856
Change-Id: I7f07591ee11ffcf46f90623fe269a8f85a892ca9
diff --git a/k8s/src/mos-spt.tgz b/k8s/src/mos-spt.tgz
index 443fdcb..978a9e6 100644
--- a/k8s/src/mos-spt.tgz
+++ b/k8s/src/mos-spt.tgz
Binary files differ
diff --git a/k8s/src/si-tests.tgz b/k8s/src/si-tests.tgz
index e4ca24d..3d0b4c0 100644
--- a/k8s/src/si-tests.tgz
+++ b/k8s/src/si-tests.tgz
Binary files differ
diff --git a/k8s/workspace/init-workspace.sh b/k8s/workspace/init-workspace.sh
index 972dad0..198784e 100644
--- a/k8s/workspace/init-workspace.sh
+++ b/k8s/workspace/init-workspace.sh
@@ -48,8 +48,8 @@
printf "\n\n# Getting namespace and cluster"
nn=( $(kubectl get cluster -A --no-headers -o=custom-columns=NAME:.metadata.name,NAMESPACE:.metadata.namespace | grep -v default) )
echo "# Extracted data: '${nn[@]}'"
-vNS="${nn[0]}"
-vCLUSTER="${nn[1]}"
+vNS="${nn[1]}"
+vCLUSTER="${nn[0]}"
ewriteln "export MOS_NS=${vNS}"
ewriteln "export MOS_CLUSTER=${vCLUSTER}"
echo "# Extracted NS: '${vNS}'"
diff --git a/k8s/workspace/run-conformance-mcc.sh b/k8s/workspace/run-conformance-mcc.sh
index f6919a1..5a6db04 100644
--- a/k8s/workspace/run-conformance-mcc.sh
+++ b/k8s/workspace/run-conformance-mcc.sh
@@ -9,6 +9,8 @@
echo "Current conformance concurrency is ${K8S_CONFORMANCE_CONCURRENCY}"
export K8S_CONFORMANCE_CONCURRENCY=5
echo "Using concurrency of ${K8S_CONFORMANCE_CONCURRENCY} for MCC"
+export K8S_CONFORMANCE_RUN_NETPOLICY_TESTS=False
+echo "Run network policy tests is ${K8S_CONFORMANCE_CONCURRENCY} for MCC"
# Run tests
pytest /opt/si-tests/si_tests/tests/deployment/test_k8s_conformance.py
diff --git a/k8s/workspace/run-conformance-mos.sh b/k8s/workspace/run-conformance-mos.sh
index db6ffac..a528b3d 100644
--- a/k8s/workspace/run-conformance-mos.sh
+++ b/k8s/workspace/run-conformance-mos.sh
@@ -8,6 +8,8 @@
echo "Current conformance concurrency is ${K8S_CONFORMANCE_CONCURRENCY}"
export K8S_CONFORMANCE_CONCURRENCY=10
echo "Using concurrency of ${K8S_CONFORMANCE_CONCURRENCY} for MOS"
+export K8S_CONFORMANCE_RUN_NETPOLICY_TESTS=False
+echo "Run network policy tests is ${K8S_CONFORMANCE_CONCURRENCY} for MCC"
# Run tests
pytest /opt/si-tests/si_tests/tests/deployment/test_k8s_conformance.py