diff --git a/.github/workflows/ci_new.yaml b/.github/workflows/ci_new.yaml index 35deb76c..4bcdad2f 100644 --- a/.github/workflows/ci_new.yaml +++ b/.github/workflows/ci_new.yaml @@ -2,6 +2,7 @@ name: CI Workflow on: pull_request: + types: [ opened, synchronize, reopened ] branches: - alpha - main @@ -218,11 +219,19 @@ jobs: run: go mod tidy - name: Testing + if: ${{ github.event_name != 'pull_request' }} run: | TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json export TF_ACC_SERVICE_ACCOUNT_FILE make test + - name: Testing + if: ${{ github.event_name == 'pull_request' }} + run: | + TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json + export TF_ACC_SERVICE_ACCOUNT_FILE + make coverage + # - name: Acceptance Testing # env: # TF_ACC: "1" @@ -232,20 +241,20 @@ jobs: # export TF_ACC_SERVICE_ACCOUNT_FILE # make test-acceptance-tf - - name: Run Test - if: ${{ github.event_name == 'pull_request' }} - uses: ./.github/actions/acc_test - with: - go-version: ${{ env.GO_VERSION }} - project_id: ${{ vars.TF_ACC_PROJECT_ID }} - region: ${{ vars.TF_ACC_REGION }} - 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: Run Acceptance Test +# if: ${{ github.event_name == 'pull_request' }} +# uses: ./.github/actions/acc_test +# with: +# go-version: ${{ env.GO_VERSION }} +# project_id: ${{ vars.TF_ACC_PROJECT_ID }} +# region: ${{ vars.TF_ACC_REGION }} +# 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 diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml index b409df26..8356a14f 100644 --- a/.github/workflows/tf-acc-test.yaml +++ b/.github/workflows/tf-acc-test.yaml @@ -1,6 +1,11 @@ name: TF Acceptance Tests Workflow on: + pull_request: + types: [opened, synchronize, reopened] + branches: + - alpha + - main push: branches: - master diff --git a/stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go b/stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go index 6419406d..a8b0d874 100644 --- a/stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go +++ b/stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go @@ -199,9 +199,9 @@ func TestAccInstanceNoEncryption(t *testing.T) { "##STACKIT_DatabaseManager##", "##STACKIT_LoginManager##", // "##STACKIT_ProcessManager##", - //"##STACKIT_SQLAgentManager##", - //"##STACKIT_SQLAgentUser##", - //"##STACKIT_ServerManager##", + // "##STACKIT_SQLAgentManager##", + // "##STACKIT_SQLAgentUser##", + // "##STACKIT_ServerManager##", }, }, }