ci: improves e2e test

Author: xiaozhu36

.github/workflows/e2e.yml

@@ -8,7 +8,8 @@ on:
       - 'quickstarts/**'
 
 jobs:
-  e2e-check:
+  e2e-check
+    if: github.event.review.state == 'approved' || github.event.review.body == 'approved'
     runs-on: terraform-alicloud-landing
     environment:
       name: acctests
@@ -27,30 +28,5 @@ jobs:
       - name: test pr
         run: |
           bash scripts/terraform-install.sh
-          echo "cat ~/.aliyun/config.json"
-          cat ~/.aliyun/config.json
-          echo "aaa: $ALICLOUD_ACCESS"
-          echo $ALICLOUD_ACCESS
-          export ALICLOUD_PROFILE=${{ secrets.PROFILENAME }}
-          folders="${{ steps.changed-files.outputs.all_changed_files }}"
-          for f in ${folders//,/ }
-          do
-            f=$(echo $f | xargs echo -n)
-            echo "===> Terraform testing in" $f
-            terraform -chdir=$f init -upgrade
-            cp scripts/plan.tftest.hcl $f/
-            terraform -chdir=$f test test -verbose
-            if [[ $? -ne 0 ]]; then
-              echo -e "\033[31m[ERROR]\033[0m: running terraform test for plan failed."
-              #exit 1
-            else
-              rm -rf scripts/plan.tftest.hcl
-              cp scripts/apply.tftest.hcl $f/
-              terraform -chdir=$f test test
-              if [[ $? -ne 0 ]]; then
-                echo -e "\033[31m[ERROR]\033[0m: running terraform test for apply failed."
-                #exit 1
-              fi
-              rm -rf scripts/apply.tftest.hcl
-            fi
-          done
+          CHANGED_FOLDERS="${{ steps.changed-files.outputs.all_changed_files }}"
+          bash scripts/terraform-validate.sh ${CHANGED_FOLDERS}

scripts/terraform-test.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+error=false
+
+success=true
+folders=$1
+for f in ${folders//,/ }
+do
+  f=$(echo $f | xargs echo -n)
+  echo "===> Terraform testing in" $f
+  terraform -chdir=$f init -upgrade
+  source ~/.terraform_profile
+  cp scripts/plan.tftest.hcl $f/
+  terraform -chdir=$f test test -verbose
+  if [[ $? -ne 0 ]]; then
+    success=false
+    echo -e "\033[31m[ERROR]\033[0m: running terraform test for plan failed."
+  else
+    rm -rf scripts/plan.tftest.hcl
+    cp scripts/apply.tftest.hcl $f/
+    terraform -chdir=$f test test
+    if [[ $? -ne 0 ]]; then
+      success=false
+      echo -e "\033[31m[ERROR]\033[0m: running terraform test for apply failed."
+    fi
+    rm -rf scripts/apply.tftest.hcl
+  fi
+done
+
+if [[ $success ]]; then
+  exit 1
+fi
+exit 0