Skip to content

Commit 4f6472f

Browse files
author
OpenShift Bot
authored
Merge pull request #10288 from bparees/extended_experimental
Merged by openshift-bot
2 parents c97d6e7 + 1d256df commit 4f6472f

File tree

6 files changed

+35
-25
lines changed

6 files changed

+35
-25
lines changed

api/swagger-spec/oapi-v1.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21325,7 +21325,7 @@
2132521325
},
2132621326
"jenkinsPipelineStrategy": {
2132721327
"$ref": "v1.JenkinsPipelineBuildStrategy",
21328-
"description": "JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy. This strategy is experimental."
21328+
"description": "JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy. This strategy is in tech preview."
2132921329
}
2133021330
}
2133121331
},
@@ -21513,14 +21513,14 @@
2151321513
},
2151421514
"runtimeImage": {
2151521515
"$ref": "v1.ObjectReference",
21516-
"description": "runtimeImage is an optional image that is used to run an application without unneeded dependencies installed. The building of the application is still done in the builder image but, post build, you can copy the needed artifacts in the runtime image for use."
21516+
"description": "runtimeImage is an optional image that is used to run an application without unneeded dependencies installed. The building of the application is still done in the builder image but, post build, you can copy the needed artifacts in the runtime image for use. This field and the feature it enables are in tech preview."
2151721517
},
2151821518
"runtimeArtifacts": {
2151921519
"type": "array",
2152021520
"items": {
2152121521
"$ref": "v1.ImageSourcePath"
2152221522
},
21523-
"description": "runtimeArtifacts specifies a list of source/destination pairs that will be copied from the builder to the runtime image. sourcePath can be a file or directory. destinationDir must be a directory. destinationDir can also be empty or equal to \".\", in this case it just refers to the root of WORKDIR."
21523+
"description": "runtimeArtifacts specifies a list of source/destination pairs that will be copied from the builder to the runtime image. sourcePath can be a file or directory. destinationDir must be a directory. destinationDir can also be empty or equal to \".\", in this case it just refers to the root of WORKDIR. This field and the feature it enables are in tech preview."
2152421524
}
2152521525
}
2152621526
},
@@ -21587,7 +21587,7 @@
2158721587
},
2158821588
"v1.JenkinsPipelineBuildStrategy": {
2158921589
"id": "v1.JenkinsPipelineBuildStrategy",
21590-
"description": "JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build. This strategy is experimental.",
21590+
"description": "JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build. This strategy is in tech preview.",
2159121591
"properties": {
2159221592
"jenkinsfilePath": {
2159321593
"type": "string",

pkg/build/api/types.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ type BuildStrategy struct {
424424
CustomStrategy *CustomBuildStrategy
425425

426426
// JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy.
427-
// This strategy is experimental.
427+
// This strategy is in tech preview.
428428
JenkinsPipelineStrategy *JenkinsPipelineBuildStrategy
429429
}
430430

@@ -521,17 +521,19 @@ type SourceBuildStrategy struct {
521521
// without unneeded dependencies installed. The building of the application
522522
// is still done in the builder image but, post build, you can copy the
523523
// needed artifacts in the runtime image for use.
524+
// This field and the feature it enables are in tech preview.
524525
RuntimeImage *kapi.ObjectReference
525526

526527
// RuntimeArtifacts specifies a list of source/destination pairs that will be
527528
// copied from the builder to a runtime image. sourcePath can be a file or
528529
// directory. destinationDir must be a directory. destinationDir can also be
529530
// empty or equal to ".", in this case it just refers to the root of WORKDIR.
531+
// This field and the feature it enables are in tech preview.
530532
RuntimeArtifacts []ImageSourcePath
531533
}
532534

533535
// JenkinsPipelineStrategy holds parameters specific to a Jenkins Pipeline build.
534-
// This strategy is experimental.
536+
// This strategy is in tech preview.
535537
type JenkinsPipelineBuildStrategy struct {
536538
// JenkinsfilePath is the optional path of the Jenkinsfile that will be used to configure the pipeline
537539
// relative to the root of the context (contextDir). If both JenkinsfilePath & Jenkinsfile are

pkg/build/api/v1/generated.proto

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/build/api/v1/swagger_doc.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ var map_BuildStrategy = map[string]string{
202202
"dockerStrategy": "dockerStrategy holds the parameters to the Docker build strategy.",
203203
"sourceStrategy": "sourceStrategy holds the parameters to the Source build strategy.",
204204
"customStrategy": "customStrategy holds the parameters to the Custom build strategy",
205-
"jenkinsPipelineStrategy": "JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy. This strategy is experimental.",
205+
"jenkinsPipelineStrategy": "JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy. This strategy is in tech preview.",
206206
}
207207

208208
func (BuildStrategy) SwaggerDoc() map[string]string {
@@ -383,7 +383,7 @@ func (ImageSourcePath) SwaggerDoc() map[string]string {
383383
}
384384

385385
var map_JenkinsPipelineBuildStrategy = map[string]string{
386-
"": "JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build. This strategy is experimental.",
386+
"": "JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build. This strategy is in tech preview.",
387387
"jenkinsfilePath": "JenkinsfilePath is the optional path of the Jenkinsfile that will be used to configure the pipeline relative to the root of the context (contextDir). If both JenkinsfilePath & Jenkinsfile are both not specified, this defaults to Jenkinsfile in the root of the specified contextDir.",
388388
"jenkinsfile": "Jenkinsfile defines the optional raw contents of a Jenkinsfile which defines a Jenkins pipeline build.",
389389
}
@@ -420,8 +420,8 @@ var map_SourceBuildStrategy = map[string]string{
420420
"scripts": "scripts is the location of Source scripts",
421421
"incremental": "incremental flag forces the Source build to do incremental builds if true.",
422422
"forcePull": "forcePull describes if the builder should pull the images from registry prior to building.",
423-
"runtimeImage": "runtimeImage is an optional image that is used to run an application without unneeded dependencies installed. The building of the application is still done in the builder image but, post build, you can copy the needed artifacts in the runtime image for use.",
424-
"runtimeArtifacts": "runtimeArtifacts specifies a list of source/destination pairs that will be copied from the builder to the runtime image. sourcePath can be a file or directory. destinationDir must be a directory. destinationDir can also be empty or equal to \".\", in this case it just refers to the root of WORKDIR.",
423+
"runtimeImage": "runtimeImage is an optional image that is used to run an application without unneeded dependencies installed. The building of the application is still done in the builder image but, post build, you can copy the needed artifacts in the runtime image for use. This field and the feature it enables are in tech preview.",
424+
"runtimeArtifacts": "runtimeArtifacts specifies a list of source/destination pairs that will be copied from the builder to the runtime image. sourcePath can be a file or directory. destinationDir must be a directory. destinationDir can also be empty or equal to \".\", in this case it just refers to the root of WORKDIR. This field and the feature it enables are in tech preview.",
425425
}
426426

427427
func (SourceBuildStrategy) SwaggerDoc() map[string]string {

pkg/build/api/v1/types.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ type BuildStrategy struct {
377377
CustomStrategy *CustomBuildStrategy `json:"customStrategy,omitempty" protobuf:"bytes,4,opt,name=customStrategy"`
378378

379379
// JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy.
380-
// This strategy is experimental.
380+
// This strategy is in tech preview.
381381
JenkinsPipelineStrategy *JenkinsPipelineBuildStrategy `json:"jenkinsPipelineStrategy,omitempty" protobuf:"bytes,5,opt,name=jenkinsPipelineStrategy"`
382382
}
383383

@@ -484,17 +484,19 @@ type SourceBuildStrategy struct {
484484
// without unneeded dependencies installed. The building of the application
485485
// is still done in the builder image but, post build, you can copy the
486486
// needed artifacts in the runtime image for use.
487+
// This field and the feature it enables are in tech preview.
487488
RuntimeImage *kapi.ObjectReference `json:"runtimeImage,omitempty" protobuf:"bytes,7,opt,name=runtimeImage"`
488489

489490
// runtimeArtifacts specifies a list of source/destination pairs that will be
490491
// copied from the builder to the runtime image. sourcePath can be a file or
491492
// directory. destinationDir must be a directory. destinationDir can also be
492493
// empty or equal to ".", in this case it just refers to the root of WORKDIR.
494+
// This field and the feature it enables are in tech preview.
493495
RuntimeArtifacts []ImageSourcePath `json:"runtimeArtifacts,omitempty" protobuf:"bytes,8,rep,name=runtimeArtifacts"`
494496
}
495497

496498
// JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build.
497-
// This strategy is experimental.
499+
// This strategy is in tech preview.
498500
type JenkinsPipelineBuildStrategy struct {
499501
// JenkinsfilePath is the optional path of the Jenkinsfile that will be used to configure the pipeline
500502
// relative to the root of the context (contextDir). If both JenkinsfilePath & Jenkinsfile are

pkg/sdn/api/v1/generated.proto

+15-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)