From 6c5da4ffc3a218472bfdff5f98a3f07c29e93fc1 Mon Sep 17 00:00:00 2001
From: Marcos Entenza <makentenza@gmail.com>
Date: Thu, 22 Nov 2018 22:17:19 +0100
Subject: [PATCH] Adapt documentation for the new name convention for Cluster API and Routes
---
5-non-functionals-strike-back/README.md | 2 +-
3-revenge-of-the-automated-testing/README.md | 4 ++--
2-attack-of-the-pipelines/README.md | 6 +++---
1-the-manual-menace/README.md | 4 ++--
4-an-enslaved-hope/README.md | 14 +++++++-------
README.md | 7 ++++++-
6 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/1-the-manual-menace/README.md b/1-the-manual-menace/README.md
index 0162872..233411f 100644
--- a/1-the-manual-menace/README.md
+++ b/1-the-manual-menace/README.md
@@ -163,7 +163,7 @@
3. Apply the inventory by logging into OpenShift on the terminal and running the playbook as follows (<CLUSTER_URL> should be replaced with the one you've been sent as shown below). Accept any insecure connection warning ����:
```bash
-oc login https://console.lader.rht-labs.com
+oc login <CLUSTER_URL>
```
```bash
ansible-playbook apply.yml -i inventory/ -e target=bootstrap
@@ -544,7 +544,7 @@
7. Re-apply the inventory to re-create it all!
```bash
-oc login https://console.lader.rht-labs.com
+oc login <CLUSTER_URL>
```
```bash
ansible-playbook apply.yml -i inventory/ -e target=bootstrap
diff --git a/2-attack-of-the-pipelines/README.md b/2-attack-of-the-pipelines/README.md
index eae6de0..21e14c9 100644
--- a/2-attack-of-the-pipelines/README.md
+++ b/2-attack-of-the-pipelines/README.md
@@ -632,16 +632,16 @@
NOTE - This section is optional! Git webhooks are useful but not needed for Enablement completion.
</p>
-7. In order to allow GitLab to trigger Jenkins (because of the OpenShift Auth Plugin), we need to allow the `Anonymous` user triggered builds. Head to your Jenkins Dashboard and click on `Manage Jenkins` on the left hand side. Then scroll down and click `Configure Global Security`. Alternatively, type in `https://jenkins-<YOUR_NAME>-ci-cd.apps.some.domain.com/configureSecurity/` . You should see a screen like so:
+7. In order to allow GitLab to trigger Jenkins (because of the OpenShift Auth Plugin), we need to allow the `Anonymous` user triggered builds. Head to your Jenkins Dashboard and click on `Manage Jenkins` on the left hand side. Then scroll down and click `Configure Global Security`. Alternatively, type in `https://jenkins-<YOUR_NAME>-ci-cd.<APPS_URL>/configureSecurity/` . You should see a screen like so:
7. Scroll down to the `Authorization` section and allow `Anonymous` to create jobs. Do this by navigating through the matrix of checkboxes and check `Build` and `Cancel` under the Job heading. Leave all other user behaviour as is. Anonymous is the user that GitLab will act as so this allows the WebHook to trigger builds. (The screenshot has been cropped to bring Job further to the left.) Hit `Save` or `Apply`.
-7. Go to your `dev-todolist-fe-build` and head to the `configure` section (`https://jenkins-<YOUR_NAME>-ci-cd.apps.some.domain.com/job/dev-todolist-fe-build/configure`). Scroll down to the `Build Triggers` section and check the `Build when a change is pushed to GitLab` box. Leave all the other settings as they are but copy the `GitLab webhook URL`. `https://jenkins-<YOUR_NAME>-ci-cd.apps.some.domain.com/project/dev-todolist-fe-build`. Remember to Save and Apply this change.
+7. Go to your `dev-todolist-fe-build` and head to the `configure` section (`https://jenkins-<YOUR_NAME>-ci-cd.<APPS_URL>/job/dev-todolist-fe-build/configure`). Scroll down to the `Build Triggers` section and check the `Build when a change is pushed to GitLab` box. Leave all the other settings as they are but copy the `GitLab webhook URL`. `https://jenkins-<YOUR_NAME>-ci-cd.<APPS_URL>/project/dev-todolist-fe-build`. Remember to Save and Apply this change.
-7. Switch over to GitLab and select your `todolist-fe` repository. On the left hand task bar hover over the settings cog and select `integrations`. (`https://gitlab-<YOUR_NAME>-ci-cd.apps.some.domain.com/<YOUR_NAME>/todolist-fe/settings/integrations`)
+7. Switch over to GitLab and select your `todolist-fe` repository. On the left hand task bar hover over the settings cog and select `integrations`. (`https://gitlab-<YOUR_NAME>-ci-cd.<APPS_URL>/<YOUR_NAME>/todolist-fe/settings/integrations`)
7. Paste the `GitLab webhook URL` that we copied earlier into the `URL` field. Check Push events as the trigger, and make sure you `uncheck` the `SSL verification` checkbox. Click Add webhook at the bottom.
diff --git a/3-revenge-of-the-automated-testing/README.md b/3-revenge-of-the-automated-testing/README.md
index ed8c6c1..1497e9d 100644
--- a/3-revenge-of-the-automated-testing/README.md
+++ b/3-revenge-of-the-automated-testing/README.md
@@ -120,7 +120,7 @@
npm run test
```
-2. Navigate to your instance of Jenkins at `https://jenkins-<YOUR_NAME>-ci-cd.apps.lader.rht-labs.com/`.
+2. Navigate to your instance of Jenkins at `https://jenkins-<YOUR_NAME>-ci-cd.<APPS_URL>`.
Click on `dev-todolist-fe-build` and then click the `configure` button on the left-hand side.
@@ -188,7 +188,7 @@
2. On the Build section; add a build step to execute shell and fill in the following substituting `<YOUR_NAME>` accordingly:
```bash
-export E2E_TEST_ROUTE=todolist-fe-<YOUR_NAME>-dev.apps.lader.rht-labs.com
+export E2E_TEST_ROUTE=todolist-fe-<YOUR_NAME>-dev.<APPS_URL>
npm install
npm run e2e:ci
```
diff --git a/4-an-enslaved-hope/README.md b/4-an-enslaved-hope/README.md
index 114a70f..b780696 100644
--- a/4-an-enslaved-hope/README.md
+++ b/4-an-enslaved-hope/README.md
@@ -75,7 +75,7 @@
GIT_SSL_NO_VERIFY = true
GIT_CREDENTIALS = credentials('jenkins-git-creds')
- GITLAB_DOMAIN = "gitlab.apps.<SOME_DOMAIN>.com"
+ GITLAB_DOMAIN = "gitlab.<APPS_URL>"
GITLAB_PROJECT = "<GIT_USERNAME>"
}
```
@@ -99,7 +99,7 @@
2. On the job's configure page; set the Branch Sources to `git`
-2. Fill in the Git settings with your `todolist-api` GitLab url and set the credentials as you've done before. `https://gitlab.apps.lader.rht-labs.com/<YOUR_NAME>/todolist-api.git`
+2. Fill in the Git settings with your `todolist-api` GitLab url and set the credentials as you've done before. `https://gitlab.<APPS_URL>/<YOUR_NAME>/todolist-api.git`
2. Set the `Scan Multibranch Pipeline Triggers` to be periodic and the interval to 1 minute. This will poll the GitLab instance for new branches or change sets to build.
@@ -210,7 +210,7 @@
2. Open the `params/ocp-pipeline` file and update `PIPELINE_SOURCE_REPOSITORY_URL` with the git url of your project (Don't forget to add the `.git` at the end). For example:
```
-PIPELINE_SOURCE_REPOSITORY_URL=https://gitlab.apps.<SOME_DOMAIN>.com/<GIT_USERNAME>/todolist-fe.git
+PIPELINE_SOURCE_REPOSITORY_URL=https://gitlab.<APPS_URL>/<GIT_USERNAME>/todolist-fe.git
PIPELINE_SOURCE_REPOSITORY_REF=develop
NAME=todolist-fe
```
@@ -264,7 +264,7 @@
2. Update the `todolist-api/.openshift-applier/params/ocp-pipeline`
```
-PIPELINE_SOURCE_REPOSITORY_URL=https://gitlab.apps.<SOME_DOMAIN>.com/<GIT_USERNAME>/todolist-api.git
+PIPELINE_SOURCE_REPOSITORY_URL=https://gitlab.<APPS_URL>/<GIT_USERNAME>/todolist-api.git
PIPELINE_SOURCE_REPOSITORY_REF=develop
NAME=todolist-api
```
@@ -324,7 +324,7 @@
-e "filter_tags=zap"
```
-3. Head to https://console.lader.rht-labs.com on OpenShift and move to your ci-cd project > builds. You should see `jenkins-slave-zap` has been built.
+3. Head to <CLUSTER_URL> on OpenShift and move to your ci-cd project > builds. You should see `jenkins-slave-zap` has been built.
#### 3b - Arachni Scan
@@ -347,7 +347,7 @@
3. Update the `jenkins-slave-arachni` files `SOURCE_REPOSITORY_URL` to point to your GitLab's hosted version of the `enablement-ci-cd` repo.
```
-SOURCE_REPOSITORY_URL=https://gitlab.apps.lader.rht-labs.com/<GIT_USERNAME>/enablement-ci-cd.git
+SOURCE_REPOSITORY_URL=https://gitlab.<APPS_URL>/<GIT_USERNAME>/enablement-ci-cd.git
SOURCE_CONTEXT_DIR=docker/jenkins-slave-arachni
BUILDER_IMAGE_NAME=registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:latest
NAME=jenkins-slave-arachni
@@ -372,7 +372,7 @@
-e "filter_tags=arachni"
```
-3. Head to https://console.lader.rht-labs.com on OpenShift and move to your ci-cd project > builds. You should see `jenkins-slave-arachni`.
+3. Head to <CLUSTER_URL> on OpenShift and move to your ci-cd project > builds. You should see `jenkins-slave-arachni`.
_____
diff --git a/5-non-functionals-strike-back/README.md b/5-non-functionals-strike-back/README.md
index 3e1bd09..24f7d6b 100644
--- a/5-non-functionals-strike-back/README.md
+++ b/5-non-functionals-strike-back/README.md
@@ -296,7 +296,7 @@
4. Click `add build step` and select `execute shell` and add the following to it, replacing `<YOUR_NAME>` as expected. We will just test the `create` and `show` API for the moment. We are grabbing the response code of the perf-test to keep Jenkins running both shells steps and then exiting with whichever fails:
```bash
-export E2E_TEST_ROUTE=todolist-api-<YOUR_NAME>-dev.apps.lader.rht-labs.com
+export E2E_TEST_ROUTE=todolist-api-<YOUR_NAME>-dev.<APPS_URL>
npm install
set +e
npm run perf-test:create
diff --git a/README.md b/README.md
index d69f779..a7e01c2 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,11 @@
2. Explore all principle practices used in a residency through a hands on real life experience
3. Enable countries and regions to run the session independently
+## Cluster Information
+
+An OpenShift Cluster is required to complete the Enablement exercises. Learners will receive by email (and by the instructors onsite) the following information regarding the OpenShift Platform:
+ - <CLUSTER_URL> -- Openshift Webconsole/API url
+ - <APPS_URL> -- Wildcard subdomain for the exposed applications deployed in the Cluster
## Learner pre-requisites
| Software | Version | Check |
@@ -21,7 +26,7 @@
| Google Chrome Web Browser | (>59) | click [here](chrome://version/) if Google Chrome is your default browser else copy the link `chrome://version/` in your Chome |
| Docker latest | Community Edition - Edge | $ docker --version <br> Docker version 18.05.0-ce, build f150324|
| JDK | v8 | $ java -version <br>java version "1.8.0_131"<br>Java(TM) SE Runtime Environment (build 1.8.0_131-b11)<br>Java HotSpot(TM) 64-Bit Server VM (build 25.131-b11, mixed mode)|
- | Access to an OpenShift cluster | | `oc login -u <username> -p <password> <cluster_url>` |
+ | Access to an OpenShift cluster | | `oc login -u <username> -p <password> <CLUSTER_URL>` |
| Text editor such as Atom, IntelliJ or Visual Studio Code <br><br> (The exercises were created using `VSCode`, so the screenshots will match its layout and colour schemes) | - | - |
## Git and Containers 101
--
Gitblit v1.9.3