From 5963c36c4348c1762d2a250624c32e0ea281d7c1 Mon Sep 17 00:00:00 2001
From: michaelkad <michaelkadiayi@gmail.com>
Date: Wed, 4 Dec 2024 12:05:14 -0600
Subject: [PATCH] Acceptance test: fix env vars

---
 .github/workflows/power-acceptance-test.yml | 29 ++++++---------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/power-acceptance-test.yml b/.github/workflows/power-acceptance-test.yml
index c77b63781f..14509759d6 100644
--- a/.github/workflows/power-acceptance-test.yml
+++ b/.github/workflows/power-acceptance-test.yml
@@ -45,6 +45,8 @@ jobs:
       # Step 6 : Find modified files, set environment variables, and run tests
       - name: Find modified files and run acceptance tests
         run: |
+          # Create report file
+          mkdir -p test-results
           # Get the list of modified Go files in the PR under the ibm/service/power directory
           git fetch origin
           modified_go_files=$(git diff --name-only origin/${{ github.event.pull_request.base.ref }} -- 'ibm/service/power/*.go')
@@ -74,7 +76,9 @@ jobs:
           # If there are modified test files, run the tests
           if [ -n "$modified_test_files" ]; then
             echo "Modified test files: $modified_test_files"
-            go test -v -tags=all -test.v -test.run '^TestAcc' $modified_test_files
+            go test -v -tags=all -test.v -test.run '^TestAcc' $modified_test_files | tee test-results/test-report.log
+
+            go-junit-report < test-results/test-report.log > test-results/test-report.xml
           else
             echo "No modified test files detected."
           fi
@@ -82,7 +86,8 @@ jobs:
           TF_ACC: ${{ secrets.TF_ACC }}
           TF_CLI_ARGS_plan: ${{ secrets.TF_CLI_ARGS_plan }}
           TF_CLI_ARGS_apply: ${{ secrets.TF_CLI_ARGS_apply }}
-          IAAS_CLASSIC_API_KEY: ${{ secrets.IC_API_KEY }}
+          IC_API_KEY: ${{ secrets.IC_API_KEY }}
+          IAAS_CLASSIC_API_KEY: ${{ secrets.IAAS_CLASSIC_API_KEY }}
           TF_LOG: ${{vars.TF_LOG}}
           # Endpoints
           IBMCLOUD_PI_API_ENDPOINT: ${{ vars.IBMCLOUD_PI_API_ENDPOINT }} 
@@ -98,25 +103,7 @@ jobs:
           IBMCLOUD_ZONE: ${{ vars.IBMCLOUD_ZONE }}
           
 
-
-
-      # Step 7: Upload Test Results as JUnit Report (Optional Improvement)
-      - name: Upload test results
-        if: always()
-        run: |
-          # Create a directory for the test results
-          mkdir -p test-results
-
-          # Run the tests and output in JUnit format
-          go test -v -tags=all -test.v -test.run '^TestAcc' $modified_test_files | tee test-results/test-report.log
-
-          # Convert the output into JUnit XML format
-          go-junit-report < test-results/test-report.log > test-results/test-report.xml
-          
-        # Make sure the test results can be uploaded
-        continue-on-error: true  # Allow workflow to continue even if tests fail
-
-      # Step 8: Upload Test Results (JUnit)
+      # Step 7: Upload Test Results (JUnit)
       - name: Upload JUnit test results as artifact
         if: always()
         uses: actions/upload-artifact@v3