From 24db00d0c5da25fb8f5e4c9d5aec4d69c595236c Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 7 Mar 2024 18:18:28 +0000
Subject: [PATCH] Fix CI/CD pipeline

---
 .gitlab-ci.yml           | 22 +++++++++---------
 src/webui/.gitlab-ci.yml | 50 ++++++++++++++++++++--------------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f830a5195..979b7bc81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,25 +23,25 @@ stages:
 # include the individual .gitlab-ci.yml of each micro-service
 include:
   #- local: '/manifests/.gitlab-ci.yml'
-  #- local: '/src/monitoring/.gitlab-ci.yml'
-  #- local: '/src/nbi/.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/dbscanserving/.gitlab-ci.yml'
+  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'
+  - local: '/src/opticalattackdetector/.gitlab-ci.yml'
+  #- local: '/src/opticalattackmanager/.gitlab-ci.yml'
   - local: '/src/ztp/.gitlab-ci.yml'
   - local: '/src/policy/.gitlab-ci.yml'
   - local: '/src/forecaster/.gitlab-ci.yml'
-  #- local: '/src/webui/.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/load_generator/.gitlab-ci.yml'
+  - local: '/src/bgpls_speaker/.gitlab-ci.yml'
diff --git a/src/webui/.gitlab-ci.yml b/src/webui/.gitlab-ci.yml
index 26af10f4e..2486b7071 100644
--- a/src/webui/.gitlab-ci.yml
+++ b/src/webui/.gitlab-ci.yml
@@ -79,28 +79,28 @@ unit test webui:
       reports:
         junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report.xml
 
-# Deployment of the service in Kubernetes Cluster
-deploy webui:
-  variables:
-    IMAGE_NAME: 'webui' # name of the microservice
-    IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
-  stage: deploy
-  needs:
-    - unit test webui
-    # - integ_test execute
-  script:
-    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'
-    - kubectl version
-    - kubectl get all
-    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"
-    - kubectl get all
-  # environment:
-  #   name: test
-  #   url: https://example.com
-  #   kubernetes:
-  #     namespace: test
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
-      when: manual    
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
-      when: manual
+## Deployment of the service in Kubernetes Cluster
+#deploy webui:
+#  variables:
+#    IMAGE_NAME: 'webui' # name of the microservice
+#    IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
+#  stage: deploy
+#  needs:
+#    - unit test webui
+#    # - integ_test execute
+#  script:
+#    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'
+#    - kubectl version
+#    - kubectl get all
+#    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"
+#    - kubectl get all
+#  # environment:
+#  #   name: test
+#  #   url: https://example.com
+#  #   kubernetes:
+#  #     namespace: test
+#  rules:
+#    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
+#      when: manual    
+#    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
+#      when: manual
-- 
GitLab