Merge pull request #48173 from rolfedh/RHDEVDOCS-3915

bburt-rh · web-flow · commit 1dee6a9bc1c2 · 2022-07-22T15:26:32.000-04:00
RHDEVDOCS-3915 relocating Jenkins assemblies to CICD
diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
@@ -1668,6 +1668,10 @@ Topics:
   Dir: jenkins
   Distros: openshift-enterprise
   Topics:
+  - Name: Configuring Jenkins images
+    File: images-other-jenkins
+  - Name: Jenkins agent
+    File: images-other-jenkins-agent
   - Name: Migrating from Jenkins to OpenShift Pipelines
     File: migrating-from-jenkins-to-openshift-pipelines
   - Name: OpenShift Jenkins
@@ -1720,10 +1724,6 @@ Topics:
   Topics:
   - Name: Using images overview
     File: using-images-overview
-  - Name: Configuring Jenkins images
-    File: images-other-jenkins
-  - Name: Jenkins agent
-    File: images-other-jenkins-agent
   - Name: Source-to-image
     File: using-s21-images
   - Name: Customizing source-to-image images
diff --git a/cicd/jenkins/images-other-jenkins-agent.adoc b/cicd/jenkins/images-other-jenkins-agent.adoc
diff --git a/cicd/jenkins/images-other-jenkins.adoc b/cicd/jenkins/images-other-jenkins.adoc
diff --git a/cicd/jenkins/openshift-jenkins.adoc b/cicd/jenkins/openshift-jenkins.adoc
@@ -12,7 +12,7 @@ toc::[]
 
 * {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].
+These changes support the {product-title} 4.10 recommendation to use xref:../../cicd/jenkins/images-other-jenkins.adoc#images-other-jenkins-config-kubernetes_images-other-jenkins[multiple container Pod Templates with the Jenkins Kubernetes Plug-in].
 
 include::modules/relocation-of-openshift-jenkins-images.adoc[leveloffset=+1]
 
@@ -24,7 +24,7 @@ include::modules/customizing-the-jenkins-image-stream-tag.adoc[leveloffset=+1]
 
 * 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.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]
+* xref:../../cicd/jenkins/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]
diff --git a/modules/images-other-jenkins-agent-env-var.adoc b/modules/images-other-jenkins-agent-env-var.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins-agent.adoc
+// * cicd/jenkins/images-other-jenkins-agent.adoc
 
+:_content-type: REFERENCE
 [id="images-other-jenkins-agent-env-var_{context}"]
 = Jenkins agent environment variables
 
diff --git a/modules/images-other-jenkins-agent-gradle.adoc b/modules/images-other-jenkins-agent-gradle.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins-agent.adoc
+// * cicd/jenkins/images-other-jenkins-agent.adoc
 
+:_content-type: REFERENCE
 [id="images-other-jenkins-agent-gradle_{context}"]
 = Jenkins agent Gradle builds
 
diff --git a/modules/images-other-jenkins-agent-images.adoc b/modules/images-other-jenkins-agent-images.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins-agent.adoc
+// * cicd/jenkins/images-other-jenkins-agent.adoc
 
+:_content-type: REFERENCE
 [id="images-other-jenkins-agent-images_{context}"]
 = Jenkins agent images
 
diff --git a/modules/images-other-jenkins-agent-memory.adoc b/modules/images-other-jenkins-agent-memory.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins-agent.adoc
+// * cicd/jenkins/images-other-jenkins-agent.adoc
 
+:_content-type: CONCEPT
 [id="images-other-jenkins-agent-memory_{context}"]
 = Jenkins agent memory requirements
 
diff --git a/modules/images-other-jenkins-agent-pod-retention.adoc b/modules/images-other-jenkins-agent-pod-retention.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins-agent.adoc
+// * cicd/jenkins/images-other-jenkins-agent.adoc
 
+:_content-type: REFERENCE
 [id="images-other-jenkins-agent-pod-retention_{context}"]
 = Jenkins agent pod retention
 
diff --git a/modules/images-other-jenkins-auth.adoc b/modules/images-other-jenkins-auth.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
 :_content-type: PROCEDURE
 [id="images-other-jenkins-auth_{context}"]
diff --git a/modules/images-other-jenkins-config-kubernetes.adoc b/modules/images-other-jenkins-config-kubernetes.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
+:_content-type: CONCEPT
 [id="images-other-jenkins-config-kubernetes_{context}"]
 = Configuring the Jenkins Kubernetes plug-in
 
diff --git a/modules/images-other-jenkins-create-service.adoc b/modules/images-other-jenkins-create-service.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
 :_content-type: PROCEDURE
 [id="images-other-jenkins-create-service_{context}"]
diff --git a/modules/images-other-jenkins-cross-project.adoc b/modules/images-other-jenkins-cross-project.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
 :_content-type: PROCEDURE
 [id="images-other-jenkins-cross-project_{context}"]
diff --git a/modules/images-other-jenkins-customize-s2i.adoc b/modules/images-other-jenkins-customize-s2i.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
+:_content-type: CONCEPT
 [id="images-other-jenkins-customize-s2i_{context}"]
 = Customizing the Jenkins image through source-to-image
 
diff --git a/modules/images-other-jenkins-env-var.adoc b/modules/images-other-jenkins-env-var.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
+:_content-type: REFERENCE
 [id="images-other-jenkins-env-var_{context}"]
 = Jenkins environment variables
 
diff --git a/modules/images-other-jenkins-kubernetes-plugin.adoc b/modules/images-other-jenkins-kubernetes-plugin.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
+:_content-type: CONCEPT
 [id="images-other-jenkins-kubernetes-plugin_{context}"]
 = Using the Jenkins Kubernetes plug-in
 
diff --git a/modules/images-other-jenkins-memory.adoc b/modules/images-other-jenkins-memory.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
+:_content-type: CONCEPT
 [id="images-other-jenkins-memory_{context}"]
 = Jenkins memory requirements
 
diff --git a/modules/images-other-jenkins-oauth-auth.adoc b/modules/images-other-jenkins-oauth-auth.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
+:_content-type: CONCEPT
 [id="images-other-jenkins-oauth-auth_{context}"]
 = {product-title} OAuth authentication
 
diff --git a/modules/images-other-jenkins-permissions.adoc b/modules/images-other-jenkins-permissions.adoc
@@ -1,7 +1,8 @@
 // Module included in the following assemblies:
 //
-// * images/using_images/images-other-jenkins.adoc
+// * cicd/jenkins/images-other-jenkins.adoc
 
+:_content-type: CONCEPT
 [id="images-other-jenkins-permissions_{context}"]
 = Jenkins permissions
 
