From bb971a4896ec81c2e480c7485e6033bb84096ee4 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 24 Apr 2025 07:02:39 +0000
Subject: [PATCH] Fix GitLab CI/CD pipeline for NBI

---
 src/tests/ecoc22/.gitlab-ci.yml                          | 1 +
 src/tests/eucnc24/.gitlab-ci.yml                         | 2 +-
 src/tests/ofc22/.gitlab-ci.yml                           | 1 +
 src/tests/ofc24/.gitlab-ci.yml                           | 1 +
 src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml | 2 +-
 src/tests/ofc25-camara-agg-net-controller/Dockerfile     | 2 ++
 src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml     | 2 +-
 src/tests/ofc25-camara-e2e-controller/Dockerfile         | 2 ++
 8 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/tests/ecoc22/.gitlab-ci.yml b/src/tests/ecoc22/.gitlab-ci.yml
index 467f2f8fd..7e238dda2 100644
--- a/src/tests/ecoc22/.gitlab-ci.yml
+++ b/src/tests/ecoc22/.gitlab-ci.yml
@@ -70,6 +70,7 @@ end2end_test ecoc22:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
+    - ./deploy/kafka.sh
     - ./deploy/qdb.sh
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
diff --git a/src/tests/eucnc24/.gitlab-ci.yml b/src/tests/eucnc24/.gitlab-ci.yml
index 1ae05f274..146310b62 100644
--- a/src/tests/eucnc24/.gitlab-ci.yml
+++ b/src/tests/eucnc24/.gitlab-ci.yml
@@ -93,8 +93,8 @@ end2end_test eucnc24:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
-    - ./deploy/qdb.sh
     - ./deploy/kafka.sh
+    - ./deploy/qdb.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
 
diff --git a/src/tests/ofc22/.gitlab-ci.yml b/src/tests/ofc22/.gitlab-ci.yml
index 0fbe2375a..6ba746bb0 100644
--- a/src/tests/ofc22/.gitlab-ci.yml
+++ b/src/tests/ofc22/.gitlab-ci.yml
@@ -71,6 +71,7 @@ end2end_test ofc22:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
+    - ./deploy/kafka.sh
     - ./deploy/qdb.sh
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
diff --git a/src/tests/ofc24/.gitlab-ci.yml b/src/tests/ofc24/.gitlab-ci.yml
index 7937fd1be..412f4ed5e 100644
--- a/src/tests/ofc24/.gitlab-ci.yml
+++ b/src/tests/ofc24/.gitlab-ci.yml
@@ -112,6 +112,7 @@ end2end_test ofc24:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
+    - ./deploy/kafka.sh
     - ./deploy/qdb.sh
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
diff --git a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
index f69c37b38..2fc933827 100644
--- a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
+++ b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
@@ -41,8 +41,8 @@ end2end_test ofc25_camara_agg_net:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
-    - ./deploy/qdb.sh
     - ./deploy/kafka.sh
+    - ./deploy/qdb.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
 
diff --git a/src/tests/ofc25-camara-agg-net-controller/Dockerfile b/src/tests/ofc25-camara-agg-net-controller/Dockerfile
index 92b0bfeb4..d6aedac80 100644
--- a/src/tests/ofc25-camara-agg-net-controller/Dockerfile
+++ b/src/tests/ofc25-camara-agg-net-controller/Dockerfile
@@ -71,6 +71,8 @@ COPY src/service/__init__.py service/__init__.py
 COPY src/service/client/. service/client/
 COPY src/slice/__init__.py slice/__init__.py
 COPY src/slice/client/. slice/client/
+COPY src/vnt_manager/__init__.py vnt_manager/__init__.py
+COPY src/vnt_manager/client/. vnt_manager/client/
 COPY src/tests/*.py ./tests/
 COPY src/tests/ofc25-camara-agg-net-controller/__init__.py ./tests/ofc25-camara-agg-net-controller/__init__.py
 COPY src/tests/ofc25-camara-agg-net-controller/data/. ./tests/ofc25-camara-agg-net-controller/data/
diff --git a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
index c78468180..22f6e38e0 100644
--- a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
+++ b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
@@ -48,8 +48,8 @@ end2end_test ofc25_camara_e2e:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
-    - ./deploy/qdb.sh
     - ./deploy/kafka.sh
+    - ./deploy/qdb.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
 
diff --git a/src/tests/ofc25-camara-e2e-controller/Dockerfile b/src/tests/ofc25-camara-e2e-controller/Dockerfile
index 040f97692..35ca5d4db 100644
--- a/src/tests/ofc25-camara-e2e-controller/Dockerfile
+++ b/src/tests/ofc25-camara-e2e-controller/Dockerfile
@@ -71,6 +71,8 @@ COPY src/service/__init__.py service/__init__.py
 COPY src/service/client/. service/client/
 COPY src/slice/__init__.py slice/__init__.py
 COPY src/slice/client/. slice/client/
+COPY src/vnt_manager/__init__.py vnt_manager/__init__.py
+COPY src/vnt_manager/client/. vnt_manager/client/
 COPY src/tests/*.py ./tests/
 COPY src/tests/ofc25-camara-e2e-controller/__init__.py ./tests/ofc25-camara-e2e-controller/__init__.py
 COPY src/tests/ofc25-camara-e2e-controller/data/. ./tests/ofc25-camara-e2e-controller/data/
-- 
GitLab