Skip to Content
This question has been flagged
1 Reply
4814 Views
Avatar
Tim Drinkwater

We are implementing on Odoo.sh.  We've done a good amount of data importing and setup on a staging branch.  We're happy with the progress and would like to capture it.  


When trying to merge the staging branch with the production branch we are getting the that there are No commits between Production and Staging.


I apparently don't have as strong of a grasp on how Odoo.sh functions as I thought I did.  We have a good amount of data imported as well as some studio modifications that we certainly don't want to loose.  What is the proper process? 

Avatar
Discard
Avatar
Sunny Sheth
Best Answer

Hello Tim,


The below documentation will help you in detail to merge your changes from staging branch to production branch.

https://www.odoo.com/documentation/14.0/administration/odoo_sh/getting_started/branches.html



https://www.odoo.com/documentation/14.0/administration/odoo_sh/getting_started/branches.html#merging-your-branches



https://www.cybrosys.com/blog/odoosh-the-odoo-cloud-platform


Merging a staging branch in the production branch only merges the source code: Any configuration changes you made in the staging databases are not passed to the production database.

If you test configuration changes in staging branches and want them to be applied in the production, you have to either:

write the configuration changes in XML data files overriding the default configuration or views in your branches, and then increase the version of your module in its manifest (__manifest__.py) to trigger the update of the module when you merge your staging branch in your production branch. This is the best practice for a better scalability of your developments as you will use the Git versioning features for all your configuration changes, and therefore have traceability for your changes.

pass them manually from your staging to your production database, by copy/pasting them.




Thanks & Regards,

Sunny Sheth

Avatar
Discard
Tim Drinkwater
Author

Sunny,

Thank you for the clarification. I clearly misunderstood the intended functionality of odoo.sh.

The data we can reimport but we've created some functionality with Studio. Our required functions were rather simple and we wanted to keep with within studio to allow for smoother upgrades. How does one capture those changes? Do Studio modifications have to be performed on the production instance?

Our production instance is static and unchanged since we forked for staging. Can we simple promote our staging branch and replace the production DB?

Sunny Sheth

HI Tim

Yes your studio customization will work on the Production instance same as your staging branch (actually, Studio customize saved in new module studio_customization in ODOO so your all Changes are saved in 1 custom module which is generated by ODOO Studio on your staging server, so once your DB Restored on a Production server then you get same changes on your Production server also)