From 1b4b42b2b33f9cce5f969b5303d34526947a7734 Mon Sep 17 00:00:00 2001
From: plup <plup@plup.io>
Date: Tue, 13 Apr 2021 18:41:29 +0200
Subject: [PATCH 1/2] cicd: updated ansible inventory paths

---
 .gitlab-ci.yml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 343be79..44304c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,7 @@ build:
       - dist/
   except:
     - tags
+    - feature/ansible
   tags:
     - test
 
@@ -53,6 +54,7 @@ test:e2e:
     - cypress run -e CYPRESS_baseUrl=http://localhost:3000
   except:
     - tags
+    - feature/ansible
   tags:
     - test
 
@@ -67,8 +69,10 @@ test1:
   extends: .ansible
   stage: integration
   environment:
-    name: test1
+    name: dev/test1
     url: https://test1.startinblox.com
+  variables:
+    ANSIBLE_INVENTORY: inventory/dev/
   only:
     - /^feature\/.*/
   when: manual
@@ -77,8 +81,10 @@ test2:
   extends: .ansible
   stage: integration
   environment:
-    name: test2
+    name: dev/test2
     url: https://test2.startinblox.com
+  variables:
+    ANSIBLE_INVENTORY: inventory/dev
   only:
     - /^feature\/.*/
   when: manual
@@ -87,8 +93,10 @@ test3:
   extends: .ansible
   stage: integration
   environment:
-    name: test3
+    name: dev/test3
     url: https://test3.startinblox.com
+  variables:
+    ANSIBLE_INVENTORY: inventory/dev
   only:
     - /^feature\/.*/
   when: manual
@@ -97,8 +105,10 @@ stg1:
   extends: .ansible
   stage: acceptance
   environment:
-    name: stg1
+    name: review/stg1
     url: https://stg1.startinblox.com
+  variables:
+    ANSIBLE_INVENTORY: inventory/stg
   only:
     - /^release\/.*/
   when: manual
@@ -107,8 +117,10 @@ stg2:
   extends: .ansible
   stage: acceptance
   environment:
-    name: stg2
+    name: review/stg2
     url: https://stg2.startinblox.com
+  variables:
+    ANSIBLE_INVENTORY: inventory/stg
   only:
     - /^release\/.*/
   when: manual
@@ -129,6 +141,9 @@ publish:
 
 hublworld:
   extends: .ansible
+  stage: deployment
+  variables:
+    ANSIBLE_INVENTORY: inventory/prd
   only:
     - master
   when: manual

From a9366cd49fd281f0a03b8d9e926657c4175864cf Mon Sep 17 00:00:00 2001
From: plup <plup@plup.io>
Date: Tue, 13 Apr 2021 18:52:27 +0200
Subject: [PATCH 2/2] cicd: added hublunderworld federation

---
 .gitlab-ci.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44304c5..bd57ae6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
  - integration
  - acceptance
  - release
- - deployment
+ - deploy
 
 # default image for jobs
 default:
@@ -141,7 +141,14 @@ publish:
 
 hublworld:
   extends: .ansible
-  stage: deployment
+  variables:
+    ANSIBLE_INVENTORY: inventory/prd
+  only:
+    - master
+  when: manual
+
+hublunderworld:
+  extends: .ansible
   variables:
     ANSIBLE_INVENTORY: inventory/prd
   only: