Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Reference case: https://jira.sunet.se/browse/SA-72 (when we did for the first time)

in puppet-sunet

Code Block
git checkout stable-2023v1
git pull
git checkout se-beta
git diff HEAD..stable-2023v1 (checked the diffs)
git merge stable-2023v1
bump-tag

Multiverse update

Reference case: https://jira.sunet.se/browse/SA-72 (when we did for the first time)

in thiss-ops

Code Block
git remote add multiverse git@github.com:SUNET/multiverse.git (If you don't already have it in your .git/config)

...


git fetch --all

...


git checkout multiverse (we already have a multiverse branch in remote)

...


git merge multiverse/main (meged the local multiverse branch with upstream multivers's main branch)

...


git push

...


Now we can check the diffs here https://github.com/TheIdentitySelector/thiss-ops/compare/master...multiverse

...


If satisified, create a Pull Request and confirm the merge.


How often should we check and renew tags, update multiverse & update HAproxy image?

...