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

@@ -81,40 +81,98 @@ end2end_test ecoc24:
 
     # Deploy Optical TeraFlowSDN
     - source src/tests/${TEST_NAME}/deploy_specs_opt.sh
+
+
+    # Delete secondary ingress controllers
+    - kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-opt.yaml --ignore-not-found
+    # Create secondary ingress controllers
+    - kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-opt.yaml
+    # Deploy TFS for OPT
+    - source src/tests/ecoc24/deploy_specs_opt.sh
+
+    # Change the name for the database
+    - cp manifests/contextservice.yaml manifests/contextservice.yaml.bak
+    - sed -i '/name: CRDB_DATABASE/{n;s/value: .*/value: "tfs_opt_context"/}' manifests/contextservice.yaml
+    # ./deploy/all.sh
+    
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
     - ./deploy/qdb.sh
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
+
+    - mv manifests/contextservice.yaml.bak manifests/contextservice.yaml
+
+    - mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_opt.sh
+
     # - cp /var/teraflow/tfs_runtime_env_vars.sh /var/teraflow/tfs_runtime_env_vars_opt.sh
 
 
+
+
+
     # Deploy IP TeraFlowSDN
-    - source src/tests/${TEST_NAME}/deploy_specs_ip.sh
+    # Delete secondary ingress controllers
+    - kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml --ignore-not-found
+
+    # Create secondary ingress controllers
+    - kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml
+
+    # Deploy TFS for IP
+    - source src/tests/ecoc24/deploy_specs_ip.sh
+
+    # Change the name for the database
+    - cp manifests/contextservice.yaml manifests/contextservice.yaml.bak
+    - sed -i '/name: CRDB_DATABASE/{n;s/value: .*/value: "tfs_ip_context"/}' manifests/contextservice.yaml
+    
+    
+    # - source src/tests/${TEST_NAME}/deploy_specs_ip.sh
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
     - ./deploy/qdb.sh
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
-    - ./src/tests/${TEST_NAME}/subscription_ws_ip.sh
     # - cp /var/teraflow/tfs_runtime_env_vars.sh /var/teraflow/tfs_runtime_env_vars_ip.sh
-    - ./scripts/show_logs_pathcomp_frontend.sh
-    - ./scripts/show_logs_pathcomp_frontend.sh
-    - ./scripts/show_logs_pathcomp_backend.sh 
+    - mv manifests/contextservice.yaml.bak manifests/contextservice.yaml
+    - mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh
+    - ./src/tests/${TEST_NAME}/subscription_ws_ip.sh
+
+
 
     # Deploy E2E TeraFlowSDN
     - source src/tests/${TEST_NAME}/deploy_specs_e2e.sh
-    - ./deploy/crdb.sh
+
+
+
+    # Delete secondary ingress controllers
+    - kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml --ignore-not-found
+
+    # Create secondary ingress controllers
+    - kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
+
+    # Change the name for the database
+    - cp manifests/contextservice.yaml manifests/contextservice.yaml.bak
+    - sed -i '/name: CRDB_DATABASE/{n;s/value: .*/value: "tfs_e2e_context"/}' manifests/contextservice.yaml
+    
+        - ./deploy/crdb.sh
     - ./deploy/nats.sh
     - ./deploy/qdb.sh
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
-    - ./src/tests/${TEST_NAME}/subscription_ws_e2e.sh
+    # - ./src/tests/${TEST_NAME}/subscription_ws_e2e.sh
     # - cp /var/teraflow/tfs_runtime_env_vars.sh /var/teraflow/tfs_runtime_env_vars_e2e.sh
 
+    - mv manifests/contextservice.yaml.bak manifests/contextservice.yaml
+
+    #Configure Subscription WS
+    - ./src/tests/ecoc24/subscription_ws_e2e.sh
+
+   -  mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh
+
+
 
 
     # Run end-to-end tests