From de26e3a0c846390cf3ced4c23a571c815b7b3ca6 Mon Sep 17 00:00:00 2001 From: Rob Harris <roharris@redhat.com> Date: Wed, 11 Apr 2018 12:32:13 +0200 Subject: [PATCH] More sentence fixes pt2 --- 1-the-manual-menace/README.md | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/1-the-manual-menace/README.md b/1-the-manual-menace/README.md index d4fd6a4..39d3187 100644 --- a/1-the-manual-menace/README.md +++ b/1-the-manual-menace/README.md @@ -165,7 +165,7 @@ 4. Now lets do the same thing for GitLab to get it up and running. Checkout the template and params provided by running ```bash -$ git checkout exercise1/gitlab-nexus templates/gitlab.yml params/gitlab +$ git checkout exercise1/git-nexus templates/gitlab.yml params/gitlab ``` Explore the template; it contains the PVC, buildConfig and services. The DeploymentConfig is made up of these apps - Redis (3.2.3) @@ -217,8 +217,7 @@ 4. Once successful; login to the cluster and navigate to the `<YOUR_NAME>-ci-cd`. You should see GitLab up and running. ![gitlab-up-and-running](../images/exercise1/gitlab-up-and-running.png) -4. Navigate to gitlab. You can login with using your cluster credentials using the LDAP tab displaying your `<LDAP_DESCRIPTION>` from previous steps - +4. Navigate to gitlab. You can login using your cluster credentials using the LDAP tab displaying your `<LDAP_DESCRIPTION>` from previous steps ![gitlab-ui](../images/exercise1/gitlab-ui.png) 4. Once logged in create a new project called `enablement-ci-cd` and mark it as internal. Once created; copy out the `git remote add origin ...` instructions for use on the next step. @@ -238,11 +237,6 @@ ### Part 3 - Jenkins & s2i > _Create a build and deployment config for Jenkins. Add new configuration and plugins to the OCP Stock Jenkins using s2i_ - -5. Add the Jenkins Build & Deployment configs to the `enablement-ci-cd` repo by merging the contents `exercise1/jenkins` in -```bash -$ git checkout exercise1/jenkins templates/jenkins.yml -``` 5. Add the Jenkins Build & Deployment configs to the `enablement-ci-cd` repo by merging the contents `exercise1/jenkins` in ```bash -- Gitblit v1.9.3