Product backlog (8 story)
↓
Sprint planning
↓
Sprint – 1 : backlog (4 Story) ⇒ 1 – 4 Weeks
↓
Epic – 1 : User-1 story – 1 ⇒ Ticket : OGANI-T01 – Creating Index.html
story – 2 ⇒ Ticket : OGANI-T02 – Creating shop-details.html
Epic – 2 : User-2 story – 3 ⇒ Ticket : OGANI-T03 – shop-grid.html
story – 4 ⇒ Ticket : OGANI-T04 – shoping-cart.html
↓
Completes
↓
Sprint planning
↓
Sprint – 2 : backlog (4 Story) ⇒ 1 – 4 Weeks
↓
Epic – 1 : User-1 story – 5 ⇒ Ticket : OGANI-T05 – Creating checkout.html
story – 6 ⇒ Ticket : OGANI-T06 – contact.html
Epic – 2 : User-2 story – 7 ⇒ Ticket : OGANI-T07 – blog.html
story – 8 ⇒ Ticket : OGANI-T08 – blog-details.html
Agile Scrum – Planning :
Pre requs:
- 3 github accounts (1 acts as manager, 2 acts two developers)
- Git bash
- Vs code, vs codium
- 3 browsers(recommended chrome,edge and brave)
- Ogani project source code – zip
Part -1 : Manager/Sr Dev/DevOps Engineer : sagarfive
1 | Creating local git repository at git bash | cd ogani-store-webapp git init |
2 | Adding a first commit with changelog.txt file | echo “changelog Created on 16-05-2023 at 05:23 PM” > changelog.txt git add changelog.txt git commit -m “Added changelog.txt“ |
3 | Creating Dev branch Checking out to branch Listing file Checking commits | git branch devgit checkout branchls git log –oneline |
4 | Modifying the changelog and commit | echo “\n ====\n dev branch added” >> changelog.txt git add changelog.txt git commit -m “Modified changelog.txt“ |
5 | Creating a github private repo Create account if you don’t haveRepository name Once created copy the github repo url | https://github.com/new ogani-store-webapp <url> |
6 | Config your account at git bash | git config –global user.name “sagarfive” git config –global user.email “sagarfive.in@gmail.com” |
7 | Push to github (if you pushing first time it ask for authentication refer : https://sagarfive.in/git/git-tutorials/5-github/github-authentication ) | git branch -M maingit remote add origin <github url>git push origin maingit checkout devgit push origin dev |
8 | Verify at github repo |
Part 2 : featurebranch1
Sprint – 1 : backlog (4 Story) ⇒ 1 – 4 Weeks
↓
Epic – 1 : User-1 story – 1 ⇒ Ticket : OGANI-T01 – Creating Index.html
1 | Opening vscode, Move to source control menu | |
2 | Select clone repository > clone from github > login to github > then your project are shown | |
3 | Create feature branch from dev branch Branch name : feature-OGANI-T01 | Source control > menu > branch > Create branch from Select dev branch Give branch name Branch creates You can verify at github.com repo |
4 | Checkout/verify your at feature-branch | |
5 | Add files and dependencies Staging | Add index.html and dependencies Source control > menu > changes > stage all changes |
6 | Verify the changes at local machine | Open the files on browser and check |
7 | Commit, if everything ok Commit message : Added OGANI-T01 – Creating Index.html | Source control > menu > commit > commit staged |
8 | Rise PR (Pull Request) to merge feature to dev branch at github.com | Dev ← feature-OGANI-T01 |
9 | Now it’s turn to Manager -> check the pull request – > approve pr merge with dev branch |
Part 3 : featurebranch2
Sprint – 1 : backlog (4 Story) ⇒ 1 – 4 Weeks
↓
Epic – 1 : User-1 story – 2 ⇒ Ticket : OGANI-T02 – Creating shop-details.html
3 | Create feature branch from dev branch Branch name : feature-OGANI-T02 | Source control > menu > branch > Create branch from Select dev branch Give branch name Branch creates You can verify at github.com repo |
4 | Checkout/verify your at feature-branch | |
5 | Add files and dependencies Staging | Add shop-details Source control > menu > changes > stage all changes |
6 | Verify the changes at local machine | Open the files on browser and check |
7 | Commit, if everything ok Commit : added OGANI-T02 – Creating shop-details.html | Source control > menu > commit > commit staged |
8 | Rise PR (Pull Request) to merge feature to dev branch at github.com | Dev ← feature-OGANI-T02 |
9 | Now it’s turn to Manager -> check the pull request – > approve pr merge with dev branch |
1 | Create Release branch from dev branch Branch name : release 0.1.0 | Source control > menu > branch > Create branch from Select dev branch Give branch name Branch creates You can verify at github.com repo |
2 | Verify the changes |
Release branch has cicd with qa portal , so qa team test the website and rise bugs based on issues on website
If they rised a bug
1 | Create bugfix branch from release branch Branch name : bugfix-B01 | Source control > menu > branch > Create branch from Select release branch Give branch name Branch creates You can verify at github.com repo |
Part 6 : back sync bugfix branch to release and dev branches
1 | Rise PR (Pull Request) to merge bugfix branch to release branch at github.com | Release ← bugfix |
2 | Rise PR (Pull Request) to merge release branch to dev branch at github.com | Dev ← Release |
9 | Now it’s turn to Manager -> check the pull requests – > approve pr merge with dev branch |
Part 7 : Master merge – creating tag
1 | Rise PR (Pull Request) to merge release branch to master/main branch at github.com | Main ← release |
2 | Now it’s turn to Manager -> check the pull requests – > approve pr merge with dev branch | |
3 | Create tag | git tag v0.1.0 |