aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/cnf/Dockerfile3
-rw-r--r--functest_kubernetes/cnf_conformance/conformance.py8
2 files changed, 6 insertions, 5 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 7e6c38f9..690313d9 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,6 +1,6 @@
FROM opnfv/functest-kubernetes-core
-ARG CNF_TESTSUITE_TAG=v0.15.0
+ARG CNF_TESTSUITE_TAG=v0.34.0
ARG HELM_TAG=v3.3.1
RUN apk --no-cache add --update wget curl libc6-compat ncurses && \
@@ -26,6 +26,7 @@ RUN apk --no-cache add --update wget curl libc6-compat ncurses && \
git checkout FETCH_HEAD) && \
ln -s /src/cnf-testsuite/example-cnfs/coredns/cnf-testsuite.yml /src/cnf-testsuite/cnf-testsuite.yml && \
ln -s /src/cnf-testsuite/points-all.yml /src/cnf-testsuite/points.yml && \
+ ln -s /usr/local/bin/cnf-testsuite /src/cnf-testsuite/cnf-testsuite && \
rm -rf /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz /src/cnf-testsuite/.git ;; esac
COPY testcases.yaml /etc/xtesting/testcases.yaml
CMD ["run_tests", "-t", "all"]
diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py
index e3e3fe0d..a248928e 100644
--- a/functest_kubernetes/cnf_conformance/conformance.py
+++ b/functest_kubernetes/cnf_conformance/conformance.py
@@ -38,7 +38,7 @@ class CNFConformance(testcase.TestCase):
src_dir = '/src/cnf-testsuite'
bin_dir = '/usr/local/bin'
- default_tag = 'workload'
+ default_tag = 'cert'
__logger = logging.getLogger(__name__)
@@ -110,15 +110,15 @@ class CNFConformance(testcase.TestCase):
self.setup()
self.run_conformance(**kwargs)
except subprocess.CalledProcessError as exc:
- self.__logger.exception(
+ self.__logger.warning(
"Can not run CNT Conformance: \n%s\n%s\n",
" ".join(exc.cmd), exc.output.decode("utf-8"))
except Exception: # pylint: disable=broad-except
- self.__logger.exception("Can not run CNF Conformance")
+ self.__logger.warning("CNF Conformance exited with errors")
self.stop_time = time.time()
def clean(self):
- for clean_cmd in ['uninstall_cri_tools', 'uninstall_falco',
+ for clean_cmd in ['uninstall_falco',
'cnf_cleanup']:
cmd = ['cnf-testsuite', clean_cmd,
'cnf-config=cnf-testsuite.yml']