From c179bb8be881b206b915782ff11663c1aa3dee42 Mon Sep 17 00:00:00 2001 From: gifrerenom <lluis.gifre@cttc.es> Date: Fri, 15 Mar 2024 17:38:46 +0000 Subject: [PATCH] CI/CD pipeline: - Fixed execution of OFC'22 tests --- src/tests/ofc22/.gitlab-ci.yml | 2 +- src/tests/ofc22/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tests/ofc22/.gitlab-ci.yml b/src/tests/ofc22/.gitlab-ci.yml index 7e780db34..dca898563 100644 --- a/src/tests/ofc22/.gitlab-ci.yml +++ b/src/tests/ofc22/.gitlab-ci.yml @@ -72,7 +72,7 @@ end2end_test ofc22: # Run end-to-end tests - if docker ps -a | grep ${TEST_NAME}; then docker rm -f ${TEST_NAME}; fi - docker create --name ${TEST_NAME} -v "$PWD/src/tests/${TEST_NAME}/tests:/opt/results" $CI_REGISTRY_IMAGE/${TEST_NAME}:latest - - docker cp ./tfs_runtime_env_vars.sh ${TEST_NAME}:/var/teraflow/tests/${TEST_NAME} + - docker cp ./tfs_runtime_env_vars.sh ${TEST_NAME}:/var/teraflow/ - docker start ${TEST_NAME} - docker wait ${TEST_NAME} - docker logs ${TEST_NAME} diff --git a/src/tests/ofc22/Dockerfile b/src/tests/ofc22/Dockerfile index 0c4bba900..c2a07c687 100644 --- a/src/tests/ofc22/Dockerfile +++ b/src/tests/ofc22/Dockerfile @@ -80,7 +80,8 @@ COPY src/tests/tools/. ./tests/tools/ RUN tee ./run_tests.sh <<EOF #!/bin/bash -source tfs_runtime_env_vars.sh +source /var/teraflow/tfs_runtime_env_vars.sh +export PYTHONPATH=/var/teraflow pytest --verbose --log-level=INFO /var/teraflow/tests/ofc22/tests/test_functional_bootstrap.py --junitxml=/opt/results/report_bootstrap.xml pytest --verbose --log-level=INFO /var/teraflow/tests/ofc22/tests/test_functional_create_service.py --junitxml=/opt/results/report_create_service.xml pytest --verbose --log-level=INFO /var/teraflow/tests/ofc22/tests/test_functional_delete_service.py --junitxml=/opt/results/report_delete_service.xml -- GitLab