Responsible: FC
Responsibility: Pushing development to Production
Next: Done
Objective: Ensure a correct and clean code be merged to production

General

At this phase, client has check and verified the development (without any objections), therefore TC can now merge it to production branch.

Rebasing

Before pushing to production, always make sure that the changes are merge-able. In order to achieve that, always do a rebase on most updated production branch.

git fetch --all
git rebase origin/{PRODUCTION_BRANCH_NAME} -i

Use interactive mode to make sure that the history is clean.

Merging

For Saas, merge your development branch with the {version_no}-{company_name} branch under pshk-custom which exists or has been created. Simply merge and delete branch (test branch and your dev branch) at this point. Then zip your module by:

zip -r <module_name>.zip module_name

For SH, merge your dev branch to the production branch. Afterwards, go to install it either directly in the website or through webshell. In webshell:

odoo-bin -i <module_name> # for installing
odoo-bin -u <module_name> # for updating/upgrading