Migrate needed .ci/* scripts into .buildkite/* ( elastic#3353 ) (#39661)

* Migrate files and change path to them * Delete files that was migrated to new path
elastic · May 28, 2024 · f411b06 · f411b06
1 parent dff238b
commit f411b06
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.ci/jobs/docker-compose.yml → .buildkite/deploy/docker/docker-compose.yml b/.ci/jobs/docker-compose.yml → .buildkite/deploy/docker/docker-compose.yml
diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh
@@ -382,7 +382,7 @@ startCloudTestEnv() {
   local dir=$1
   withAWS
   echo "--- Run docker-compose services for emulated cloud env"
-  docker-compose -f .ci/jobs/docker-compose.yml up -d                     #TODO: move all docker-compose files from the .ci to .buildkite folder before switching to BK
+  docker-compose -f .buildkite/deploy/docker/docker-compose.yml up -d
   with_Terraform
   terraformInit "$dir"
   export TF_VAR_BRANCH=$(echo "${BUILDKITE_BRANCH}" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g')
@@ -444,10 +444,10 @@ installNodeJsDependencies() {
 teardown() {
   # Teardown resources after using them
   echo "---Terraform Cleanup"
-  .ci/scripts/terraform-cleanup.sh "${MODULE_DIR}"              #TODO: move all docker-compose files from the .ci to .buildkite folder before switching to BK
+  .buildkite/scripts/terraform-cleanup.sh "${MODULE_DIR}"
 
   echo "---Docker Compose Cleanup"
-  docker-compose -f .ci/jobs/docker-compose.yml down -v         #TODO: move all docker-compose files from the .ci to .buildkite folder before switching to BK
+  docker-compose -f .buildkite/deploy/docker/docker-compose.yml down -v
 }
 
 unset_secrets () {

diff --git a/.buildkite/scripts/setup_cloud_env.sh b/.buildkite/scripts/setup_cloud_env.sh
@@ -11,7 +11,7 @@ teardown() {
   tf_cleanup "${MODULE_DIR}"              #TODO: move all docker-compose files from the .ci to .buildkite folder before switching to BK
 
   echo "~~~ Docker Compose Cleanup"
-  docker-compose -f .ci/jobs/docker-compose.yml down -v         #TODO: move all docker-compose files from the .ci to .buildkite folder before switching to BK
+  docker-compose -f .buildkite/deploy/docker/docker-compose.yml down -v
 }
 
 tf_cleanup() {
@@ -38,7 +38,7 @@ export TEST_TAGS="${TEST_TAGS:+$TEST_TAGS,}aws"
 set -o xtrace
 
 echo "~~~ Run docker-compose services for emulated cloud env"
-docker-compose -f .ci/jobs/docker-compose.yml up -d        #TODO: move all docker-compose files from the .ci to .buildkite folder before switching to BK
+docker-compose -f .buildkite/deploy/docker/docker-compose.yml up -d
 echo "~~~ Initialize TF cloud resources"
 cd "$MODULE_DIR"
 export TF_VAR_BRANCH=$(echo "${BUILDKITE_BRANCH}" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g')

diff --git a/.ci/scripts/terraform-cleanup.sh → .buildkite/scripts/terraform-cleanup.sh b/.ci/scripts/terraform-cleanup.sh → .buildkite/scripts/terraform-cleanup.sh