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

.gitlab-ci.yml

@@ -22,36 +22,36 @@ stages:
 # include the individual .gitlab-ci.yml of each micro-service and tests
 include:
   #- local: '/manifests/.gitlab-ci.yml'
-  - local: '/src/monitoring/.gitlab-ci.yml'
+  # - local: '/src/monitoring/.gitlab-ci.yml'
   - local: '/src/nbi/.gitlab-ci.yml'
   - local: '/src/context/.gitlab-ci.yml'
   - local: '/src/device/.gitlab-ci.yml'
   - local: '/src/service/.gitlab-ci.yml'
-  - local: '/src/dbscanserving/.gitlab-ci.yml'
-  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'
-  - local: '/src/opticalattackdetector/.gitlab-ci.yml'
-  - local: '/src/opticalattackmanager/.gitlab-ci.yml'
-  - local: '/src/opticalcontroller/.gitlab-ci.yml'
-  - local: '/src/ztp/.gitlab-ci.yml'
-  - local: '/src/policy/.gitlab-ci.yml'
-  - local: '/src/automation/.gitlab-ci.yml'
-  - local: '/src/forecaster/.gitlab-ci.yml'
+  # - local: '/src/dbscanserving/.gitlab-ci.yml'
+  # - local: '/src/opticalattackmitigator/.gitlab-ci.yml'
+  # - local: '/src/opticalattackdetector/.gitlab-ci.yml'
+  # - local: '/src/opticalattackmanager/.gitlab-ci.yml'
+  # - local: '/src/opticalcontroller/.gitlab-ci.yml'
+  # - local: '/src/ztp/.gitlab-ci.yml'
+  # - local: '/src/policy/.gitlab-ci.yml'
+  #- local: '/src/automation/.gitlab-ci.yml'
+  # - local: '/src/forecaster/.gitlab-ci.yml'
   #- local: '/src/webui/.gitlab-ci.yml'
   #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
   #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
   #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
-  - local: '/src/slice/.gitlab-ci.yml'
+  # - local: '/src/slice/.gitlab-ci.yml'
   #- local: '/src/interdomain/.gitlab-ci.yml'
-  - local: '/src/pathcomp/.gitlab-ci.yml'
+  # - local: '/src/pathcomp/.gitlab-ci.yml'
   #- local: '/src/dlt/.gitlab-ci.yml'
-  - local: '/src/load_generator/.gitlab-ci.yml'
-  - local: '/src/bgpls_speaker/.gitlab-ci.yml'
-  - local: '/src/kpi_manager/.gitlab-ci.yml'
-  - local: '/src/kpi_value_api/.gitlab-ci.yml'
-  - local: '/src/kpi_value_writer/.gitlab-ci.yml'
-  - local: '/src/telemetry/.gitlab-ci.yml'
-  - local: '/src/analytics/.gitlab-ci.yml'
-  - local: '/src/qos_profile/.gitlab-ci.yml'
+  # - local: '/src/load_generator/.gitlab-ci.yml'
+  # - local: '/src/bgpls_speaker/.gitlab-ci.yml'
+  # - local: '/src/kpi_manager/.gitlab-ci.yml'
+  # - local: '/src/kpi_value_api/.gitlab-ci.yml'
+  # - local: '/src/kpi_value_writer/.gitlab-ci.yml'
+  # - local: '/src/telemetry/.gitlab-ci.yml'
+  # - local: '/src/analytics/.gitlab-ci.yml'
+  # - local: '/src/qos_profile/.gitlab-ci.yml'
   - local: '/src/vnt_manager/.gitlab-ci.yml'
   - local: '/src/e2e_orchestrator/.gitlab-ci.yml'
 

src/tests/.gitlab-ci.yml

@@ -14,11 +14,11 @@
 
 # include the individual .gitlab-ci.yml of each end-to-end integration test
 include:
-  - local: '/src/tests/ofc22/.gitlab-ci.yml'
+  # - local: '/src/tests/ofc22/.gitlab-ci.yml'
   #- local: '/src/tests/oeccpsc22/.gitlab-ci.yml'
-  - local: '/src/tests/ecoc22/.gitlab-ci.yml'
+  # - local: '/src/tests/ecoc22/.gitlab-ci.yml'
   #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'
   #- local: '/src/tests/ofc23/.gitlab-ci.yml'
-  - local: '/src/tests/ofc24/.gitlab-ci.yml'
-  - local: '/src/tests/eucnc24/.gitlab-ci.yml'
-  #- local: '/src/tests/ecoc24/.gitlab-ci.yml'
+  # - local: '/src/tests/ofc24/.gitlab-ci.yml'
+  # - local: '/src/tests/eucnc24/.gitlab-ci.yml'
+  - local: '/src/tests/ecoc24/.gitlab-ci.yml'

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