Skip to content
This repository was archived by the owner on Jul 23, 2022. It is now read-only.

Commit afae8c4

Browse files
authored
Updated README to ensure changes are made to master branch (#562)
* Updated README with master branch changes The changes made to the Jenkinsfile need to be made in the master branch as well as the develop branch. This change describes the changes necessary and extends the instructions in the README file. * Added green pipelines image
1 parent dc67de5 commit afae8c4

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

exercises/2-attack-of-the-pipelines/README.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,25 @@ git push
613613
9. Save the Job configuration to run the initial scan. The log will show scans for `master` and `develop` branches. The `develop` branch has a `Jenkinsfile`, so a pipeline is dynamically created for it.
614614
![todolist-api-multi](../images/exercise2/todolist-api-multi.png)
615615

616-
10. The pipeline file is setup to only run `bake` & `deploy` stages when on `master` or `develop` branch. This is to provide us with very fast feedback for team members working on feature or bug fix branches. Each time someone commits or creates a new branch a basic build with testing occurs to give very rapid feedback to the team.
616+
10. You may notice that your `develop` pipleine has succeeded, and is green. To make the `master` pipleine also succeed and turn from red to green, we need to update the code in the `master` branch. In essence we want to reflect the changes made in the `develop` branch and put them into the the `master` branch.
617+
```bash
618+
git checkout master
619+
```
620+
```bash
621+
git checkout develop Jenkinsfile
622+
```
623+
```bash
624+
git commit -m "Updated Jenkinsfile taken from develop branch"
625+
```
626+
```bash
627+
git push
628+
```
629+
You should notice your Jenkins pipeline detect the changes in the code base and as a result start the pipeline again. Once complete both pipelines should now be green.
630+
![todolist-green-pipelines](../images/exercise2/todolist-green-pipelines.png)
631+
632+
11. The pipeline file is setup to only run `bake` & `deploy` stages when on `master` or `develop` branch. This is to provide us with very fast feedback for team members working on feature or bug fix branches. Each time someone commits or creates a new branch a basic build with testing occurs to give very rapid feedback to the team.
617633

618-
11. With the build running for `develop`, we can explore the Blue Ocean View for Jenkins. On the Job overview page, hit the `Open Blue Ocean` button on the side to see what modern Jenkins looks like.
634+
12. With the build running for `develop`, we can explore the Blue Ocean View for Jenkins. On the Job overview page, hit the `Open Blue Ocean` button on the side to see what modern Jenkins looks like.
619635
![blue-ocean-todolist](../images/exercise2/blue-ocean-todolist.png)
620636

621637
_____
Loading

0 commit comments

Comments
 (0)