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

src/tests/ofc24/Dockerfile

@@ -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
 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 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