maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add CircleCI support (#2143)

Browse source
This commit is contained in:
Chris Smith 2018-11-01 11:20:31 -07:00 committed by GitHub
parent 946ca655d3
commit 0a76923c64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
cmd/util.go
View file

@ -484,41 +484,36 @@ func gitCommitTitle(s string) string {
// addCIMetadataToEnvironment populates the environment metadata bag with CI/CD-related values.
func addCIMetadataToEnvironment(env map[string]string) {
// Add the key/value pair to env, if there actually is a value.
addIfSet := func(key, val string) {
if val != "" {
env[key] = val
}
}
// If CI variables have been set specifically for Pulumi in the environment,
// use that in preference to attempting to automatically detect the CI system.
// This allows Pulumi to work with any CI system with appropriate configuration,
// rather than requiring explicit support for each one.
if os.Getenv("PULUMI_CI_SYSTEM") != "" {
env[backend.CISystem] = os.Getenv("PULUMI_CI_SYSTEM")
addIfSet(backend.CIBuildID, os.Getenv("PULUMI_CI_BUILD_ID"))
addIfSet(backend.CIBuildType, os.Getenv("PULUMI_CI_BUILD_TYPE"))
addIfSet(backend.CIBuildURL, os.Getenv("PULUMI_CI_BUILD_URL"))
addIfSet(backend.CIPRHeadSHA, os.Getenv("PULUMI_CI_PULL_REQUEST_SHA"))
// Set whatever variables we have available in the environment
if buildID := os.Getenv("PULUMI_CI_BUILD_ID"); buildID != "" {
env[backend.CIBuildID] = buildID
}
if buildType := os.Getenv("PULUMI_CI_BUILD_TYPE"); buildType != "" {
env[backend.CIBuildType] = buildType
}
if buildURL := os.Getenv("PULUMI_CI_BUILD_URL"); buildURL != "" {
env[backend.CIBuildURL] = buildURL
}
// Pass pull request-specific vales as appropriate.
if sha := os.Getenv("PULUMI_CI_PULL_REQUEST_SHA"); sha != "" {
env[backend.CIPRHeadSHA] = sha
}
// Don't proceed with automatic CI detection
// Don't proceed with automatic CI detection since we are using the PULUMI_* values.
return
}
// If CI variables were not set in the environment, try to detect which
// CI system we are inside and set variables
// Use our built-in CI/CD detection logic.
vars := ciutil.DetectVars()
if vars.Name != "" {
env[backend.CISystem] = string(vars.Name)
env[backend.CIBuildID] = vars.BuildID
env[backend.CIBuildType] = vars.BuildType
env[backend.CIPRHeadSHA] = vars.SHA
addIfSet(backend.CIBuildID, vars.BuildID)
addIfSet(backend.CIBuildType, vars.BuildType)
addIfSet(backend.CIBuildURL, vars.BuildURL)
addIfSet(backend.CIPRHeadSHA, vars.SHA)
}
}

12
pkg/util/ciutil/vars.go
View file

@ -44,20 +44,26 @@ func DetectVars() Vars {
// we'll just have reduced functionality for our various CI integrations.
switch v.Name {
case GitLab:
// We are running in GitLab CI. See https://docs.gitlab.com/ee/ci/variables/.
// See https://docs.gitlab.com/ee/ci/variables/.
v.BuildID = os.Getenv("CI_JOB_ID")
v.BuildURL = os.Getenv("CI_JOB_URL")
v.SHA = os.Getenv("CI_COMMIT_SHA")
v.BranchName = os.Getenv("CI_COMMIT_REF_NAME")
v.CommitMessage = os.Getenv("CI_COMMIT_MESSAGE")
case Travis:
// We are running in Travis. See https://docs.travis-ci.com/user/environment-variables/. Travis doesn't
// set a build URL in its environment -- see https://github.com/travis-ci/travis-ci/issues/8935.
// See https://docs.travis-ci.com/user/environment-variables/.
// NOTE: Travis doesn't set a build URL in its environment, https://github.com/travis-ci/travis-ci/issues/8935.
v.BuildID = os.Getenv("TRAVIS_JOB_ID")
v.BuildType = os.Getenv("TRAVIS_EVENT_TYPE")
v.SHA = os.Getenv("TRAVIS_PULL_REQUEST_SHA")
v.BranchName = os.Getenv("TRAVIS_BRANCH")
v.CommitMessage = os.Getenv("TRAVIS_COMMIT_MESSAGE")
case CircleCI:
// See: https://circleci.com/docs/2.0/env-vars/
v.BuildID = os.Getenv("CIRCLE_BUILD_NUM")
v.BuildURL = os.Getenv("CIRCLE_BUILD_URL")
v.SHA = os.Getenv("CIRCLE_SHA1")
v.BranchName = os.Getenv("CIRCLE_BRANCH")
}
return v
}