Commit ca602008 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

docs: main or master as prod branch

parent 66b326a6

README.md

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ Here are variables supported to configure the integration environment: 


### Staging environment configuration



The staging environment is an iso-prod environment meant for testing and validation purpose associated to your production branch (`master` by default).

The staging environment is an iso-prod environment meant for testing and validation purpose associated to your production branch (`main` or `master` by default).



It is **disabled by default** and can be enabled by setting the `ANSIBLE_STAGING_PLAYBOOK_FILE` variable (see below).

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ 
    {

      "id": "staging",

      "name": "Staging",

      "description": "An iso-prod environment meant for testing and validation purpose on your production branch (`master` by default)",

      "description": "An iso-prod environment meant for testing and validation purpose on your production branch (`main` or `master` by default)",

      "variables": [

        {

          "name": "ANSIBLE_STAGING_APP_NAME",