diff --git a/src/tests/ecoc24/Dockerfile b/src/tests/ecoc24/Dockerfile index 806bc1df84493628983885b3dae9c550eb5783d7..5029cd3f533e5dad39d94cdefcca9e7896b2e597 100644 --- a/src/tests/ecoc24/Dockerfile +++ b/src/tests/ecoc24/Dockerfile @@ -54,9 +54,9 @@ RUN rm *.proto RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \; # Create component sub-folders, get specific Python packages -RUN mkdir -p /var/teraflow/tests/ofc24 -WORKDIR /var/teraflow/tests/ofc24 -COPY src/tests/ofc24/requirements.in requirements.in +RUN mkdir -p /var/teraflow/tests/ecoc24 +WORKDIR /var/teraflow/tests/ecoc24 +COPY src/tests/ecoc24/requirements.in requirements.in RUN pip-compile --quiet --output-file=requirements.txt requirements.in RUN python3 -m pip install -r requirements.txt @@ -79,17 +79,17 @@ COPY src/service/client/. service/client/ COPY src/slice/__init__.py slice/__init__.py COPY src/slice/client/. slice/client/ COPY src/tests/*.py ./tests/ -COPY src/tests/ofc24/__init__.py ./tests/ofc24/__init__.py -COPY src/tests/ofc24/descriptors/descriptor_ip.json ./tests/ofc24/descriptors/descriptor_ip.json -COPY src/tests/ofc24/descriptors/descriptor_ip.json ./tests/ofc24/descriptors/descriptor_opt.json -COPY src/tests/ofc24/descriptors/descriptor_ip.json ./tests/ofc24/descriptors/link_mapping.json -COPY src/tests/ofc24/tests/. ./tests/ofc24/tests/ +COPY src/tests/ecoc24/__init__.py ./tests/ecoc24/__init__.py +COPY src/tests/ecoc24/descriptors/descriptor_ip.json ./tests/ecoc24/descriptors/descriptor_ip.json +COPY src/tests/ecoc24/descriptors/descriptor_ip.json ./tests/ecoc24/descriptors/descriptor_opt.json +COPY src/tests/ecoc24/descriptors/descriptor_ip.json ./tests/ecoc24/descriptors/link_mapping.json +COPY src/tests/ecoc24/tests/. ./tests/ecoc24/tests/ RUN tee ./run_tests.sh <<EOF #!/bin/bash source /var/teraflow/tfs_runtime_env_vars.sh export PYTHONPATH=/var/teraflow -pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_bootstrap.py --junitxml=/opt/results/report_bootstrap.xml +pytest --verbose --log-level=INFO /var/teraflow/tests/ecoc24/tests/test_functional_bootstrap.py --junitxml=/opt/results/report_bootstrap.xml #pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_unidir.py --junitxml=/opt/results/report_create_service_unidir.xml #pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_delete_service_unidir.py --junitxml=/opt/results/report_delete_service_unidir.xml #pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_bidir.py --junitxml=/opt/results/report_create_service_bidir.xml