The diagram shows the following:
- Development cycle runs from sprint shift to sprint shift
- Start Tuesday, lasts 14 days
- Test cycle runs staggered from sprint shift
- Start on Wednesday in the second week of the sprint, lasts 14 days
- Release is Thursday in the second week of the next sprint
- Code Freeze is on the time it takes to merge
The workflow for an assignment are as follows:
- The developer creates a user branch based on the DEV branch
- The developer implements the change, finishes it and after testing in own branch it is committed to the DEV branch
- When code freeze is reached, the code from DEV is merged to TEST branch
- Developers may now proceed with committing to the DEV branch
- Testers begin testing in TEST branch (And further to staging)
- When the release date is reached testing should be done and the product is ready.
Merging procedure (Managed by the merge-responsible person):
- Announce Code Freeze in effect (Send email to all in the team)
- Create branch based on TEST branch
- Locally merge in DEV branch
- Solve possible conflicts
- Push to remote branch
- Create PR
- Complete PR
- Write mail for the team regarding the merge (So that ppl can start pushing to DEV branch again)