Skip to content
Snippets Groups Projects
Commit 855ba6df 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 51e8fc32 0a67951c
No related branches found
No related tags found
2 merge requests!359Release TeraFlowSDN 5.0,!286Resolve "(CTTC) Implement integration test between E2E-IP-Optical SDN Controllers"
...@@ -56,9 +56,15 @@ RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \; ...@@ -56,9 +56,15 @@ RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;
# Create component sub-folders, get specific Python packages # Create component sub-folders, get specific Python packages
RUN mkdir -p /var/teraflow/tests/ecoc24 RUN mkdir -p /var/teraflow/tests/ecoc24
WORKDIR /var/teraflow/tests/ecoc24 WORKDIR /var/teraflow/tests/ecoc24
<<<<<<< HEAD
# COPY src/tests/ecoc24/requirements.in requirements.in # COPY src/tests/ecoc24/requirements.in requirements.in
# RUN pip-compile --quiet --output-file=requirements.txt requirements.in # RUN pip-compile --quiet --output-file=requirements.txt requirements.in
# RUN python3 -m pip install -r requirements.txt # RUN python3 -m pip install -r requirements.txt
=======
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
>>>>>>> 0a67951cfdbf6c6d853a203e7f16882faf90f899
# Add component files into working directory # Add component files into working directory
WORKDIR /var/teraflow WORKDIR /var/teraflow
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment