Skip to content

paulscherrerinstitute/percona-backup-mongodb

 
 

Repository files navigation

PSI git workflow

This workflow is needed whenever an upgrade of percona is due, which involves a new upstream release of the backup container.

In order to apply the patch on upstream releases, the most convinient workflow is what follows:

  1. checkout to origin main
git checkout main
  1. fetch upstream (if not set git remote add upstream https://github.com/percona/percona-backup-mongodb.git)
git fetch upstream
  1. set the TAG_NAME of interest
TAG_NAME=...
  1. rebase tag on origin/main
git rebase <$TAG_NAME>
  1. resolve any possible conflict keeping the origin version for psi-ci.yaml, README.md, restore.go
  2. force push to origin main
git push origin main --force-with-lease
  1. push the tags
git push --tags

In this way the patch commits from origin are applied on top of the release, which results in preserving the upstream history.

Create a release

At this point, since the image is created and pushed on release, create a release and the corresponding tat. The name of the tag should be $TAG_NAME-patched.