diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b012216..ac8b744 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,13 +11,12 @@ generate-pipeline: before_script: - apk add --no-cache bash findutils script: - - cd terraform - chmod +x ./scripts/generate-pipeline.sh - ./scripts/generate-pipeline.sh - cat .gitlab-ci.generated.yml artifacts: paths: - - terraform/.gitlab-ci.generated.yml + - .gitlab-ci.generated.yml expire_in: 1 hour rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' @@ -30,7 +29,7 @@ trigger-downstream: - generate-pipeline trigger: include: - - artifact: terraform/.gitlab-ci.generated.yml + - artifact: .gitlab-ci.generated.yml job: generate-pipeline strategy: depend variables: diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh index 49fd5bc..6e5f047 100755 --- a/scripts/generate-pipeline.sh +++ b/scripts/generate-pipeline.sh @@ -3,11 +3,6 @@ set -e OUTPUT_FILE=".gitlab-ci.generated.yml" -# Определяем базовую директорию terraform (где находится этот скрипт) -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -TERRAFORM_DIR="$(dirname "$SCRIPT_DIR")" -TERRAFORM_PREFIX="terraform" - cat > "$OUTPUT_FILE" << 'HEADER' workflow: rules: @@ -54,8 +49,8 @@ find live -name "terragrunt.hcl" -not -path "*/.terragrunt-cache/*" | sort | whi job_prefix="${env}-${component}" - # Полный путь от корня репо - full_component_dir="${TERRAFORM_PREFIX}/${component_dir}" + # Путь к компоненту (working directory уже terraform/) + full_component_dir="${component_dir}" needs_section="" if [ "$component" = "secrets" ]; then