[#112]: replace needs with dependencies to stop breaking stage execut…

…ion order (#113) Co-authored-by: Eddy PEPY <[email protected]>
Orange-OpenSource · Sep 23, 2024 · e12aa0c · e12aa0c
1 parent de4426d
commit e12aa0c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/automation/jinja2/templates/.env.dist.j2 b/automation/jinja2/templates/.env.dist.j2
@@ -105,10 +105,10 @@ DEFAULT_TERRASCAN_CONFIG={{ terrascan_config | default(".config/.terrascan_confi
 DEFAULT_TERRAFORM_DOCS_CONFIG={{ terraform_docs_config | default(".config/.terraform-docs.yml", true) }}
 
 # List the folder for each Terraform Plan to install, respect the order of installation
-PLAN_INSTALL_LIST={{ plans  | join(',') }}
+PLAN_INSTALL_LIST={{ plans | map(attribute="name") | join(',') }}
 
 # List the folder for each Terraform Plan to uninstall, respect the order of uninstallation
-PLAN_DELETE_LIST={{ plans | reverse | join(',')  }}
+PLAN_DELETE_LIST={{ plans | map(attribute="name") | reverse | join(',')  }}
 
 # AWS Account ID in which your plan are deployed and containing the backend bucket
 ACCOUNT_ID={{ ACCOUNT_ID }}

diff --git a/automation/jinja2/templates/.gitlab-ci.yml.j2 b/automation/jinja2/templates/.gitlab-ci.yml.j2
@@ -541,7 +541,7 @@ init_{{ plan_slug }}:
 plan_{{ plan_slug }}:
   extends: .plan_job
   stage: {{ stage_name }}
-  needs:
+  dependencies:
   {% if  GITLAB_JOBS["aws-creds"] %}
     - aws-creds
   {% endif %}

diff --git a/configure.yaml.dist b/configure.yaml.dist
@@ -159,7 +159,7 @@ plans:
 #  - name: terraform/demo2
 #    # (optional) Add Gitlab Plan artifacts
 #    additional_gitlab_plan_artifacts:
-#  - builds
+#    - builds
 #    # (optional) layer specific init parameters replacement
 #    override_init_parameters: ""
 #    # (optional) layer specific 'plan' parameters replacement