From cfacdc1a3a44984b91691cb898b81847b91594a7 Mon Sep 17 00:00:00 2001 From: "Marcel S. Henselin" Date: Wed, 11 Mar 2026 14:11:30 +0100 Subject: [PATCH] test: use action in workflow [skip ci] --- .github/workflows/{ci.yaml => ci.yaml.bak} | 0 .github/workflows/ci_new.yaml | 29 ++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) rename .github/workflows/{ci.yaml => ci.yaml.bak} (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml.bak similarity index 100% rename from .github/workflows/ci.yaml rename to .github/workflows/ci.yaml.bak diff --git a/.github/workflows/ci_new.yaml b/.github/workflows/ci_new.yaml index 224a5a47..addcecd7 100644 --- a/.github/workflows/ci_new.yaml +++ b/.github/workflows/ci_new.yaml @@ -223,14 +223,29 @@ jobs: export TF_ACC_SERVICE_ACCOUNT_FILE make test - - name: Acceptance Testing - env: - TF_ACC: "1" +# - name: Acceptance Testing +# env: +# TF_ACC: "1" +# if: ${{ github.event_name == 'pull_request' }} +# run: | +# TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json +# export TF_ACC_SERVICE_ACCOUNT_FILE +# make test-acceptance-tf + + - name: Run Test if: ${{ github.event_name == 'pull_request' }} - run: | - TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json - export TF_ACC_SERVICE_ACCOUNT_FILE - make test-acceptance-tf + uses: ./.github/actions/acc_test + with: + go-version: ${{ env.GO_VERSION }} + project_id: ${{ vars.TF_ACC_PROJECT_ID }} + region: 'eu01' + service_account_json_content_b64: "${{ secrets.TF_ACC_SERVICE_ACCOUNT_JSON_B64 }}" + project_user_email: ${{ vars.TEST_PROJECT_USER_EMAIL }} + tf_acc_kek_key_id: ${{ vars.TF_ACC_KEK_KEY_ID }} + tf_acc_kek_key_ring_id: ${{ vars.TF_ACC_KEK_KEY_RING_ID }} + tf_acc_kek_key_version: ${{ vars.TF_ACC_KEK_KEY_VERSION }} + tf_acc_kek_service_account: ${{ vars.TF_ACC_KEK_SERVICE_ACCOUNT }} + # service_account_json_file_path: "~/service_account.json" - name: Check coverage threshold shell: bash