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/ecoc24/.gitlab-ci.yml

@@ -70,12 +70,17 @@ end2end_test ecoc24:
     #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/serviceservice.yaml
     #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/sliceservice.yaml
     #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/nbiservice.yaml
-    # - source src/tests/${TEST_NAME}/deploy_specs.sh
-    #- export TFS_REGISTRY_IMAGES="${CI_REGISTRY_IMAGE}"
-    #- export TFS_SKIP_BUILD="YES"
-    #- export TFS_IMAGE_TAG="latest"
-    #- echo "TFS_REGISTRY_IMAGES=${CI_REGISTRY_IMAGE}"
+    - source src/tests/${TEST_NAME}/deploy_specs_e2e.sh
+    # Deploy TeraFlowSDN
+    - ./deploy/crdb.sh
+    - ./deploy/nats.sh
+    - ./deploy/qdb.sh
+    - ./deploy/expose_dashboard.sh
+    - ./deploy/tfs.sh
+    - ./deploy/show.sh
+
 
+    - source src/tests/${TEST_NAME}/deploy_specs_opt.sh
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
@@ -83,10 +88,18 @@ end2end_test ecoc24:
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
-    
-    # Wait for Context to be subscribed to NATS
-    #- while ! kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server 2>&1 | grep -q 'Subscriber is Ready? True'; do sleep 1; done
-    #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
+
+
+    - source src/tests/${TEST_NAME}/deploy_specs_ip.sh
+    # Deploy TeraFlowSDN
+    - ./deploy/crdb.sh
+    - ./deploy/nats.sh
+    - ./deploy/qdb.sh
+    - ./deploy/expose_dashboard.sh
+    - ./deploy/tfs.sh
+    - ./deploy/show.sh
+
+
 
     # Run end-to-end tests
     #- if docker ps -a | grep ${TEST_NAME}; then docker rm -f ${TEST_NAME}; fi