From 8a47e6241d3d4ad42a3ef89671973221b7d6917b Mon Sep 17 00:00:00 2001
From: donal <donalspring@gmail.com>
Date: Tue, 24 Apr 2018 18:56:41 +0200
Subject: [PATCH] FIX - pipleline stuff from run through
---
images/exercise2/add-view.png | 0
images/exercise2/pipeline-flow.png | 0
2-attack-of-the-pipelines/README.md | 26 +++++++++++++++++---------
images/exercise2/new-pipeline.png | 0
images/exercise2/with-backend-app.png | 0
images/exercise2/bake-step.png | 0
images/exercise2/no-backend-app.png | 0
images/exercise2/api-build-step.png | 0
images/exercise2/build-step.png | 0
images/exercise2/ocp-deployment.png | 0
10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/2-attack-of-the-pipelines/README.md b/2-attack-of-the-pipelines/README.md
index 69f7289..2f1c4e2 100644
--- a/2-attack-of-the-pipelines/README.md
+++ b/2-attack-of-the-pipelines/README.md
@@ -29,7 +29,7 @@
- Add branching to the pipeline to target specific namespace
## Tools and Frameworks
-> The following tools are used throughout this exercise. Familiarity with them is not required but knowing what they are may help!
+> The following tools are used throughout this exercise. Familiarity with them is not required but knowing what they are may help. You will not need to install Vue or Mongodb they are taken care of by our `todolist` app.
1. [Jenkins](https://jenkins.io/) - OpenSource build automation server; highly customisable through plugins
1. [NodeJS](https://nodejs.org/en/) - Node.js�� is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient. Node.js' package ecosystem, npm, is the largest ecosystem of open source libraries in the world.
@@ -556,7 +556,7 @@
#!/bin/bash
curl -v -f http://admin:admin123@${NEXUS_SERVICE_HOST}:${NEXUS_SERVICE_PORT}/repository/zip/com/redhat/todolist/${BUILD_TAG}/package-contents.zip -o package-contents.zip
unzip package-contents.zip
-oc project <YOUR_NAME>-ci-cd # probs not needed
+oc project <YOUR_NAME>-ci-cd
NAME=todolist-fe
oc patch bc ${NAME} -p "{\"spec\":{\"output\":{\"to\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:${BUILD_TAG}\"}}}}"
oc start-build ${NAME} --from-dir=package-contents/ --follow
@@ -592,7 +592,7 @@
```
-5. Secondly, add another build step called `Verify OpenShift Deployment` including the following:
+5. When a deployment has completed; OpenShift can verify it's success. Add another step called by clicking the `Add build Step` on the Build tab then `Verify OpenShift Deployment` including the following:
* Set the Project to your `<YOUR_NAME>-dev`
* Set the DeploymentConfig to your app's name `todolist-fe`
* Set the replica count to `1`
@@ -602,7 +602,7 @@
#### Part 4d - Pipeline
-5. With our Jenkins setup in place; now move to our `todolist-fe` app. We need to add our configuration to the frontend to tell it where the API layer is hosted. Open in it your favourite editor and navigate to `src/config/dev.js`. Update `<YOUR_NAME>` accordingly with the root where the Todo List API will live. For example:
+5. With our Jenkins setup in place; now move to our `todolist-fe` app's source code. We have to add our configuration to the frontend to tell it where the API layer will be hosted. Open the source in your favourite editor and navigate to `src/config/dev.js`. Update `<YOUR_NAME>` accordingly with the route where the Todo List API will live when it is deployed, update the `somedomain` to the clusters domain. For example:
5. Repeat this for `src/config/test.js` file. Once done; commit your chanages and push them to GitLab
@@ -612,14 +612,16 @@
$ git push
```
-5. Back on Jenkins; We can tie all the jobs in the pipeline together into a nice single view using the Build Pipeline view. Back on the Jenkins home screen Click the + beside the all tab on the top. Give the new view a sensible name like `dev-todolist-fe-pipeline`
-.
+5. Back on Jenkins; We can tie all the jobs in the pipeline together into a nice single view using the Build Pipeline view. Back on the Jenkins home screen Click the + beside the all tab on the top.
+
+
+5. On the view that loads; Give the new view a sensible name like `dev-todolist-fe-pipeline` and select Build Pipeline
+
5. Set the Pipeline Flow's Inital Job to `dev-todolist-fe-build` and save.
-TODO - change below sscreenshot
-5. You should now see the pipeline view. Run the pipeline by hitting run (you can move onto the next part while it is running as it may take some time).
+5. You should now see the pipeline view. Run the pipeline by hitting run (you can move onto the next part while it is running as it may take some time).
### Part 5 - Backend Pipeline
@@ -637,6 +639,7 @@
```bash
npm run build:ci
```
+
6. Save the configuration for `dev-todolist-api-build`
@@ -658,7 +661,12 @@
6. Save the configuration for `dev-todolist-api-build` and that's it for wiring together our `todolist-api` pipeline.
-6. Run the `dev-todolist-api-build` to trigger the backend pipeline. While this is building, check our front end app and see if it has deployed successfully. Check the deployment in OpenShift and load the url. If it has been a success we should see our dummyData. This is because there is no backend deployed.
+6. Run the `dev-todolist-api-build` to trigger the backend pipeline. While this is building, check our front end app and see if it has deployed successfully.
+
+6. To check the deployment in OpenShifty; open the console and go to your `dev` namespace. You should see the deployment was successful; hit the URL to open the app (the screenshot below has both apps deployed).
+
+
+6. If it has been a success we should see our dummyData. This is because there is no backend deployed.
6. When `dev-todolist-api-build` has completed we should see the sample data has changed on refresh.
diff --git a/images/exercise2/add-view.png b/images/exercise2/add-view.png
index 59cb1f2..2bb3c75 100644
--- a/images/exercise2/add-view.png
+++ b/images/exercise2/add-view.png
Binary files differ
diff --git a/images/exercise2/api-build-step.png b/images/exercise2/api-build-step.png
new file mode 100644
index 0000000..d80e4e0
--- /dev/null
+++ b/images/exercise2/api-build-step.png
Binary files differ
diff --git a/images/exercise2/bake-step.png b/images/exercise2/bake-step.png
index 3c98a12..12173f7 100644
--- a/images/exercise2/bake-step.png
+++ b/images/exercise2/bake-step.png
Binary files differ
diff --git a/images/exercise2/build-step.png b/images/exercise2/build-step.png
index a6fe1a6..85612fd 100644
--- a/images/exercise2/build-step.png
+++ b/images/exercise2/build-step.png
Binary files differ
diff --git a/images/exercise2/new-pipeline.png b/images/exercise2/new-pipeline.png
new file mode 100644
index 0000000..2ab033b
--- /dev/null
+++ b/images/exercise2/new-pipeline.png
Binary files differ
diff --git a/images/exercise2/no-backend-app.png b/images/exercise2/no-backend-app.png
index 863bcb9..04b401c 100644
--- a/images/exercise2/no-backend-app.png
+++ b/images/exercise2/no-backend-app.png
Binary files differ
diff --git a/images/exercise2/ocp-deployment.png b/images/exercise2/ocp-deployment.png
new file mode 100644
index 0000000..9911460
--- /dev/null
+++ b/images/exercise2/ocp-deployment.png
Binary files differ
diff --git a/images/exercise2/pipeline-flow.png b/images/exercise2/pipeline-flow.png
index 2d7c37a..f98f551 100644
--- a/images/exercise2/pipeline-flow.png
+++ b/images/exercise2/pipeline-flow.png
Binary files differ
diff --git a/images/exercise2/with-backend-app.png b/images/exercise2/with-backend-app.png
index 109d816..c559113 100644
--- a/images/exercise2/with-backend-app.png
+++ b/images/exercise2/with-backend-app.png
Binary files differ
--
Gitblit v1.9.3