Skip to content

add env vars to pipeline strategy #12323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2017
Merged

add env vars to pipeline strategy #12323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions api/protobuf-spec/github_com_openshift_origin_pkg_build_api_v1.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions api/swagger-spec/oapi-v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23237,7 +23237,7 @@
"items": {
"$ref": "v1.EnvVar"
},
"description": "env contains additional environment variables you want to pass into a builder container"
"description": "env contains additional environment variables you want to pass into a builder container. ValueFrom is not supported."
},
"forcePull": {
"type": "boolean",
Expand Down Expand Up @@ -23384,7 +23384,7 @@
"items": {
"$ref": "v1.EnvVar"
},
"description": "env contains additional environment variables you want to pass into a builder container"
"description": "env contains additional environment variables you want to pass into a builder container. ValueFrom is not supported."
},
"scripts": {
"type": "string",
Expand Down Expand Up @@ -23431,7 +23431,7 @@
"items": {
"$ref": "v1.EnvVar"
},
"description": "env contains additional environment variables you want to pass into a builder container"
"description": "env contains additional environment variables you want to pass into a builder container. ValueFrom is not supported."
},
"exposeDockerSocket": {
"type": "boolean",
Expand Down Expand Up @@ -23483,6 +23483,13 @@
"jenkinsfile": {
"type": "string",
"description": "Jenkinsfile defines the optional raw contents of a Jenkinsfile which defines a Jenkins pipeline build."
},
"env": {
"type": "array",
"items": {
"$ref": "v1.EnvVar"
},
"description": "env contains additional environment variables you want to pass into a build pipeline. ValueFrom is not supported."
}
}
},
Expand Down Expand Up @@ -23769,7 +23776,7 @@
"items": {
"$ref": "v1.EnvVar"
},
"description": "env contains additional environment variables you want to pass into a builder container"
"description": "env contains additional environment variables you want to pass into a builder container. ValueFrom is not supported."
},
"triggeredBy": {
"type": "array",
Expand Down
15 changes: 11 additions & 4 deletions api/swagger-spec/openshift-openapi-spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48009,7 +48009,7 @@
"$ref": "#/definitions/v1.BinaryBuildSource"
},
"env": {
"description": "env contains additional environment variables you want to pass into a builder container",
"description": "env contains additional environment variables you want to pass into a builder container. ValueFrom is not supported.",
"type": "array",
"items": {
"$ref": "#/definitions/v1.EnvVar"
Expand Down Expand Up @@ -49288,7 +49288,7 @@
"type": "string"
},
"env": {
"description": "env contains additional environment variables you want to pass into a builder container",
"description": "env contains additional environment variables you want to pass into a builder container. ValueFrom is not supported.",
"type": "array",
"items": {
"$ref": "#/definitions/v1.EnvVar"
Expand Down Expand Up @@ -49878,7 +49878,7 @@
"type": "string"
},
"env": {
"description": "env contains additional environment variables you want to pass into a builder container",
"description": "env contains additional environment variables you want to pass into a builder container. ValueFrom is not supported.",
"type": "array",
"items": {
"$ref": "#/definitions/v1.EnvVar"
Expand Down Expand Up @@ -51620,6 +51620,13 @@
"v1.JenkinsPipelineBuildStrategy": {
"description": "JenkinsPipelineBuildStrategy holds parameters specific to a Jenkins Pipeline build. This strategy is in tech preview.",
"properties": {
"env": {
"description": "env contains additional environment variables you want to pass into a build pipeline. ValueFrom is not supported.",
"type": "array",
"items": {
"$ref": "#/definitions/v1.EnvVar"
}
},
"jenkinsfile": {
"description": "Jenkinsfile defines the optional raw contents of a Jenkinsfile which defines a Jenkins pipeline build.",
"type": "string"
Expand Down Expand Up @@ -55972,7 +55979,7 @@
],
"properties": {
"env": {
"description": "env contains additional environment variables you want to pass into a builder container",
"description": "env contains additional environment variables you want to pass into a builder container. ValueFrom is not supported.",
"type": "array",
"items": {
"$ref": "#/definitions/v1.EnvVar"
Expand Down
17 changes: 13 additions & 4 deletions pkg/build/api/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,8 @@ type CustomBuildStrategy struct {
// registries
PullSecret *kapi.LocalObjectReference

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

// ExposeDockerSocket will allow running Docker commands (and build Docker images) from
Expand Down Expand Up @@ -585,7 +586,8 @@ type DockerBuildStrategy struct {
// --no-cache=true flag
NoCache bool

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

// ForcePull describes if the builder should pull the images from registry prior to building.
Expand All @@ -607,7 +609,8 @@ type SourceBuildStrategy struct {
// registries
PullSecret *kapi.LocalObjectReference

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

// Scripts is the location of Source scripts
Expand Down Expand Up @@ -644,6 +647,10 @@ type JenkinsPipelineBuildStrategy struct {

// Jenkinsfile defines the optional raw contents of a Jenkinsfile which defines a Jenkins pipeline build.
Jenkinsfile string

// Env contains additional environment variables you want to pass into a build pipeline.
// ValueFrom is not supported.
Env []kapi.EnvVar
}

// A BuildPostCommitSpec holds a build post commit hook specification. The hook
Expand Down Expand Up @@ -909,7 +916,8 @@ type GenericWebHookEvent struct {
// Git is the git information, if any.
Git *GitInfo

// Env contains additional environment variables you want to pass into a builder container
// Env contains additional environment variables you want to pass into a builder container.
// ValueFrom is not supported.
Env []kapi.EnvVar
}

Expand Down Expand Up @@ -961,6 +969,7 @@ type BuildRequest struct {
LastVersion *int64

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

// TriggeredBy describes which triggers started the most recent update to the
Expand Down
Loading