From b0d37cdddf14969ff7c09c3a87a29e7dada2755d Mon Sep 17 00:00:00 2001
From: M9713 <m9713@student.jamk.fi>
Date: Mon, 8 Nov 2021 20:46:30 +0200
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae575dc..587711d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,17 +34,20 @@ deploy:
 
     when: manual
 
-    script: echo "Deploying Backend"
+    script: echo "Deploying"
     image: bitnami/kubectl:latest
     script:
          - kubectl apply -f $CI_PROJECT_DIR/conduit-backend/backend-service.yaml
          - kubectl apply -f $CI_PROJECT_DIR/conduit-backend/backend-deployment.yaml
-         - kubectl -n default rollout restart deployment backend   
-
-
-    script: echo "Deploying Frontend"
-    image: bitnami/kubectl:latest
-    script:
          - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-service.yaml
          - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-deployment.yaml
+         - kubectl -n default rollout restart deployment backend  
          - kubectl -n default rollout restart deployment front 
+
+
+#    script: echo "Deploying Frontend"
+#    image: bitnami/kubectl:latest
+#    script:
+#         - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-service.yaml
+#         - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-deployment.yaml
+#         - kubectl -n default rollout restart deployment front 
-- 
GitLab