From 0e9b608737c8834bb5a9b19a8a31119133f1041b Mon Sep 17 00:00:00 2001
From: xiangfangyang-tech <xfypp@sina.com>
Date: Fri, 17 Dec 2021 10:33:33 +0800
Subject: [PATCH] chore(autotest): improve pgsql script and change file path in
 emqx-fvt warehouse

---
 .github/workflows/run_automate_tests.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/run_automate_tests.yaml b/.github/workflows/run_automate_tests.yaml
index fb213c713..7f81b5f3a 100644
--- a/.github/workflows/run_automate_tests.yaml
+++ b/.github/workflows/run_automate_tests.yaml
@@ -96,7 +96,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         repository: emqx/emqx-fvt
-        ref: v1.4.0
+        ref: v1.6.0
         path: scripts
     - uses: actions/setup-java@v1
       with:
@@ -118,7 +118,7 @@ jobs:
       run: |
         /opt/jmeter/bin/jmeter.sh \
           -Jjmeter.save.saveservice.output_format=xml -n \
-          -t scripts/.ci/automate-test-suite/${{ matrix.webhook_type }}.jmx \
+          -t scripts/automate-test-suite/${{ matrix.webhook_type }}.jmx \
           -Demqx_ip=$HAPROXY_IP \
           -Dweb_ip=$WEB_IP \
           -l jmeter_logs/webhook_${{ matrix.webhook_type }}.jtl \
@@ -189,7 +189,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         repository: emqx/emqx-fvt
-        ref: v1.4.0
+        ref: v1.6.0
         path: scripts
     - uses: actions/setup-java@v1
       with:
@@ -214,7 +214,7 @@ jobs:
       run: |
         /opt/jmeter/bin/jmeter.sh \
           -Jjmeter.save.saveservice.output_format=xml -n \
-          -t scripts/.ci/automate-test-suite/${{ matrix.mysql_type }}.jmx \
+          -t scripts/automate-test-suite/${{ matrix.mysql_type }}.jmx \
           -Droute="apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE_data" \
           -Dmysql_ip=$MYSQL_IP \
           -Demqx_ip=$HAPROXY_IP \
@@ -293,7 +293,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         repository: emqx/emqx-fvt
-        ref: v1.4.0
+        ref: v1.6.0
         path: scripts
     - uses: actions/setup-java@v1
       with:
@@ -318,7 +318,7 @@ jobs:
       run: |
         sudo /opt/jmeter/bin/jmeter.sh \
           -Jjmeter.save.saveservice.output_format=xml -n \
-          -t scripts/.ci/automate-test-suite/${{ matrix.pgsql_type }}.jmx \
+          -t scripts/automate-test-suite/${{ matrix.pgsql_type }}.jmx \
           -Droute="apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE_data" \
           -Dca_name="ca.pem" \
           -Dkey_name="client-key.pem" \
@@ -391,7 +391,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         repository: emqx/emqx-fvt
-        ref: v1.4.0
+        ref: v1.6.0
         path: scripts
     - uses: actions/setup-java@v1
       with:
@@ -416,7 +416,7 @@ jobs:
       run: |
         sudo /opt/jmeter/bin/jmeter.sh \
           -Jjmeter.save.saveservice.output_format=xml -n \
-          -t scripts/.ci/automate-test-suite/http_auth_acl.jmx \
+          -t scripts/automate-test-suite/http_auth_acl.jmx \
           -Dmysql_ip=$MYSQL_IP \
           -Demqx_ip=$HAPROXY_IP \
           -Dweb_server_ip=$HTTP_IP \