From 153da4a5536b8817f3f11d6c31400f114f93607a Mon Sep 17 00:00:00 2001 From: Edoardo Tenani Date: Wed, 1 Dec 2021 16:16:09 +0100 Subject: [PATCH 1/2] copy all files for terraform system tests Terraform allows using files from the local folder for different use cases. The current implementation of the deployer prevents this by copying only *.tf files from the stage folder to the workspace folder. This commit update the script to copy all files. --- internal/install/_static/terraform_deployer_run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/install/_static/terraform_deployer_run.sh b/internal/install/_static/terraform_deployer_run.sh index 5d2455685..4f92f9d85 100644 --- a/internal/install/_static/terraform_deployer_run.sh +++ b/internal/install/_static/terraform_deployer_run.sh @@ -2,7 +2,7 @@ set -euxo pipefail -cp -r /stage/*.tf /workspace +cp -r /stage/* /workspace cleanup() { r=$? From 7b3f15f9a79049252f193b2f32caf8e523bc8779 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Thu, 2 Dec 2021 16:25:19 +0100 Subject: [PATCH 2/2] Update internal/install/_static/terraform_deployer_run.sh --- internal/install/_static/terraform_deployer_run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/install/_static/terraform_deployer_run.sh b/internal/install/_static/terraform_deployer_run.sh index 4f92f9d85..5f8d28bc1 100644 --- a/internal/install/_static/terraform_deployer_run.sh +++ b/internal/install/_static/terraform_deployer_run.sh @@ -2,6 +2,8 @@ set -euxo pipefail +# Terraform code may rely on content from other files than .tf files (es json, zip, html, text), so we copy all the content over +# See more: https://github.com/elastic/elastic-package/pull/603 cp -r /stage/* /workspace cleanup() {