From 96d171175638b13537310ace4fc2a9e6145654d8 Mon Sep 17 00:00:00 2001 From: Ravi Srinivasan <rsriniva@users.noreply.github.com> Date: Mon, 25 Mar 2019 14:53:55 +0100 Subject: [PATCH] Merge pull request #4 from rdebeasi/patch-1 --- exercises/4-an-enslaved-hope/README.md | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/exercises/4-an-enslaved-hope/README.md b/exercises/4-an-enslaved-hope/README.md index 16d585e..aa36fe5 100644 --- a/exercises/4-an-enslaved-hope/README.md +++ b/exercises/4-an-enslaved-hope/README.md @@ -219,6 +219,7 @@ 1. For the rest of the lab, ensure that you are working from the `master` branch ```bash +cd todolist-fe git checkout master ``` @@ -233,7 +234,7 @@ 4. Create a new object in `inventory/group_vars/all.yml` to drive the `ocp-pipeline` template with the parameters file you've just created. It can be put under the existing `todolist-fe-build` object. ```yaml - - name: todolist-ocp-pipeline + - name: todolist-fe-pipeline template: "{{ playbook_dir }}/templates/ocp-pipeline.yml" params: "{{ playbook_dir }}/params/ocp-pipeline" namespace: "{{ ci_cd_namespace }}" @@ -284,7 +285,7 @@ 10. Update the `todolist-api/.openshift-applier/inventory/group_vars/all.yml` with a new object to drive the params and template ```yaml - - name: todolist-ocp-pipeline + - name: todolist-api-pipeline template: "{{ playbook_dir }}/templates/ocp-pipeline.yml" params: "{{ playbook_dir }}/params/ocp-pipeline" namespace: "{{ ci_cd_namespace }}" @@ -426,11 +427,11 @@ 6. In the `Containers` section for the pod template, add a new container template with the following details: * Enter `jnlp` in the `Name` field - * Enter `docker-registry.default.svc:5000/rsriniva-ci-cd/jenkins-slave-arachni` in the `Docker image` field + * Enter `docker-registry.default.svc:5000/<YOUR_NAME>-ci-cd/jenkins-slave-arachni` in the `Docker image` field * Enter `/tmp` in the `Working directory` field * Enter `${computer.jnlpmac} ${computer.name}` in the `Arguments to pass to the command` field -7. Add a new environment variable called `GIT_SSL_NO_VERIFY` and set its value to `true`. Your final `jenkins-slave-arachni` kubernetes pod template should look like the following: +7. Add a new environment variable for the container template called `GIT_SSL_NO_VERIFY` and set its value to `true`. Your final `jenkins-slave-arachni` kubernetes pod template should look like the following: ![add-kube-pod-template](../images/exercise4/new-arachni-container-template.png) 8. Click `Save` at the bottom of the page to save your global Jenkins settings. -- Gitblit v1.9.3