diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cd4df3b..a6267b07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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] @@ -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 diff --git a/Makefile b/Makefile index b275d19f..af78edc5 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index 686294f6..2b78568c 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -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' diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml index 00be9142..916cb2d2 100644 --- a/build/lint.cloudbuild.yaml +++ b/build/lint.cloudbuild.yaml @@ -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' diff --git a/modules/core_project_factory/main.tf b/modules/core_project_factory/main.tf index 1f554233..fdfd0250 100644 --- a/modules/core_project_factory/main.tf +++ b/modules/core_project_factory/main.tf @@ -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" }