Modify the structure of README.md

Instead of having exercises in their own separate section,
they are now part of the main topics sections.

This should make the learning process easier to follow
where users have both exercises and questions in the same
place.

In addition, added a couple of new questions & exercises
and modified existing scripts accordingly.

coding/python/binary_search.py

@@ -2,9 +2,10 @@
 
 import random
 
+
 def binary_search(arr, lb, ub, target):
     """
-    A Binary Search Example which has O(log n) time complexity. 
+    A Binary Search Example which has O(log n) time complexity.
     """
     if lb <= ub:
         mid = ub + lb // 2
@@ -17,6 +18,7 @@ def binary_search(arr, lb, ub, target):
     else:
         return -1
 
+
 if __name__ == '__main__':
     rand_num_li = sorted([random.randint(1, 50) for _ in range(10)])
     target = random.randint(1, 50)

exercises/ci_for_open_source_project.md → exercises/devops/ci_for_open_source_project.md

@@ -9,4 +9,4 @@
 
 ### Bonus
 
-Containerize the app of the project you forked using any containerization technology you want.
+Containerize the app of the project you forked using any containerization technology you would like.

exercises/git/branch_01.md

@@ -0,0 +1,19 @@
+## Git Commit 01
+
+### Objective
+
+Learn how to work with Git Branches
+
+### Instructions
+
+1. Pick up a Git repository (or create a new one) with at least one commit
+2. Create a new branch called "dev"
+3. Modify one of the files in the repository
+4. Create a new commit
+5. Verify the commit you created is only in "dev" branch
+
+### After you complete the exercise
+
+Answer the following:
+
+1. Why branches are useful? Give an example of one real-world scenario for using branches

exercises/git/commit_01.md

@@ -0,0 +1,20 @@
+## Git Commit 01
+
+### Objective
+
+Learn how to commit changes in Git repositories
+
+### Instructions
+
+1. Create a new directory
+2. Make it a git repository
+3. Create a new file called `file` with the content "hello commit"
+4. Commit your new file
+5. Run a git command to verify your commit was recorded
+
+### After you complete the exercise
+
+Answer the following:
+
+* What are the benefits of commits?
+* Is there another way to verify a commit was created?

exercises/git/solutions/branch_01_solution.md

@@ -0,0 +1,20 @@
+## Branch 01 - Solution
+
+```
+cd some_repository
+echo "master branch" > file1
+git add file1
+git commit -a -m "added file1"
+git checkout -b dev
+echo "dev branch" > file2
+git add file2
+git commit -a -m "added file2"
+```
+
+Verify:
+
+```
+git log (you should see two commits)
+git checkout master
+git log (you should see one commit)
+```

exercises/git/solutions/commit_01_solution.md

@@ -0,0 +1,10 @@
+## Git Commit 01 - Solution
+
+```
+mkdir my_repo && cd my_repo
+git init
+echo "hello_commit" > file
+git add file
+git commit -a -m "It's my first commit. Exciting!"
+git log
+```

exercises/jenkins/remove_builds.md

@@ -0,0 +1,14 @@
+### Jenkins - Remove Jobs
+
+#### Objective 
+
+Learn how to write a Jenkins script that interacts with builds by removing builds older than X days.
+
+#### Instructions
+
+1. Pick up (or create) a job which has builds older than X days
+2. Write a script to remove only the builds that are older than X days
+
+#### Hints
+
+X can be anything. For example, remove builds that are older than 3 days. Just make sure that you don't simply remove all the builds (since that's different from the objective).

exercises/jenkins/remove_jobs.md

@@ -0,0 +1,10 @@
+### Jenkins - Remove Jobs
+
+#### Objective 
+
+Learn how to write a Jenkins script to remove Jenkins jobs
+
+#### Instructions
+
+1. Create three jobs called: test-job, test2-job and prod-job
+2. Write a script to remove all the jobs that include the string "test"

exercises/jenkins/scripts/jobs_with_string.groovy → exercises/jenkins/solutions/remove_jobs_solution.groovy

@@ -1,4 +1,4 @@
-def jobs = Jenkins.instance.items.findAll { job -> job.name =~ /"REMOVE_ME"/ }
+def jobs = Jenkins.instance.items.findAll { job -> job.name =~ /"test"/ }
 
 jobs.each { job ->
     println job.name

scripts/count_questions.sh

@@ -2,4 +2,4 @@
 
 # We dont care about non alphanumerics filenames so we just ls | grep to shorten the script.
 
-echo $(( $(ls -R ./exercises/ | grep ".*md" -c) + $(grep \</summary\> -c README.md) ))
+echo $(( $(grep \</summary\> -c README.md) + $(grep -i Solution README.md | grep \.md -c) ))