From 40c0ca61d8a44c6212aa1dab6210ac2455d8cee3 Mon Sep 17 00:00:00 2001 From: donal <donalspring@gmail.com> Date: Tue, 29 May 2018 15:58:30 +0200 Subject: [PATCH] FIX - updates from the real time retro --- exercises/README.md | 1 + exercises/2-attack-of-the-pipelines/README.md | 2 +- exercises/4-an-enslaved-hope/README.md | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/exercises/2-attack-of-the-pipelines/README.md b/exercises/2-attack-of-the-pipelines/README.md index cadac84..cbb6aa9 100644 --- a/exercises/2-attack-of-the-pipelines/README.md +++ b/exercises/2-attack-of-the-pipelines/README.md @@ -455,7 +455,7 @@ 5. With the BuildConfig and DeployConfig in place for both our apps (`*-fe` & `*-api`) from previous steps; Log into Jenkins and create a `New Item`. This is just jenkins speak for a new job configuration.  -5. Name this job `dev-todolist-fe-build` and select `Freestyle Job`. All our jobs will take the form of `<ENV>-<APP_NAME>-<JOB_PURPOSE>`.  +5. Name this job `dev-todolist-fe-build` and select `Freestyle Project`. All our jobs will take the form of `<ENV>-<APP_NAME>-<JOB_PURPOSE>`.  5. The page that loads is the Job Configuration page and it can be returned to at anytime from Jenkins. Let's start configuring our job. To conserve space; we will make sure Jenkins only keeps the last builds artifacts. Tick the `Discard old builds` checkbox, then `Advanced` and set `Max # of builds to keep with artifacts` to 1 as indicated below  diff --git a/exercises/4-an-enslaved-hope/README.md b/exercises/4-an-enslaved-hope/README.md index 3019959..f084fc2 100644 --- a/exercises/4-an-enslaved-hope/README.md +++ b/exercises/4-an-enslaved-hope/README.md @@ -296,9 +296,9 @@ #### 3a - OWASP ZAP > _OWASP ZAP (Zed Attack Proxy) is a free open source security tool used for finding security vulnerabilities in web applications._ -3. On your terminal; move to the `enablement-ci-cd` repo. We already have the `templates/jenkins-slave-generic-template.yml` template we're going to re-use from the previous lab so all we need is to check out the params file +3. On your terminal; move to the `enablement-ci-cd` repo. We need to checkout a template for OpenShift to build our Jenkins Slave images and some parameters for the `zap` slave. ```bash -git checkout exercise4/zap-and-arachni params/jenkins-slave-zap +git checkout exercise4/zap-and-arachni params/jenkins-slave-zap templates/jenkins-slave-generic-template.yml ``` 3. This should have created the following files which we will fill out. We will use a `ZAP` image hosted on the `rht-labs/ci-cd` repo so there will be no `Dockerfile` needed: diff --git a/exercises/README.md b/exercises/README.md index d61ba83..b171e6a 100644 --- a/exercises/README.md +++ b/exercises/README.md @@ -12,6 +12,7 @@ - Git Installed - Google Chrome Web Browser (>59) - Docker latest + - JDK v8 - Access to an OpenShift cluster `oc login -u <username> -p <password> <cluster_url>` - Text editor such as Atom, IntelliJ or Visual Studio Code (The exercise were created using VSCode, so the screenshots will match it's layout and colour schemes) -- Gitblit v1.9.3