Merge branch 'master' into feature/community-directory

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
  - integration
  - acceptance
  - release
- - deployment
+ - deploy
 
 # default image for jobs
 default:
@@ -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,16 @@ publish:
 
 hublworld:
   extends: .ansible
+  variables:
+    ANSIBLE_INVENTORY: inventory/prd
+  only:
+    - master
+  when: manual
+
+hublunderworld:
+  extends: .ansible
+  variables:
+    ANSIBLE_INVENTORY: inventory/prd
   only:
     - master
   when: manual