From f92f2cd996111ef6a6bed53a3c0a94d77d3ab4ed Mon Sep 17 00:00:00 2001 From: gabemontero Date: Mon, 27 Jan 2020 13:46:58 -0500 Subject: [PATCH 1/2] add deprecaction notice for build pipeline strategy --- build/v1/types.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/v1/types.go b/build/v1/types.go index b1eab352040..74671e9347a 100644 --- a/build/v1/types.go +++ b/build/v1/types.go @@ -615,6 +615,7 @@ type BuildStrategy struct { CustomStrategy *CustomBuildStrategy `json:"customStrategy,omitempty" protobuf:"bytes,4,opt,name=customStrategy"` // JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy. + // Deprecated: use OpenShift Pipelines JenkinsPipelineStrategy *JenkinsPipelineBuildStrategy `json:"jenkinsPipelineStrategy,omitempty" protobuf:"bytes,5,opt,name=jenkinsPipelineStrategy"` } @@ -760,6 +761,7 @@ type SourceBuildStrategy struct { } // JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build. +// Deprecated: use OpenShift Pipelines type JenkinsPipelineBuildStrategy struct { // 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 From 0bffa3334aafee497ad5b8c6a49e28ed5532ca1b Mon Sep 17 00:00:00 2001 From: gabemontero Date: Mon, 27 Jan 2020 13:47:39 -0500 Subject: [PATCH 2/2] update/verify various generated --- build/v1/generated.proto | 2 ++ build/v1/zz_generated.swagger_doc_generated.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/v1/generated.proto b/build/v1/generated.proto index ef88f268343..1eb136a1d17 100644 --- a/build/v1/generated.proto +++ b/build/v1/generated.proto @@ -498,6 +498,7 @@ message BuildStrategy { optional CustomBuildStrategy customStrategy = 4; // JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy. + // Deprecated: use OpenShift Pipelines optional JenkinsPipelineBuildStrategy jenkinsPipelineStrategy = 5; } @@ -875,6 +876,7 @@ message ImageSourcePath { } // JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build. +// Deprecated: use OpenShift Pipelines message JenkinsPipelineBuildStrategy { // 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 diff --git a/build/v1/zz_generated.swagger_doc_generated.go b/build/v1/zz_generated.swagger_doc_generated.go index c6d419d98b5..5b69e8e65ae 100644 --- a/build/v1/zz_generated.swagger_doc_generated.go +++ b/build/v1/zz_generated.swagger_doc_generated.go @@ -252,7 +252,7 @@ var map_BuildStrategy = map[string]string{ "dockerStrategy": "dockerStrategy holds the parameters to the container image build strategy.", "sourceStrategy": "sourceStrategy holds the parameters to the Source build strategy.", "customStrategy": "customStrategy holds the parameters to the Custom build strategy", - "jenkinsPipelineStrategy": "JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy.", + "jenkinsPipelineStrategy": "JenkinsPipelineStrategy holds the parameters to the Jenkins Pipeline build strategy. Deprecated: use OpenShift Pipelines", } func (BuildStrategy) SwaggerDoc() map[string]string { @@ -498,7 +498,7 @@ func (ImageSourcePath) SwaggerDoc() map[string]string { } var map_JenkinsPipelineBuildStrategy = map[string]string{ - "": "JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build.", + "": "JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build. Deprecated: use OpenShift Pipelines", "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.", "jenkinsfile": "Jenkinsfile defines the optional raw contents of a Jenkinsfile which defines a Jenkins pipeline build.", "env": "env contains additional environment variables you want to pass into a build pipeline.",