From a063149dc386afef4b88f2a5f38958598b96b1dc Mon Sep 17 00:00:00 2001 From: shenlan Date: Mon, 29 Sep 2025 23:29:10 +0800 Subject: [PATCH] Fix infrastructure workflow baseline triggers --- .../workflows/iac-pipeline-infrastructure-resources.yml | 8 ++++++-- .../iac-pipeline-multi-cloud-landingzone-baseline.yaml | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/iac-pipeline-infrastructure-resources.yml b/.github/workflows/iac-pipeline-infrastructure-resources.yml index 218ffb1a..24a3cb05 100644 --- a/.github/workflows/iac-pipeline-infrastructure-resources.yml +++ b/.github/workflows/iac-pipeline-infrastructure-resources.yml @@ -57,6 +57,12 @@ jobs: config: config/vultr/ workflow: iac-pipeline-vultr-landingzone-baseline.yaml action: output + uses: ./.github/workflows/${{ matrix.workflow }} + with: + deploy_action: ${{ matrix.action || inputs.deploy_action }} + deploy_dry_run: ${{ inputs.deploy_dry_run }} + config_path: ${{ matrix.config }} + secrets: inherit verify-baseline-status: if: inputs.deploy_action != 'destroy' name: Verify Alicloud baseline readiness @@ -105,8 +111,6 @@ jobs: secrets: SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} - env: - STATE: "create" setup-monitor-cluster: name: Configure monitor exporters diff --git a/.github/workflows/iac-pipeline-multi-cloud-landingzone-baseline.yaml b/.github/workflows/iac-pipeline-multi-cloud-landingzone-baseline.yaml index c6d987e8..83ad3f41 100644 --- a/.github/workflows/iac-pipeline-multi-cloud-landingzone-baseline.yaml +++ b/.github/workflows/iac-pipeline-multi-cloud-landingzone-baseline.yaml @@ -30,15 +30,18 @@ jobs: - provider: Alicloud config: config/alicloud/ workflow: iac-pipeline-alicloud-landingzone-baseline.yaml + action: output - provider: AWS config: config/aws-global/ workflow: iac-pipeline-aws-landingzone-baseline.yaml + action: output - provider: Vultr config: config/vultr/ workflow: iac-pipeline-vultr-landingzone-baseline.yaml + action: output uses: ./.github/workflows/${{ matrix.workflow }} with: - deploy_action: ${{ inputs.deploy_action }} + deploy_action: ${{ matrix.action || inputs.deploy_action }} deploy_dry_run: ${{ inputs.deploy_dry_run }} config_path: ${{ matrix.config }} secrets: inherit