Skip to content
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.

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

Don't fail if precondition fails #357

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Extending the adopted spec, each change should have a link to its corresponding

## [Unreleased]

### Fixed

- Added back `on_failure = continue` to precondition's `local-exec` [#357]

### Added

- The optional `budget_amount` variable will create a budget on the new project. Separate submodule `budget` for additional options. [#354]
Expand Down Expand Up @@ -321,6 +325,7 @@ Extending the adopted spec, each change should have a link to its corresponding
[0.2.1]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v0.2.0...v0.2.1
[0.2.0]: https://github.com/terraform-google-modules/terraform-google-project-factory/compare/v0.1.0...v0.2.0

[#357]: https://github.com/terraform-google-modules/terraform-google-project-factory/issues/357
[#354]: https://github.com/terraform-google-modules/terraform-google-project-factory/issues/354
[#350]: https://github.com/terraform-google-modules/terraform-google-project-factory/issues/350
[#343]: https://github.com/terraform-google-modules/terraform-google-project-factory/issues/343
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Make will use bash instead of sh
SHELL := /usr/bin/env bash

DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.6.0
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
REGISTRY_URL := gcr.io/cloud-foundation-cicd

Expand Down
2 changes: 1 addition & 1 deletion build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ tags:
- 'integration'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.6.0'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
2 changes: 1 addition & 1 deletion build/lint.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ tags:
- 'lint'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.6.0'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
4 changes: 3 additions & 1 deletion modules/core_project_factory/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,12 @@ resource "null_resource" "preconditions" {
provisioner "local-exec" {
command = local.pip_requirements_absolute_path
interpreter = [var.pip_executable_path, "install", "-r"]
on_failure = continue
}

provisioner "local-exec" {
command = local.preconditions_command
command = local.preconditions_command
on_failure = continue
environment = {
GRACEFUL_IMPORTERROR = "true"
}
Expand Down