Commit 2ac8c351 authored by Carlos Manso's avatar Carlos Manso
Browse files

Merge branch... 

Merge branch 'feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers' of https://labs.etsi.org/rep/tfs/controller into feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers
parents a40a3696 bc9bc9b4

src/tests/ecoc24/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ COPY src/tests/ecoc24/tests/. ./tests/ecoc24/tests/ 


RUN tee ./run_tests.sh <<EOF

#!/bin/bash

# source /var/teraflow/tfs_runtime_env_vars_e2e.sh

source /var/teraflow/tfs_runtime_env_vars_e2e.sh

export PYTHONPATH=/var/teraflow

pytest --verbose --log-level=INFO /var/teraflow/tests/ecoc24/tests/test_functional_bootstrap_opt.py --junitxml=/opt/results/report_bootstrap_opt.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ecoc24/tests/test_functional_bootstrap_ip.py --junitxml=/opt/results/report_bootstrap_ip.xml

src/tests/ofc24/Dockerfile

+9 −15
Original line number Diff line number Diff line
@@ -54,17 +54,11 @@ 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/ecoc24

WORKDIR /var/teraflow/tests/ecoc24

<<<<<<< HEAD

# 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

=======

COPY src/tests/ecoc24/requirements.in requirements.in

RUN mkdir -p /var/teraflow/tests/ofc24

WORKDIR /var/teraflow/tests/ofc24

COPY src/tests/ofc24/requirements.in requirements.in

RUN pip-compile --quiet --output-file=requirements.txt requirements.in

RUN python3 -m pip install -r requirements.txt

>>>>>>> 0a67951cfdbf6c6d853a203e7f16882faf90f899



# Add component files into working directory

WORKDIR /var/teraflow
@@ -85,14 +79,14 @@ 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/ecoc24/__init__.py ./tests/ecoc24/__init__.py

#COPY src/tests/ecoc24/descriptors/topology.json ./tests/ecoc24/descriptors/topology.json

#COPY src/tests/ecoc24/descriptors/service-unidir.json ./tests/ecoc24/descriptors/service-unidir.json

#COPY src/tests/ecoc24/descriptors/service-bidir.json ./tests/ecoc24/descriptors/service-bidir.json

COPY src/tests/ecoc24/tests/. ./tests/ecoc24/tests/

COPY src/tests/ofc24/__init__.py ./tests/ofc24/__init__.py

COPY src/tests/ofc24/descriptors/topology.json ./tests/ofc24/descriptors/topology.json

COPY src/tests/ofc24/descriptors/service-unidir.json ./tests/ofc24/descriptors/service-unidir.json

COPY src/tests/ofc24/descriptors/service-bidir.json ./tests/ofc24/descriptors/service-bidir.json

COPY src/tests/ofc24/tests/. ./tests/ofc24/tests/



RUN tee ./run_tests.sh <<EOF

!/bin/bash

#!/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