From 45f8d6fddd640307c1606440659b6812198b3a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Sun, 24 Jul 2022 09:07:35 +0000
Subject: [PATCH 1/2] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 525555f2b..82b4502e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,6 +77,7 @@ deploy:spot.eeo.one.backend1:
     - branches
   environment:
     name: eeo1
+    deployment_tier: staging
     url: https://spot.eeo.one
   variables:
     DOCKER_HOST: ssh://${SSH_USER}@${BACKEND1_HOST}
@@ -114,6 +115,7 @@ deploy:spot.eeo.one.backend2:
     - branches
   environment:
     name: eeo2
+    deployment_tier: staging
     url: https://spot.eeo.one
   variables:
     DOCKER_HOST: ssh://${SSH_USER}@${BACKEND2_HOST}
@@ -150,6 +152,7 @@ deploy:spot.ecloud.global.backend1:
     - tags
   environment:
     name: ecloud1
+    deployment_tier: production
     url: https://spot.ecloud.global
   variables:
     DOCKER_HOST: ssh://${SSH_USER}@${BACKEND1_HOST}
@@ -186,6 +189,7 @@ deploy:spot.ecloud.global.backend2:
     - tags
   environment:
     name: ecloud2
+    deployment_tier: production
     url: https://spot.ecloud.global
   variables:
     DOCKER_HOST: ssh://${SSH_USER}@${BACKEND2_HOST}
-- 
GitLab


From 49940c771a7752a9a71b504e086f5b4a02e789e3 Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Mon, 25 Jul 2022 13:34:33 +0000
Subject: [PATCH 2/2] update urls

---
 .gitlab-ci.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82b4502e9..26fba473f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,7 +70,7 @@ test:unit:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker pull $CI_REGISTRY_IMAGE/env
 
-deploy:spot.eeo.one.backend1:
+deploy:spot.murenatest.io.backend1:
   extends: .deploy:template
   when: manual
   only:
@@ -78,10 +78,10 @@ deploy:spot.eeo.one.backend1:
   environment:
     name: eeo1
     deployment_tier: staging
-    url: https://spot.eeo.one
+    url: https://spot.murenatest.io
   variables:
     DOCKER_HOST: ssh://${SSH_USER}@${BACKEND1_HOST}
-    SPOT_HOSTNAME: spot.eeo.one
+    SPOT_HOSTNAME: spot.murenatest.io
     SEARX_PROXY_HTTP: http://proxy01.ecloud.global:1099
     SEARX_PROXY_HTTPS: http://proxy01.ecloud.global:1099
     COMPOSE_PROJECT_NAME: staging-spot
@@ -108,7 +108,7 @@ deploy:spot.eeo.one.backend1:
       && sed -i 's|CI_REGISTRY_IMAGE=image|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE|g' .env
       && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
 
-deploy:spot.eeo.one.backend2:
+deploy:spot.murenatest.io.backend2:
   extends: .deploy:template
   when: manual
   only:
@@ -116,10 +116,10 @@ deploy:spot.eeo.one.backend2:
   environment:
     name: eeo2
     deployment_tier: staging
-    url: https://spot.eeo.one
+    url: https://spot.murenatest.io
   variables:
     DOCKER_HOST: ssh://${SSH_USER}@${BACKEND2_HOST}
-    SPOT_HOSTNAME: spot.eeo.one
+    SPOT_HOSTNAME: spot.murenatest.io
     SEARX_PROXY_HTTP: http://proxy02.ecloud.global:1099
     SEARX_PROXY_HTTPS: http://proxy02.ecloud.global:1099
     COMPOSE_PROJECT_NAME: staging-spot
@@ -146,17 +146,17 @@ deploy:spot.eeo.one.backend2:
       && sed -i 's|CI_REGISTRY_IMAGE=image|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE|g' .env
       && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d"
 
-deploy:spot.ecloud.global.backend1:
+deploy:spot.murena.io.backend1:
   extends: .deploy:template
   only:
     - tags
   environment:
     name: ecloud1
     deployment_tier: production
-    url: https://spot.ecloud.global
+    url: https://spot.murena.io
   variables:
     DOCKER_HOST: ssh://${SSH_USER}@${BACKEND1_HOST}
-    SPOT_HOSTNAME: spot.ecloud.global
+    SPOT_HOSTNAME: spot.murena.io
     SEARX_PROXY_HTTP: http://proxy01.ecloud.global:1099
     SEARX_PROXY_HTTPS: http://proxy01.ecloud.global:1099
     COMPOSE_PROJECT_NAME: production-spot
@@ -183,17 +183,17 @@ deploy:spot.ecloud.global.backend1:
       && sed -i 's|CI_REGISTRY_IMAGE=image|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE|g' .env
       && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
 
-deploy:spot.ecloud.global.backend2:
+deploy:spot.murena.io.backend2:
   extends: .deploy:template
   only:
     - tags
   environment:
     name: ecloud2
     deployment_tier: production
-    url: https://spot.ecloud.global
+    url: https://spot.murena.io
   variables:
     DOCKER_HOST: ssh://${SSH_USER}@${BACKEND2_HOST}
-    SPOT_HOSTNAME: spot.ecloud.global
+    SPOT_HOSTNAME: spot.murena.io
     SEARX_PROXY_HTTP: http://proxy02.ecloud.global:1099
     SEARX_PROXY_HTTPS: http://proxy02.ecloud.global:1099
     COMPOSE_PROJECT_NAME: production-spot
-- 
GitLab