diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml index c536e99ef31da8db30b68e70a8e1d0dcce200450..09099a7d17775d9e075540c54aa5bf6170a3f0dc 100644 --- a/templates/full-pipeline.yml +++ b/templates/full-pipeline.yml @@ -314,7 +314,7 @@ include: state_name: $[[ inputs.state_name ]] plan_name: $[[ inputs.plan_name ]] artifacts_access: $[[ inputs.plan_artifacts_access ]] - artifacts: $[[ inputs.plan_artifacts ]] + extra_artifacts: $[[ inputs.plan_artifacts ]] var_file: $[[ inputs.var_file ]] rules: $[[ inputs.plan_rules ]] warning_on_non_empty_plan: $[[ inputs.warning_on_non_empty_plan ]] diff --git a/templates/plan.yml b/templates/plan.yml index 60c7127b0f3ef01d1a344c97f8894fc7d7d30666..c708d39bb6d4478dd259476a2df3da9ec9841598 100644 --- a/templates/plan.yml +++ b/templates/plan.yml @@ -74,7 +74,7 @@ spec: artifacts_access: default: 'none' description: 'Access level for the plan artifact. See https://docs.gitlab.com/ee/ci/yaml/#artifactsaccess for possible values.' - artifacts: + extra_artifacts: default: [] type: array description: 'Extra artifacts to upload from the plan' @@ -201,7 +201,7 @@ include: access: '$[[ inputs.artifacts_access ]]' paths: - $GITLAB_TOFU_ROOT_DIR/$[[ inputs.plan_name ]].cache - - '$[[ inputs.artifacts ]]' + - '$[[ inputs.extra_artifacts ]]' reports: terraform: $GITLAB_TOFU_ROOT_DIR/$[[ inputs.plan_name]].json rules: $[[ inputs.rules ]] diff --git a/templates/validate-plan-apply.yml b/templates/validate-plan-apply.yml index 891b199b27ce2a9b2ed14a128e43d0b4083d2308..b60ccc1a041dc0d709bbacdb6a299e3f3561a0ee 100644 --- a/templates/validate-plan-apply.yml +++ b/templates/validate-plan-apply.yml @@ -252,7 +252,7 @@ include: state_name: $[[ inputs.state_name ]] plan_name: $[[ inputs.plan_name ]] artifacts_access: $[[ inputs.plan_artifacts_access ]] - artifacts: $[[ inputs.plan_artifacts ]] + extra_artifacts: $[[ inputs.plan_artifacts ]] var_file: $[[ inputs.var_file ]] rules: $[[ inputs.plan_rules ]] cache_policy: pull diff --git a/templates/validate-plan-destroy.yml b/templates/validate-plan-destroy.yml index c8f6d57f6667fab88158a36c6672848031b41968..132a56a775bac5c15fe351e980e9a47cf9a32a96 100644 --- a/templates/validate-plan-destroy.yml +++ b/templates/validate-plan-destroy.yml @@ -258,7 +258,7 @@ include: state_name: $[[ inputs.state_name ]] plan_name: $[[ inputs.plan_name ]] artifacts_access: $[[ inputs.plan_artifacts_access ]] - artifacts: $[[ inputs.plan_artifacts ]] + extra_artifacts: $[[ inputs.plan_artifacts ]] destroy: true var_file: $[[ inputs.var_file ]] rules: $[[ inputs.plan_rules ]] diff --git a/templates/validate-plan.yml b/templates/validate-plan.yml index 605f095b006ac63f050bab3296e7bab33f4f1001..fe1205bb7c34d1b68cceaa918f82745f6e67f95d 100644 --- a/templates/validate-plan.yml +++ b/templates/validate-plan.yml @@ -236,7 +236,7 @@ include: state_name: $[[ inputs.state_name ]] plan_name: $[[ inputs.plan_name ]] artifacts_access: $[[ inputs.artifacts_access ]] - artifacts: $[[ inputs.plan_artifacts ]] + extra_artifacts: $[[ inputs.plan_artifacts ]] var_file: $[[ inputs.var_file ]] rules: $[[ inputs.plan_rules ]] cache_policy: pull @@ -294,7 +294,7 @@ stages: state_name: $[[ inputs.state_name]] plan_name: $[[ inputs.plan_name ]] artifacts_access: $[[ inputs.artifacts_access ]] - artifacts: $[[ inputs.plan_artifacts ]] + extra_artifacts: $[[ inputs.plan_artifacts ]] var_file: $[[ inputs.var_file ]] fmt_allow_failure: $[[ inputs.fmt_allow_failure ]] fmt_rules: $[[ inputs.fmt_rules ]]