Merge pull request #49718 from rolfedh/RHDEVDOCS-4394

RHDEVDOCS-4394 Jenkins updates for 4.12

Author: rolfedh

cicd/jenkins/images-other-jenkins-agent.adoc

@@ -6,28 +6,25 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-{product-title} provides Base, Maven, and Node.js images for use as Jenkins agents.
+{product-title} provides a base image for use as a Jenkins agent.
 
 The Base image for Jenkins agents does the following:
 
 * Pulls in both the required tools, headless Java, the Jenkins JNLP client, and the useful ones, including `git`, `tar`, `zip`, and `nss`, among others.
 * Establishes the JNLP agent as the entry point.
-* Includes the `oc` client tooling for invoking command line operations from within Jenkins jobs.
+* Includes the `oc` client tool for invoking command line operations from within Jenkins jobs.
 * Provides Dockerfiles for both Red Hat Enterprise Linux (RHEL) and `localdev` images.
 
-The Maven v3.5, Node.js v10, and Node.js v12 images extend the Base image. They provide Dockerfiles for the Universal Base Image (UBI) that you can reference when building new agent images. Also note the `contrib` and `contrib/bin` subdirectories, which enable you to insert configuration files and executable scripts for your image.
-
 [IMPORTANT]
 ====
 Use a version of the agent image that is appropriate for your {product-title} release version. Embedding an `oc` client version that is not compatible with the {product-title} version can cause unexpected behavior.
 ====
 
-The {product-title} Jenkins image also defines the following sample pod templates to illustrate how you can use these agent images with the Jenkins Kubernetes plug-in:
+The {product-title} Jenkins image also defines the following sample `java-builder` pod template to illustrate how you can use the agent image with the Jenkins Kubernetes plugin.
 
-- The `maven` pod template, which uses a single container that uses the {product-title} Maven Jenkins agent image.
-- The `nodejs` pod template, which uses a single container that uses the {product-title} Node.js Jenkins agent image.
-- The `java-builder` pod template, which employs two containers. One is the `jnlp` container, which uses the {product-title} Base agent image and handles the JNLP contract for starting and stopping Jenkins agents. The second is the `java` container which uses the `java` {product-title} Sample ImageStream, which contains the various Java binaries, including the Maven binary `mvn`, for building code.
-- The `nodejs-builder` pod template, which employs two containers. One is the `jnlp` container, which uses the {product-title} Base agent image and handles the JNLP contract for starting and stopping Jenkins agents. The second is the `nodejs` container which uses the `nodejs` {product-title} Sample ImageStream, which contains the various Node.js binaries, including the `npm` binary, for building code.
+The `java-builder` pod template employs two containers:
+* A `jnlp` container that uses the {product-title} Base agent image and handles the JNLP contract for starting and stopping Jenkins agents.
+* A `java` container that uses the `java` {product-title} Sample ImageStream, which contains the various Java binaries, including the Maven binary `mvn`, for building code.
 
 include::modules/images-other-jenkins-agent-images.adoc[leveloffset=+1]
 

cicd/jenkins/images-other-jenkins.adoc

@@ -30,7 +30,7 @@ But for convenience, {product-title} provides image streams in the `openshift` n
 
 You can manage Jenkins authentication in two ways:
 
-* {product-title} OAuth authentication provided by the {product-title} Login plug-in.
+* {product-title} OAuth authentication provided by the {product-title} Login plugin.
 * Standard authentication provided by Jenkins.
 
 include::modules/images-other-jenkins-oauth-auth.adoc[leveloffset=+2]
@@ -62,9 +62,14 @@ include::modules/images-other-jenkins-create-service.adoc[leveloffset=+1]
 
 include::modules/images-other-jenkins-kubernetes-plugin.adoc[leveloffset=+1]
 
+.Additional resources
+
+* xref:../../cicd/jenkins/important-changes-to-openshift-jenkins-images.adoc#important-changes-to-openshift-jenkins-images[Important changes to OpenShift Jenkins images]
+
 include::modules/images-other-jenkins-memory.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 == Additional resources
 
-* See xref:../../architecture/understanding-development.adoc#base-image-options[Base image options] for more information on the link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux_atomic_host/7/html-single/getting_started_with_containers/index#using_red_hat_base_container_images_standard_and_minimal[Red Hat Universal Base Images] (UBI).
+* See xref:../../architecture/understanding-development.adoc#base-image-options[Base image options] for more information about the link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux_atomic_host/7/html-single/getting_started_with_containers/index#using_red_hat_base_container_images_standard_and_minimal[Red Hat Universal Base Images] (UBI).
+* xref:../../cicd/jenkins/important-changes-to-openshift-jenkins-images.adoc#important-changes-to-openshift-jenkins-images[Important changes to OpenShift Jenkins images]

modules/deploy-app.adoc

@@ -36,7 +36,7 @@ endif::[]
 
 . Click *Create* to create the project.
 
-. Switch to the *Developer* perspective and select *+Add*. Make sure that the selected *Project* is the one that you just created.
+. Switch to the *Developer* perspective and select *+Add*. Verify that the selected *Project* is the one that you just created.
 
 . In the *Developer Catalog* dialog, select *All services*.
 
@@ -80,4 +80,4 @@ ifeval::["{context}" == "rosa-getting-started"]
 endif::[]
 ifeval::["{context}" == "rosa-quickstart"]
 :quickstart:
-endif::[]
+endif::[]

modules/images-other-jenkins-agent-pod-retention.adoc

@@ -6,10 +6,10 @@
 [id="images-other-jenkins-agent-pod-retention_{context}"]
 = Jenkins agent pod retention
 
-Jenkins agent pods, are deleted by default after the build completes or is stopped. This behavior can be changed by the Kubernetes plug-in pod retention setting. Pod retention can be set for all Jenkins builds, with overrides for each pod template. The following behaviors are supported:
+Jenkins agent pods, are deleted by default after the build completes or is stopped. This behavior can be changed by the Kubernetes plugin pod retention setting. Pod retention can be set for all Jenkins builds, with overrides for each pod template. The following behaviors are supported:
 
 * `Always` keeps the build pod regardless of build result.
-* `Default` uses the plug-in value, which is the pod template only.
+* `Default` uses the plugin value, which is the pod template only.
 * `Never` always deletes the pod.
 * `On Failure` keeps the pod if it fails during the build.