From 417b66834152117c56cdad14226f32a68ba3202b Mon Sep 17 00:00:00 2001 From: krain Date: Wed, 27 Mar 2019 14:02:05 +0100 Subject: [PATCH 1/3] correct spelling in _modules.yml --- _modules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_modules.yml b/_modules.yml index 518f31c..950a2e0 100644 --- a/_modules.yml +++ b/_modules.yml @@ -34,4 +34,4 @@ modules: devops-custom-slave: name: Creating Custom Jenkins Slave Pods devops-env-info: - name: "Appnedix: Lab Environment" \ No newline at end of file + name: "Appendix: Lab Environment" From eb62fd49cae47e2f4c8b0d9d5f12ecc4fe7116b5 Mon Sep 17 00:00:00 2001 From: krain Date: Wed, 27 Mar 2019 14:02:42 +0100 Subject: [PATCH 2/3] add missing preposition to devops-pipeline-scm-adoc --- devops-pipeline-scm.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops-pipeline-scm.adoc b/devops-pipeline-scm.adoc index 6d1e72b..0302247 100644 --- a/devops-pipeline-scm.adoc +++ b/devops-pipeline-scm.adoc @@ -9,7 +9,7 @@ Using OpenShift Pipeline, you can store Jenkinsfiles in a Git repository and ref Although CI/CD is a fairly new in many organizations, teams have been building Continuous Integration flows for a long time and have invested lots of time improving and refining that process. For Java projects, the CI flow generally moves around building the application JAR/WAR/EAR, running the unit-tests suits and integration tests and if successful, releasing the application binaries into a repository manager like Sonatype Nexus and Artifactory. In this lab, you will modify the pipeline in order to extend existing CI processes and build upon the Maven build and test flow that exists in many development teams. -The following diagram shows the pipeline stages. For the sake simplicity, pushing the artifacts to an artifact repository is not included in this pipeline however you can include that using the https://jenkins.io/doc/pipeline/steps/nexus-artifact-uploader/[Nexus Artifact Uploader Plugin] for Sonatype Nexus and https://jenkins.io/doc/pipeline/steps/artifactory/#artifactoryupload-upload-artifacts[Artifactory Plugin] for Artifactory. +The following diagram shows the pipeline stages. For the sake of simplicity, pushing the artifacts to an artifact repository is not included in this pipeline however you can include that using the https://jenkins.io/doc/pipeline/steps/nexus-artifact-uploader/[Nexus Artifact Uploader Plugin] for Sonatype Nexus and https://jenkins.io/doc/pipeline/steps/artifactory/#artifactoryupload-upload-artifacts[Artifactory Plugin] for Artifactory. image::devops-pipeline-scm-diagram.png[Pipeline Diagram] From 0cca4457bb014a03706526b5f1409a0fc166803a Mon Sep 17 00:00:00 2001 From: krain Date: Wed, 27 Mar 2019 14:03:49 +0100 Subject: [PATCH 3/3] pluralize 'developer' in devops-deployment-envs.adoc --- devops-deployment-envs.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops-deployment-envs.adoc b/devops-deployment-envs.adoc index f063495..8726b9e 100644 --- a/devops-deployment-envs.adoc +++ b/devops-deployment-envs.adoc @@ -34,7 +34,7 @@ By default, the current user who created the project is the _admin_ for this pro image::devops-envs-dev-membership.png[Project Access Control, width=800] -Now, let’s deploy the Spring Boot application, Cart service, into the Dev environment. OpenShift supports deploying containerized apps in three different ways and allows developer to pick the process that is most suitable for their projects: +Now, let’s deploy the Spring Boot application, Cart service, into the Dev environment. OpenShift supports deploying containerized apps in three different ways and allows developers to pick the process that is most suitable for their projects: * From application source code * From application binary (e.g. app.jar)