From 137fabcab81c2a2a7737e0dc1037db05e4a36fd6 Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Fri, 7 Jan 2022 13:07:26 +0000
Subject: [PATCH] Fix GitLab CI pipeline for Context, Device, Service and
 Compute components.

---
 manifests/monitoringservice.yaml | 2 +-
 src/compute/.gitlab-ci.yml       | 8 ++++----
 src/context/.gitlab-ci.yml       | 8 ++++----
 src/device/.gitlab-ci.yml        | 8 ++++----
 src/service/.gitlab-ci.yml       | 8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/manifests/monitoringservice.yaml b/manifests/monitoringservice.yaml
index ca5f71088..d1b4023fa 100644
--- a/manifests/monitoringservice.yaml
+++ b/manifests/monitoringservice.yaml
@@ -74,4 +74,4 @@ spec:
     protocol: TCP
     port: 8086
     targetPort: 8086
----
\ No newline at end of file
+---
diff --git a/src/compute/.gitlab-ci.yml b/src/compute/.gitlab-ci.yml
index d10d5acfb..9bcc43664 100644
--- a/src/compute/.gitlab-ci.yml
+++ b/src/compute/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build compute:
       - src/$IMAGE_NAME/**/*.{py,in,yml}
       - src/$IMAGE_NAME/Dockerfile
       - src/$IMAGE_NAME/tests/*.py
-      - manifests/$IMAGE_NAMEservice.yaml
+      - manifests/${IMAGE_NAME}service.yaml
       - .gitlab-ci.yml
 
 # Apply unit test to the component
@@ -52,7 +52,7 @@ unit test compute:
       - src/$IMAGE_NAME/Dockerfile
       - src/$IMAGE_NAME/tests/*.py
       - src/$IMAGE_NAME/tests/Dockerfile
-      - manifests/$IMAGE_NAMEservice.yaml
+      - manifests/${IMAGE_NAME}service.yaml
       - .gitlab-ci.yml
 
 # Deployment of the service in Kubernetes Cluster
@@ -65,10 +65,10 @@ deploy compute:
     - unit test compute
     # - integ_test execute
   script:
-    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/$IMAGE_NAMEservice.yaml'
+    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'
     - kubectl version
     - kubectl get all
-    - kubectl apply -f "manifests/$IMAGE_NAMEservice.yaml"
+    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"
     - kubectl get all
   # environment:
   #   name: test
diff --git a/src/context/.gitlab-ci.yml b/src/context/.gitlab-ci.yml
index bae78b86d..a330a4449 100644
--- a/src/context/.gitlab-ci.yml
+++ b/src/context/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build context:
       - src/$IMAGE_NAME/**/*.{py,in,yml}
       - src/$IMAGE_NAME/Dockerfile
       - src/$IMAGE_NAME/tests/*.py
-      - manifests/$IMAGE_NAMEservice.yaml
+      - manifests/${IMAGE_NAME}service.yaml
       - .gitlab-ci.yml
 
 # Apply unit test to the component
@@ -56,7 +56,7 @@ unit test context:
       - src/$IMAGE_NAME/Dockerfile
       - src/$IMAGE_NAME/tests/*.py
       - src/$IMAGE_NAME/tests/Dockerfile
-      - manifests/$IMAGE_NAMEservice.yaml
+      - manifests/${IMAGE_NAME}service.yaml
       - .gitlab-ci.yml
 
 # Deployment of the service in Kubernetes Cluster
@@ -69,10 +69,10 @@ deploy context:
     - unit test context
     # - integ_test execute
   script:
-    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/$IMAGE_NAMEservice.yaml'
+    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'
     - kubectl version
     - kubectl get all
-    - kubectl apply -f "manifests/$IMAGE_NAMEservice.yaml"
+    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"
     - kubectl get all
   # environment:
   #   name: test
diff --git a/src/device/.gitlab-ci.yml b/src/device/.gitlab-ci.yml
index 2c93618af..1693d3687 100644
--- a/src/device/.gitlab-ci.yml
+++ b/src/device/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build device:
       - src/$IMAGE_NAME/**/*.{py,in,yml}
       - src/$IMAGE_NAME/Dockerfile
       - src/$IMAGE_NAME/tests/*.py
-      - manifests/$IMAGE_NAMEservice.yaml
+      - manifests/${IMAGE_NAME}service.yaml
       - .gitlab-ci.yml
 
 # Apply unit test to the component
@@ -52,7 +52,7 @@ unit test device:
       - src/$IMAGE_NAME/Dockerfile
       - src/$IMAGE_NAME/tests/*.py
       - src/$IMAGE_NAME/tests/Dockerfile
-      - manifests/$IMAGE_NAMEservice.yaml
+      - manifests/${IMAGE_NAME}service.yaml
       - .gitlab-ci.yml
 
 # Deployment of the service in Kubernetes Cluster
@@ -65,10 +65,10 @@ deploy device:
     - unit test device
     # - integ_test execute
   script:
-    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/$IMAGE_NAMEservice.yaml'
+    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'
     - kubectl version
     - kubectl get all
-    - kubectl apply -f "manifests/$IMAGE_NAMEservice.yaml"
+    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"
     - kubectl get all
   # environment:
   #   name: test
diff --git a/src/service/.gitlab-ci.yml b/src/service/.gitlab-ci.yml
index 3c943d543..da5064f6c 100644
--- a/src/service/.gitlab-ci.yml
+++ b/src/service/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build service:
       - src/$IMAGE_NAME/**/*.{py,in,yml}
       - src/$IMAGE_NAME/Dockerfile
       - src/$IMAGE_NAME/tests/*.py
-      - manifests/$IMAGE_NAMEservice.yaml
+      - manifests/${IMAGE_NAME}service.yaml
       - .gitlab-ci.yml
 
 # Apply unit test to the component
@@ -52,7 +52,7 @@ unit test service:
       - src/$IMAGE_NAME/Dockerfile
       - src/$IMAGE_NAME/tests/*.py
       - src/$IMAGE_NAME/tests/Dockerfile
-      - manifests/$IMAGE_NAMEservice.yaml
+      - manifests/${IMAGE_NAME}service.yaml
       - .gitlab-ci.yml
 
 # Deployment of the service in Kubernetes Cluster
@@ -65,10 +65,10 @@ deploy service:
     - unit test service
     # - integ_test execute
   script:
-    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/$IMAGE_NAMEservice.yaml'
+    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'
     - kubectl version
     - kubectl get all
-    - kubectl apply -f "manifests/$IMAGE_NAMEservice.yaml"
+    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"
     - kubectl get all
   # environment:
   #   name: test
-- 
GitLab