Merge branch 'master' into feature/community-directory

This commit is contained in:
Jean-Baptiste Pasquier 2021-04-14 00:24:53 +02:00
commit 9a24bb93cc

View File

@ -5,7 +5,7 @@ stages:
- integration - integration
- acceptance - acceptance
- release - release
- deployment - deploy
# default image for jobs # default image for jobs
default: default:
@ -33,6 +33,7 @@ build:
- dist/ - dist/
except: except:
- tags - tags
- feature/ansible
tags: tags:
- test - test
@ -53,6 +54,7 @@ test:e2e:
- cypress run -e CYPRESS_baseUrl=http://localhost:3000 - cypress run -e CYPRESS_baseUrl=http://localhost:3000
except: except:
- tags - tags
- feature/ansible
tags: tags:
- test - test
@ -67,8 +69,10 @@ test1:
extends: .ansible extends: .ansible
stage: integration stage: integration
environment: environment:
name: test1 name: dev/test1
url: https://test1.startinblox.com url: https://test1.startinblox.com
variables:
ANSIBLE_INVENTORY: inventory/dev/
only: only:
- /^feature\/.*/ - /^feature\/.*/
when: manual when: manual
@ -77,8 +81,10 @@ test2:
extends: .ansible extends: .ansible
stage: integration stage: integration
environment: environment:
name: test2 name: dev/test2
url: https://test2.startinblox.com url: https://test2.startinblox.com
variables:
ANSIBLE_INVENTORY: inventory/dev
only: only:
- /^feature\/.*/ - /^feature\/.*/
when: manual when: manual
@ -87,8 +93,10 @@ test3:
extends: .ansible extends: .ansible
stage: integration stage: integration
environment: environment:
name: test3 name: dev/test3
url: https://test3.startinblox.com url: https://test3.startinblox.com
variables:
ANSIBLE_INVENTORY: inventory/dev
only: only:
- /^feature\/.*/ - /^feature\/.*/
when: manual when: manual
@ -97,8 +105,10 @@ stg1:
extends: .ansible extends: .ansible
stage: acceptance stage: acceptance
environment: environment:
name: stg1 name: review/stg1
url: https://stg1.startinblox.com url: https://stg1.startinblox.com
variables:
ANSIBLE_INVENTORY: inventory/stg
only: only:
- /^release\/.*/ - /^release\/.*/
when: manual when: manual
@ -107,8 +117,10 @@ stg2:
extends: .ansible extends: .ansible
stage: acceptance stage: acceptance
environment: environment:
name: stg2 name: review/stg2
url: https://stg2.startinblox.com url: https://stg2.startinblox.com
variables:
ANSIBLE_INVENTORY: inventory/stg
only: only:
- /^release\/.*/ - /^release\/.*/
when: manual when: manual
@ -129,6 +141,16 @@ publish:
hublworld: hublworld:
extends: .ansible extends: .ansible
variables:
ANSIBLE_INVENTORY: inventory/prd
only:
- master
when: manual
hublunderworld:
extends: .ansible
variables:
ANSIBLE_INVENTORY: inventory/prd
only: only:
- master - master
when: manual when: manual