From 55fb4ae9de63f67f9be486cec66015714deac247 Mon Sep 17 00:00:00 2001
From: "r.didato" <r.didato@asdynamics.it>
Date: Mon, 24 May 2021 15:54:12 +0200
Subject: [PATCH] Aggiornato esempio gitlab CICD

---
 sample.gitlab-ci.yml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/sample.gitlab-ci.yml b/sample.gitlab-ci.yml
index cb9eefb..d132ff9 100644
--- a/sample.gitlab-ci.yml
+++ b/sample.gitlab-ci.yml
@@ -1,8 +1,8 @@
 variables:
   PROJECT_BUILDNAME: "testskel-job"
   REPO_URI: "662348923997.dkr.ecr.eu-west-1.amazonaws.com/testskel-job"
-  KUBE_DEPLOYMENT_NAME: "testskel-job"
-  KUBE_CONTAINER_NAME: "testskel-job"
+  PROJECT_GROUP: "testskel-job"
+  PROJECT_SERVICE: "testskel-job"
 
 
 stages:
@@ -60,30 +60,25 @@ Build image:
 Deploy Test:
   stage: deploy
   tags:
-    - kube
     - deployer
-    - test
+    - biglietteria-test
   only:
-    - /^[0-9]+\.[0-9]+\.[0-9]+$/
+    - /^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$/
   except:
     - branches
     - triggers
   environment:
     name: test
-  #   url: https://$PROJECT_BUILDNAME.azzurroservice.it/test/
   script:
     - echo "Updating image version"
-    - kubectl set image deployments $KUBE_DEPLOYMENT_NAME $KUBE_CONTAINER_NAME="$REPO_URI:$CI_COMMIT_TAG"
-    - echo "Checking status"
-    - kubectl rollout status deployments $KUBE_CONTAINER_NAME
+    - deployService -p $PROJECT_GROUP -s $PROJECT_SERVICE -t $CI_COMMIT_TAG
 
 
 Deploy Production:
   stage: deploy
   tags:
-    - kube
     - deployer
-    - production
+    - biglietteria1
   only:
     - /^[0-9]+\.[0-9]+\.[0-9]+$/
   except:
@@ -92,9 +87,6 @@ Deploy Production:
   when: manual
   environment:
     name: production
-  #   url: https://$PROJECT_BUILDNAME.azzurroservice.it/
   script:
     - echo "Updating image version"
-    - kubectl set image deployments $KUBE_DEPLOYMENT_NAME $KUBE_CONTAINER_NAME="$REPO_URI:$CI_COMMIT_TAG"
-    - echo "Checking status"
-    - kubectl rollout status deployments $KUBE_CONTAINER_NAME
+    - deployService -p $PROJECT_GROUP -s $PROJECT_SERVICE -t $CI_COMMIT_TAG