Add JenkinsfilePath & inline Jenkinsfile options

Author: jimmidyson

api/swagger-spec/oapi-v1.json

@@ -17702,8 +17702,7 @@
       "description": "CustomStrategy holds the parameters to the Custom build strategy"
      },
      "externalStrategy": {
-      "$ref": "v1.ExternalBuildStrategy",
-      "description": "holds parameters to the External build strategy"
+      "$ref": "v1.ExternalBuildStrategy"
      }
     }
    },
@@ -17929,7 +17928,37 @@
    },
    "v1.ExternalBuildStrategy": {
     "id": "v1.ExternalBuildStrategy",
-    "properties": {}
+    "required": [
+     "type"
+    ],
+    "properties": {
+     "type": {
+      "type": "string",
+      "description": "identifies the type of external build"
+     },
+     "env": {
+      "type": "array",
+      "items": {
+       "$ref": "v1.EnvVar"
+      },
+      "description": "additional environment variables you want to pass into an external build"
+     },
+     "jenkinsPipelineStrategy": {
+      "$ref": "v1.JenkinsPipelineStrategy",
+      "description": "holds parameters to the Jenkins Pipeline external build strategy"
+     }
+    }
+   },
+   "v1.JenkinsPipelineStrategy": {
+    "id": "v1.JenkinsPipelineStrategy",
+    "properties": {
+     "jenkinsfilePath": {
+      "type": "string"
+     },
+     "jenkinsfile": {
+      "type": "string"
+     }
+    }
    },
    "v1.BuildOutput": {
     "id": "v1.BuildOutput",

pkg/api/deep_copy_generated.go

@@ -1348,6 +1348,18 @@ func deepCopy_api_ImageSourcePath(in buildapi.ImageSourcePath, out *buildapi.Ima
 }
 
 func deepCopy_api_JenkinsPipelineStrategy(in buildapi.JenkinsPipelineStrategy, out *buildapi.JenkinsPipelineStrategy, c *conversion.Cloner) error {
+	if in.JenkinsfilePath != nil {
+		out.JenkinsfilePath = new(string)
+		*out.JenkinsfilePath = *in.JenkinsfilePath
+	} else {
+		out.JenkinsfilePath = nil
+	}
+	if in.Jenkinsfile != nil {
+		out.Jenkinsfile = new(string)
+		*out.Jenkinsfile = *in.Jenkinsfile
+	} else {
+		out.Jenkinsfile = nil
+	}
 	return nil
 }
 

pkg/api/v1/conversion_generated.go

@@ -1707,6 +1707,18 @@ func autoConvert_api_JenkinsPipelineStrategy_To_v1_JenkinsPipelineStrategy(in *b
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*buildapi.JenkinsPipelineStrategy))(in)
 	}
+	if in.JenkinsfilePath != nil {
+		out.JenkinsfilePath = new(string)
+		*out.JenkinsfilePath = *in.JenkinsfilePath
+	} else {
+		out.JenkinsfilePath = nil
+	}
+	if in.Jenkinsfile != nil {
+		out.Jenkinsfile = new(string)
+		*out.Jenkinsfile = *in.Jenkinsfile
+	} else {
+		out.Jenkinsfile = nil
+	}
 	return nil
 }
 
@@ -2592,6 +2604,18 @@ func autoConvert_v1_JenkinsPipelineStrategy_To_api_JenkinsPipelineStrategy(in *v
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*v1.JenkinsPipelineStrategy))(in)
 	}
+	if in.JenkinsfilePath != nil {
+		out.JenkinsfilePath = new(string)
+		*out.JenkinsfilePath = *in.JenkinsfilePath
+	} else {
+		out.JenkinsfilePath = nil
+	}
+	if in.Jenkinsfile != nil {
+		out.Jenkinsfile = new(string)
+		*out.Jenkinsfile = *in.Jenkinsfile
+	} else {
+		out.Jenkinsfile = nil
+	}
 	return nil
 }
 

pkg/api/v1/deep_copy_generated.go

@@ -1370,6 +1370,18 @@ func deepCopy_v1_ImageSourcePath(in apiv1.ImageSourcePath, out *apiv1.ImageSourc
 }
 
 func deepCopy_v1_JenkinsPipelineStrategy(in apiv1.JenkinsPipelineStrategy, out *apiv1.JenkinsPipelineStrategy, c *conversion.Cloner) error {
+	if in.JenkinsfilePath != nil {
+		out.JenkinsfilePath = new(string)
+		*out.JenkinsfilePath = *in.JenkinsfilePath
+	} else {
+		out.JenkinsfilePath = nil
+	}
+	if in.Jenkinsfile != nil {
+		out.Jenkinsfile = new(string)
+		*out.Jenkinsfile = *in.Jenkinsfile
+	} else {
+		out.Jenkinsfile = nil
+	}
 	return nil
 }
 

pkg/build/api/types.go

@@ -443,6 +443,12 @@ type ExternalBuildStrategy struct {
 
 // JenkinsPipelineStrategy holds parameters specific to a Jenkins Pipeline build.
 type JenkinsPipelineStrategy struct {
+	// JenkinsfilePath is the path of the Jenkinsfile that will be used to configure the pipeline
+	// relative to the root of the source repository.
+	JenkinsfilePath *string `json:"jenkinsfilePath,omitempty"`
+
+	// Jenkinsfile is the raw contents of a Jenkinsfile containing the pipeline definition.
+	Jenkinsfile *string `json:"jenkinsfile,omitempty"`
 }
 
 // A BuildPostCommitSpec holds a build post commit hook specification. The hook

pkg/build/api/v1/types.go

@@ -416,6 +416,7 @@ const (
 
 // ExternalBuildStrategy defines input parameters specific to an External build.
 type ExternalBuildStrategy struct {
+	// Type is the kind of external builder.
 	Type ExternalBuilderType `json:"type" description:"identifies the type of external build"`
 
 	// Env contains additional environment variables you want to pass to the external builder.
@@ -427,6 +428,12 @@ type ExternalBuildStrategy struct {
 
 // JenkinsPipelineStrategy holds parameters specific to a Jenkins Pipeline build.
 type JenkinsPipelineStrategy struct {
+	// JenkinsfilePath is the path of the Jenkinsfile that will be used to configure the pipeline
+	// relative to the root of the source repository.
+	JenkinsfilePath *string `json:"jenkinsfilePath,omitempty"`
+
+	// Jenkinsfile is the raw contents of a Jenkinsfile containing the pipeline definition.
+	Jenkinsfile *string `json:"jenkinsfile,omitempty"`
 }
 
 // A BuildPostCommitSpec holds a build post commit hook specification. The hook