Skip to content

Commit 53b8d9f

Browse files
author
oatmealraisin
committed
Added notice for setting up external jenkins
This is for users interested in using existing Jenkins servers for the pipeline build strategy.
1 parent b58151a commit 53b8d9f

File tree

2 files changed

+27
-11
lines changed

2 files changed

+27
-11
lines changed

architecture/core_concepts/builds_and_image_streams.adoc

+8-5
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,14 @@ Pipeline workflows are defined in a Jenkinsfile,
137137
either embedded directly in the build configuration,
138138
or supplied in a Git repository and referenced by the build configuration.
139139

140-
The first time a project defines a build configuration using a Pipeline strategy,
141-
{product-title} instantiates a Jenkins server to execute the pipeline.
142-
Subsequent Pipeline build configurations
143-
in the project share this Jenkins server. For more details on how the Jenkins
144-
server is deployed, see xref:../../install_config/configuring_pipeline_execution.adoc#overview[configuring pipeline execution].
140+
The first time a project defines a build configuration using a Pipeline
141+
strategy, {product-title} instantiates a Jenkins server to execute the
142+
pipeline. Subsequent Pipeline build configurations in the project share this
143+
Jenkins server.
144+
145+
For more details on how the Jenkins server is deployed and how to configure or
146+
disable the autoprovisioning behavior, see
147+
xref:../../install_config/configuring_pipeline_execution.adoc#overview[configuring pipeline execution].
145148

146149
[NOTE]
147150
====

install_config/configuring_pipeline_execution.adoc

+19-6
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,25 @@ jenkinsPipelineConfig:
6565
<5> Optional values to pass to the template during instantiation.
6666
====
6767

68-
[IMPORTANT]
69-
====
70-
When a Pipeline build configuration is created,
71-
{product-title} instantiates the `*jenkinsPipelineConfig*` template *only if*
72-
no existing service name in the project matches the `*serviceName*` field.
73-
This means `*serviceName*` must be chosen such that it is unique in the project.
68+
When a Pipeline build configuration is created, {product-title} looks for a
69+
Service matching `*serviceName*`. This means `*serviceName*` must be chosen
70+
such that it is unique in the project. If no Service is found, {product-title}
71+
instantiates the `*jenkinsPipelineConfig*` template. If this is not desirable
72+
(if you would like to use a Jenkins server external to {product-title}, for
73+
example), there are a few things you can do, depending on who you are.
74+
75+
* If you are a cluster administrator, simply set `*autoProvisionEnabled*` to `*false*`.
76+
This will disable autoprovisioning across the cluster.
77+
* If you are an unpriviledged user, a Service must be created for {product-title}
78+
to use. The service name must match the cluster configuration value of
79+
`*serviceName*` in the `*jenkinsPipelineConfig*`. The default value is
80+
`*jenkins*`. If you are disabling autoprovisioning because you are running a
81+
Jenkins server outside your project, it is recommended that you point this new
82+
service to your existing Jenkins server. See:
83+
xref:../dev_guide/integrating_external_services.adoc#dev-guide-integrating-external-services[Integrating External Services]
84+
85+
The latter option could also be used to disable autoprovisioning in select
86+
projects only.
7487
====
7588
7689
// end::installconfig_configuring_pipeline_execution[]

0 commit comments

Comments
 (0)