Skip to content

Commit 064daf7

Browse files
committed
add env vars to pipeline strategy
1 parent c68a3f8 commit 064daf7

11 files changed

+375
-226
lines changed

api/protobuf-spec/github_com_openshift_origin_pkg_build_api_v1.proto

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

api/swagger-spec/oapi-v1.json

+7
Original file line numberDiff line numberDiff line change
@@ -22883,6 +22883,13 @@
2288322883
"jenkinsfile": {
2288422884
"type": "string",
2288522885
"description": "Jenkinsfile defines the optional raw contents of a Jenkinsfile which defines a Jenkins pipeline build."
22886+
},
22887+
"env": {
22888+
"type": "array",
22889+
"items": {
22890+
"$ref": "v1.EnvVar"
22891+
},
22892+
"description": "env contains additional environment variables you want to pass into a build pipeline"
2288622893
}
2288722894
}
2288822895
},

api/swagger-spec/openshift-openapi-spec.json

+7
Original file line numberDiff line numberDiff line change
@@ -48908,6 +48908,13 @@
4890848908
"v1.JenkinsPipelineBuildStrategy": {
4890948909
"description": "JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build. This strategy is in tech preview.",
4891048910
"properties": {
48911+
"env": {
48912+
"description": "env contains additional environment variables you want to pass into a build pipeline",
48913+
"type": "array",
48914+
"items": {
48915+
"$ref": "#/definitions/v1.EnvVar"
48916+
}
48917+
},
4891148918
"jenkinsfile": {
4891248919
"description": "Jenkinsfile defines the optional raw contents of a Jenkinsfile which defines a Jenkins pipeline build.",
4891348920
"type": "string"

pkg/build/api/types.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ type CustomBuildStrategy struct {
523523
PullSecret *kapi.LocalObjectReference
524524

525525
// Env contains additional environment variables you want to pass into a builder container
526+
// ValueFrom is not supported.
526527
Env []kapi.EnvVar
527528

528529
// ExposeDockerSocket will allow running Docker commands (and build Docker images) from
@@ -557,7 +558,8 @@ type DockerBuildStrategy struct {
557558
// --no-cache=true flag
558559
NoCache bool
559560

560-
// Env contains additional environment variables you want to pass into a builder container
561+
// Env contains additional environment variables you want to pass into a builder container.
562+
// ValueFrom is not supported.
561563
Env []kapi.EnvVar
562564

563565
// ForcePull describes if the builder should pull the images from registry prior to building.
@@ -579,7 +581,8 @@ type SourceBuildStrategy struct {
579581
// registries
580582
PullSecret *kapi.LocalObjectReference
581583

582-
// Env contains additional environment variables you want to pass into a builder container
584+
// Env contains additional environment variables you want to pass into a builder container.
585+
// ValueFrom is not supported.
583586
Env []kapi.EnvVar
584587

585588
// Scripts is the location of Source scripts
@@ -616,6 +619,10 @@ type JenkinsPipelineBuildStrategy struct {
616619

617620
// Jenkinsfile defines the optional raw contents of a Jenkinsfile which defines a Jenkins pipeline build.
618621
Jenkinsfile string
622+
623+
// Env contains additional environment variables you want to pass into a build pipeline.
624+
// ValueFrom is not supported.
625+
Env []kapi.EnvVar
619626
}
620627

621628
// A BuildPostCommitSpec holds a build post commit hook specification. The hook
@@ -881,7 +888,8 @@ type GenericWebHookEvent struct {
881888
// Git is the git information, if any.
882889
Git *GitInfo
883890

884-
// Env contains additional environment variables you want to pass into a builder container
891+
// Env contains additional environment variables you want to pass into a builder container.
892+
// ValueFrom is not supported.
885893
Env []kapi.EnvVar
886894
}
887895

@@ -933,6 +941,7 @@ type BuildRequest struct {
933941
LastVersion *int64
934942

935943
// Env contains additional environment variables you want to pass into a builder container.
944+
// ValueFrom is not supported.
936945
Env []kapi.EnvVar
937946

938947
// TriggeredBy describes which triggers started the most recent update to the

0 commit comments

Comments
 (0)