Merge pull request #48132 from rolfedh/RHDEVDOCS-4243

RHDEVDOCS-4243 make some checklist updates for RHDEVDOCS-3972

Author: bburt-rh

cicd/jenkins/openshift-jenkins.adoc

@@ -6,9 +6,11 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-{product-title} 4.11 moves the `OpenShift Jenkins` and `OpenShift Agent Base` images to the `ocp-tools-4` repository at `registry.redhat.io` so that Red Hat can produce and update the images outside the {product-title} lifecycle. Previously, these images were in the {product-title} install payload and the `openshift4` repository at `registry.redhat.io`.
+{product-title} 4.11 moves the "OpenShift Jenkins" and "OpenShift Agent Base" images to the `ocp-tools-4` repository at `registry.redhat.io`. It also removes the "OpenShift Jenkins Maven" and "NodeJS Agent" images from its payload:
 
-{product-title} 4.10 deprecated the `OpenShift Jenkins Maven` and `NodeJS Agent` images. {product-title} 4.11 removes these images from its payload. Red Hat no longer produces these images, and they are not available from the `ocp-tools-4` repository at `registry.redhat.io`. Red Hat maintains the 4.10 and earlier versions of these images for any bug fixes or security CVEs of note, in accordance the link::https://access.redhat.com/support/policy/updates/openshift[{product-title} lifecycle policy].
+* {product-title} 4.11 moves the "OpenShift Jenkins" and "OpenShift Agent Base" images to the `ocp-tools-4` repository at `registry.redhat.io` so that Red Hat can produce and update the images outside the {product-title} lifecycle. Previously, these images were in the {product-title} install payload and the `openshift4` repository at `registry.redhat.io`.
+
+* {product-title} 4.10 deprecated the "OpenShift Jenkins Maven" and "NodeJS Agent" images. {product-title} 4.11 removes these images from its payload. Red Hat no longer produces these images, and they are not available from the `ocp-tools-4` repository at `registry.redhat.io`. Red Hat maintains the 4.10 and earlier versions of these images for any significant bug fixes or security CVEs, following the link:https://access.redhat.com/support/policy/updates/openshift[{product-title} lifecycle policy].
 
 These changes support the {product-title} 4.10 recommendation to use xref:../../openshift_images/using_images/images-other-jenkins.adoc#images-other-jenkins-config-kubernetes_images-other-jenkins[multiple container Pod Templates with the Jenkins Kubernetes Plug-in].
 
@@ -17,11 +19,12 @@ include::modules/relocation-of-openshift-jenkins-images.adoc[leveloffset=+1]
 include::modules/customizing-the-jenkins-image-stream-tag.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
-.Additional resources
+[id="additional-resources_openshift-jenkins_{context}"]
+== Additional resources
 
 * xref:../../openshift_images/managing_images/tagging-images.adoc#images-add-tags-to-imagestreams_tagging-images[Adding tags to image streams]
-* xref:../../openshift_images/image-streams-manage.html#images-imagestream-import_image-streams-managing[Configuring periodic importing of image stream tags]
-* xref:../../openshift_images/using_images/images-other-jenkins-agent.adoc[Jenkins agent]
+* xref:../../openshift_images/image-streams-manage.adoc#images-imagestream-import_image-streams-managing[Configuring periodic importing of image stream tags]
+* xref:../../openshift_images/using_images/images-other-jenkins-agent.adoc#images-other-jenkins-agent[Jenkins agent]
 * link:https://catalog.redhat.com/software/containers/search?q=Jenkins%202&p=1[Certified `jenkins` images]
 * link:https://catalog.redhat.com/software/containers/search?q=Jenkins%20Agent%20Base&p=1[Certified `jenkins-agent-base` images]
 * link:https://catalog.redhat.com/software/containers/search?q=jenkins-agent-maven&p=1[Certified `jenkins-agent-maven` images]

modules/customizing-the-jenkins-image-stream-tag.adoc

@@ -1,3 +1,6 @@
+// Module included in the following assemblies:
+//
+// * cicd/jenkins/openshift-jenkins.adoc
 :_content-type: PROCEDURE
 
 [id="customizing-the-jenkins-image-stream-tag_{context}"]
@@ -9,13 +12,13 @@ The default upgrade behavior is the behavior that existed when the Jenkins image
 
 For new deployments, to override that default value, you change the value of the  `JENKINS_IMAGE_STREAM_TAG` in the `jenkins-ephemeral.json` Jenkins template. For example, replace the `2` in `"value": "jenkins:2"` with one of the following image stream tags:
 
-* `ocp-upgrade-redeploy` the default value, updates your Jenkins image when you upgrade {product-title}.
+* `ocp-upgrade-redeploy`, the default value, updates your Jenkins image when you upgrade {product-title}.
 * `user-maintained-upgrade-redeploy` requires you to manually redeploy Jenkins by running `$ oc import-image jenkins:user-maintained-upgrade-redeploy -n openshift` after upgrading {product-title}.
 * `scheduled-upgrade-redeploy` periodically checks the given `<image>:<tag>` combination for changes and upgrades the image when it changes. The image change controller pulls the changed image and redeploys the Jenkins deployment configuration provisioned by the templates. For more information about this scheduled import policy, see the "Adding tags to image streams" in the following "Additional resources."
 
 [NOTE]
 ====
-For existing deployments, to override the current upgrade value, change the values of the environment variables that correspond to those template parameters.
+To override the current upgrade value for existing deployments, change the values of the environment variables that correspond to those template parameters.
 ====
 
 .Prerequisites

modules/relocation-of-openshift-jenkins-images.adoc

@@ -1,8 +1,13 @@
+// Module included in the following assemblies:
+//
+// * cicd/jenkins/openshift-jenkins.adoc
 :_content-type: CONCEPT
 
 [id="relocation-of-openshift-jenkins-images_{context}"]
 = Relocation of OpenShift Jenkins images
 
+{product-title} 4.11 makes significant changes to the location and availability of specific OpenShift Jenkins images. Additionally, you can configure when and how to update these images.
+
 .What stays the same with the OpenShift Jenkins images?
 
 * The Cluster Samples Operator manages the `ImageStream` and `Template` objects for operating the OpenShift Jenkins images.
@@ -18,7 +23,7 @@ Previously, each Jenkins image supported only one version of {product-title} and
 
 .What additions are there with the OpenShift Jenkins and Jenkins Agent Base ImageStream and ImageStreamTag objects?
 
-By moving from an "in-payload" image stream to an image stream that references non-payload images, {product-title} can define as additional image stream tags. Red Hat has created a series of new image stream tags to go along with the existing `"value": "jenkins:2"` and `"value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest"` image stream tags present in {product-title} 4.10 and earlier. These new image stream tags address some requests to improve how the Jenkins-related image streams are maintained.
+By moving from an "in-payload" image stream to an image stream that references non-payload images, {product-title} can define additional image stream tags. Red Hat has created a series of new image stream tags to go along with the existing `"value": "jenkins:2"` and `"value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest"` image stream tags present in {product-title} 4.10 and earlier. These new image stream tags address some requests to improve how the Jenkins-related image streams are maintained.
 
 About the new image stream tags:
 
@@ -31,7 +36,7 @@ About the new image stream tags:
 
 .What happens with the `jenkins-agent-maven` and `jenkins-agent-nodejs` image streams in the `openshift` namespace?
 
-The `OpenShift Jenkins Maven` and `NodeJS Agent` images for {product-title} were deprecated in 4.10, and are removed from the {product-title} install payload in 4.11. They do not have alternatives defined in the `ocp-tools-4` repository. However, you can work around this by using the sidecar pattern described in the "Jenkins agent" topic mentioned in the following "Additional resources" section.
+The "OpenShift Jenkins Maven" and "NodeJS Agent" images for {product-title} were deprecated in 4.10, and are removed from the {product-title} install payload in 4.11. They do not have alternatives defined in the `ocp-tools-4` repository. However, you can work around this by using the sidecar pattern described in the "Jenkins agent" topic mentioned in the following "Additional resources" section.
 
 However, the Cluster Samples Operator does not delete the `jenkins-agent-maven` and `jenkins-agent-nodejs` image streams created by prior releases, which point to the tags of the respective {product-title} payload images on `registry.redhat.io`. Therefore, you can pull updates to these images by running the following commands: