Skip to content

Changes

Page history
Update WST Merge Request Process Overview authored by DAVID KUNKEL's avatar DAVID KUNKEL
Show whitespace changes
Inline Side-by-side
ADS/WST-Merge-Request-Process-Overview.md
View page @ 34a18cce
...@@ -4,12 +4,19 @@ Drupal developers must follow the steps below when submitting a Merge Request (M ...@@ -4,12 +4,19 @@ Drupal developers must follow the steps below when submitting a Merge Request (M
1. Commit code updates from local dev environment feature branch to Gitlab. This will trigger a Gitlab CI/CD pipeline to build your feature branch site with your new updates in our non-prod environment for MR review. 1. Commit code updates from local dev environment feature branch to Gitlab. This will trigger a Gitlab CI/CD pipeline to build your feature branch site with your new updates in our non-prod environment for MR review.
2. On Gitlab account, click on the **MR setup link** provided at the top of the Gitlab UI to create your MR. 2. On Gitlab account, click on the **MR setup link** provided at the top of the Gitlab UI to create your MR.
3. Select the **`Standard`** MR template for routine updates and fill out the following items: 3. Select the **`Standard`** MR template under `Description` type for routine updates and fill out the following items:
1. **`Summary`** - description of your update with ES story number. (e.g. STRY1234567 - update to x so that y) 1. **`Summary`** - description of your update with ES story number. (e.g. STRY1234567 - update to x so that y)
2. **`Steps to Test`** - list of steps to test your update in your feature branch build. 2. **`Steps to Test`** - list of steps to test your update in your feature branch build.
4. Update **`Assignees`** (upper right corner) to the developer who will review/test MR. ![Screen_Shot_2023-07-03_at_3.32.36_PM](uploads/8fc36f3d411684e7edc2cf71bf3dfddc/Screen_Shot_2023-07-03_at_3.32.36_PM.png)
5. Save `MR` and ping developer in MR `Comments` to start reviewing.
6. **IMPORTANT** - Update your development story in ES portal to change state from `Work in Progress` to `Developer Peer Review` and update `Assignee` field to developer who will review MR. 4. Update **`Assignees`** with developer who will review/test MR.
![Screen_Shot_2023-07-03_at_3.33.44_PM](uploads/8cf65820343813909eace9426cea7c26/Screen_Shot_2023-07-03_at_3.33.44_PM.png)
5. Submit `MR` and then ping developer in MR `Comments` to start reviewing.
![Screen_Shot_2023-07-03_at_3.34.58_PM](uploads/cce8362eb2efc56e44f22a408b081a19/Screen_Shot_2023-07-03_at_3.34.58_PM.png)
6. **IMPORTANT** - Update your development story in ES portal to change state from `Work in Progress` to `Developer Peer Review` and update `Assignee` field to developer who will review MR
![Screen_Shot_2023-07-03_at_3.44.32_PM](uploads/71a91c36c6019e45e37d119b84ef783a/Screen_Shot_2023-07-03_at_3.44.32_PM.png)
![Screen_Shot_2023-07-03_at_3.45.15_PM](uploads/5b49693daaa59a7cb0ab1e997871ca0c/Screen_Shot_2023-07-03_at_3.45.15_PM.png)
**Developer Peer Review steps:** **Developer Peer Review steps:**
......