ci: fix jmeter

.github/actions/prepare-jmeter/action.yaml

@@ -0,0 +1,49 @@
+name: 'Run jmeter'
+
+inputs:
+  version-emqx:
+    required: true
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - uses: AutoModality/action-clean@v1
+    - uses: actions/download-artifact@v3
+      with:
+        name: emqx-docker
+        path: /tmp
+    - name: load docker image
+      env:
+        PKG_VSN: ${{ inputs.version-emqx }}
+      run: |
+        EMQX_DOCKER_IMAGE_TAG=$(docker load < /tmp/emqx-docker-${PKG_VSN}.tar.gz | sed 's/Loaded image: //g')
+        echo "_EMQX_DOCKER_IMAGE_TAG=$EMQX_DOCKER_IMAGE_TAG" >> $GITHUB_ENV
+    - uses: actions/checkout@v3
+      with:
+        repository: emqx/emqx-fvt
+        ref: broker-autotest-v5
+        path: scripts
+    - uses: actions/setup-java@v3
+      with:
+        java-version: '8.0.282' # The JDK version to make available on the path.
+        java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
+        architecture: x64 # (x64 or x86) - defaults to x64
+        # https://github.com/actions/setup-java/blob/main/docs/switching-to-v2.md
+        distribution: 'zulu'
+    - uses: actions/download-artifact@v3
+      with:
+        name: apache-jmeter.tgz
+    - name: install jmeter
+      timeout-minutes: 10
+      env:
+          JMETER_VERSION: 5.4.3
+      run: |
+        tar -xf apache-jmeter.tgz
+        ln -s apache-jmeter-$JMETER_VERSION jmeter
+        echo "jmeter.save.saveservice.output_format=xml" >> jmeter/user.properties
+        echo "jmeter.save.saveservice.response_data.on_error=true" >> jmeter/user.properties
+        cd jmeter/lib/ext
+        wget --no-verbose https://raw.githubusercontent.com/xmeter-net/mqtt-jmeter/master/Download/v2.0.2/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar
+        wget --no-verbose https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar
+        wget --no-verbose https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.18/postgresql-42.2.18.jar

.github/workflows/run_docker_tests.yaml

@@ -32,6 +32,7 @@ jobs:
           - emqx-enterprise
           - emqx-elixir
     steps:
+    - uses: AutoModality/action-clean@v1
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
       with:
@@ -72,6 +73,7 @@ jobs:
           - mnesia
           - rlog
     steps:
+    - uses: AutoModality/action-clean@v1
     - uses: actions/checkout@v3
     - uses: actions/download-artifact@v3
       with:

.github/workflows/run_helm_tests.yaml

@@ -35,6 +35,7 @@ jobs:
         - emqx-enterprise
 
     steps:
+    - uses: AutoModality/action-clean@v1
     - uses: actions/checkout@v3
       with:
         path: source

.github/workflows/run_jmeter_tests.yaml

@@ -16,8 +16,9 @@ on:
 
 jobs:
   jmeter_artifact:
-    runs-on: ubuntu-22.04
+    runs-on: ${{ github.repository_owner == 'emqx' && 'aws-amd64' || 'ubuntu-22.04' }}
     steps:
+    - uses: AutoModality/action-clean@v1
     - name: Cache Jmeter
       id: cache-jmeter
       uses: actions/cache@v3
@@ -46,8 +47,6 @@ jobs:
 
   advanced_feat:
     runs-on: ${{ github.repository_owner == 'emqx' && 'aws-amd64' || 'ubuntu-22.04' }}
-    env:
-      ImageOS: ubuntu22
 
     strategy:
       fail-fast: false
@@ -60,16 +59,10 @@ jobs:
 
     needs: jmeter_artifact
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: AutoModality/action-clean@v1
+    - uses: ./.github/actions/prepare-jmeter
       with:
-        name: emqx-docker
+        version-emqx: ${{ inputs.version-emqx }}
-        path: /tmp
-    - name: load docker image
-      env:
-        PKG_VSN: ${{ inputs.version-emqx }}
-      run: |
-        EMQX_DOCKER_IMAGE_TAG=$(docker load < /tmp/emqx-docker-${PKG_VSN}.tar.gz | sed 's/Loaded image: //g')
-        echo "_EMQX_DOCKER_IMAGE_TAG=$EMQX_DOCKER_IMAGE_TAG" >> $GITHUB_ENV
     - name: docker compose up
       timeout-minutes: 5
       run: |
@@ -89,35 +82,9 @@ jobs:
         done
         docker ps -a
         echo HAPROXY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' haproxy) >> $GITHUB_ENV
-    - uses: actions/checkout@v3
-      with:
-        repository: emqx/emqx-fvt
-        ref: broker-autotest-v5
-        path: scripts
-    - uses: actions/setup-java@v3
-      with:
-        java-version: '8.0.282' # The JDK version to make available on the path.
-        java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
-        architecture: x64 # (x64 or x86) - defaults to x64
-        # https://github.com/actions/setup-java/blob/main/docs/switching-to-v2.md
-        distribution: 'zulu'
-    - uses: actions/download-artifact@v3
-      with:
-        name: apache-jmeter.tgz
-        path: /tmp
-    - name: install jmeter
-      timeout-minutes: 10
-      env:
-          JMETER_VERSION: 5.4.3
-      run: |
-        cd /tmp && tar -xvf apache-jmeter.tgz
-        echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        echo "jmeter.save.saveservice.response_data.on_error=true" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        wget --no-verbose -O /tmp/apache-jmeter-$JMETER_VERSION/lib/ext/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar https://raw.githubusercontent.com/xmeter-net/mqtt-jmeter/master/Download/v2.0.2/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar
-        ln -s /tmp/apache-jmeter-$JMETER_VERSION /opt/jmeter
     - name: run jmeter
       run: |
-        /opt/jmeter/bin/jmeter.sh \
+        jmeter/bin/jmeter.sh \
           -Jjmeter.save.saveservice.output_format=xml -n \
           -t scripts/broker-autotest-suite/${{ matrix.scripts_type }}.jmx \
           -Demqx_ip=$HAPROXY_IP \
@@ -137,8 +104,6 @@ jobs:
 
   pgsql_authn_authz:
     runs-on: ${{ github.repository_owner == 'emqx' && 'aws-amd64' || 'ubuntu-22.04' }}
-    env:
-      ImageOS: ubuntu22
 
     strategy:
       fail-fast: false
@@ -155,16 +120,10 @@ jobs:
 
     needs: jmeter_artifact
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: AutoModality/action-clean@v1
+    - uses: ./.github/actions/prepare-jmeter
       with:
-        name: emqx-docker
+        version-emqx: ${{ inputs.version-emqx }}
-        path: /tmp
-    - name: load docker image
-      env:
-        PKG_VSN: ${{ inputs.version-emqx }}
-      run: |
-        EMQX_DOCKER_IMAGE_TAG=$(docker load < /tmp/emqx-docker-${PKG_VSN}.tar.gz | sed 's/Loaded image: //g')
-        echo "_EMQX_DOCKER_IMAGE_TAG=$EMQX_DOCKER_IMAGE_TAG" >> $GITHUB_ENV
     - name: docker compose up
       timeout-minutes: 5
       env:
@@ -188,36 +147,9 @@ jobs:
         docker ps -a
         echo HAPROXY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' haproxy) >> $GITHUB_ENV
         echo PGSQL_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pgsql-tls) >> $GITHUB_ENV
-    - uses: actions/checkout@v3
-      with:
-        repository: emqx/emqx-fvt
-        ref: broker-autotest-v5
-        path: scripts
-    - uses: actions/setup-java@v3
-      with:
-        java-version: '8.0.282' # The JDK version to make available on the path.
-        java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
-        architecture: x64 # (x64 or x86) - defaults to x64
-        # https://github.com/actions/setup-java/blob/main/docs/switching-to-v2.md
-        distribution: 'zulu'
-    - uses: actions/download-artifact@v3
-      with:
-        name: apache-jmeter.tgz
-        path: /tmp
-    - name: install jmeter
-      timeout-minutes: 10
-      env:
-          JMETER_VERSION: 5.4.3
-      run: |
-        cd /tmp && tar -xvf apache-jmeter.tgz
-        echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        echo "jmeter.save.saveservice.response_data.on_error=true" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        wget --no-verbose -O /tmp/apache-jmeter-$JMETER_VERSION/lib/ext/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar https://raw.githubusercontent.com/xmeter-net/mqtt-jmeter/master/Download/v2.0.2/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar
-        wget --no-verbose -O /tmp/apache-jmeter-$JMETER_VERSION/lib/postgresql-42.2.18.jar https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.18/postgresql-42.2.18.jar
-        ln -s /tmp/apache-jmeter-$JMETER_VERSION /opt/jmeter
     - name: run jmeter
       run: |
-        /opt/jmeter/bin/jmeter.sh \
+        jmeter/bin/jmeter.sh \
           -Jjmeter.save.saveservice.output_format=xml -n \
           -t scripts/broker-autotest-suite/${{ matrix.scripts_type }}.jmx \
           -Demqx_ip=$HAPROXY_IP \
@@ -250,8 +182,6 @@ jobs:
 
   mysql_authn_authz:
     runs-on: ${{ github.repository_owner == 'emqx' && 'aws-amd64' || 'ubuntu-22.04' }}
-    env:
-      ImageOS: ubuntu22
 
     strategy:
       fail-fast: false
@@ -265,16 +195,10 @@ jobs:
 
     needs: jmeter_artifact
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: AutoModality/action-clean@v1
+    - uses: ./.github/actions/prepare-jmeter
       with:
-        name: emqx-docker
+        version-emqx: ${{ inputs.version-emqx }}
-        path: /tmp
-    - name: load docker image
-      env:
-        PKG_VSN: ${{ inputs.version-emqx }}
-      run: |
-        EMQX_DOCKER_IMAGE_TAG=$(docker load < /tmp/emqx-docker-${PKG_VSN}.tar.gz | sed 's/Loaded image: //g')
-        echo "_EMQX_DOCKER_IMAGE_TAG=$EMQX_DOCKER_IMAGE_TAG" >> $GITHUB_ENV
     - name: docker compose up
       timeout-minutes: 5
       env:
@@ -298,36 +222,9 @@ jobs:
         docker ps -a
         echo HAPROXY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' haproxy) >> $GITHUB_ENV
         echo MYSQL_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mysql-tls) >> $GITHUB_ENV
-    - uses: actions/checkout@v3
-      with:
-        repository: emqx/emqx-fvt
-        ref: broker-autotest-v5
-        path: scripts
-    - uses: actions/setup-java@v3
-      with:
-        java-version: '8.0.282' # The JDK version to make available on the path.
-        java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
-        architecture: x64 # (x64 or x86) - defaults to x64
-        # https://github.com/actions/setup-java/blob/main/docs/switching-to-v2.md
-        distribution: 'zulu'
-    - uses: actions/download-artifact@v3
-      with:
-        name: apache-jmeter.tgz
-        path: /tmp
-    - name: install jmeter
-      timeout-minutes: 10
-      env:
-          JMETER_VERSION: 5.4.3
-      run: |
-        cd /tmp && tar -xvf apache-jmeter.tgz
-        echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        echo "jmeter.save.saveservice.response_data.on_error=true" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        wget --no-verbose -O /tmp/apache-jmeter-$JMETER_VERSION/lib/ext/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar https://raw.githubusercontent.com/xmeter-net/mqtt-jmeter/master/Download/v2.0.2/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar
-        wget --no-verbose -O /tmp/apache-jmeter-$JMETER_VERSION/lib/mysql-connector-java-8.0.16.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar
-        ln -s /tmp/apache-jmeter-$JMETER_VERSION /opt/jmeter
     - name: run jmeter
       run: |
-        /opt/jmeter/bin/jmeter.sh \
+        jmeter/bin/jmeter.sh \
           -Jjmeter.save.saveservice.output_format=xml -n \
           -t scripts/broker-autotest-suite/${{ matrix.scripts_type }}.jmx \
           -Demqx_ip=$HAPROXY_IP \
@@ -356,8 +253,6 @@ jobs:
 
   JWT_authn:
     runs-on: ${{ github.repository_owner == 'emqx' && 'aws-amd64' || 'ubuntu-22.04' }}
-    env:
-      ImageOS: ubuntu22
 
     strategy:
       fail-fast: false
@@ -367,16 +262,10 @@ jobs:
 
     needs: jmeter_artifact
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: AutoModality/action-clean@v1
+    - uses: ./.github/actions/prepare-jmeter
       with:
-        name: emqx-docker
+        version-emqx: ${{ inputs.version-emqx }}
-        path: /tmp
-    - name: load docker image
-      env:
-        PKG_VSN: ${{ inputs.version-emqx }}
-      run: |
-        EMQX_DOCKER_IMAGE_TAG=$(docker load < /tmp/emqx-docker-${PKG_VSN}.tar.gz | sed 's/Loaded image: //g')
-        echo "_EMQX_DOCKER_IMAGE_TAG=$EMQX_DOCKER_IMAGE_TAG" >> $GITHUB_ENV
     - name: docker compose up
       timeout-minutes: 5
       run: |
@@ -396,11 +285,6 @@ jobs:
         done
         docker ps -a
         echo HAPROXY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' haproxy) >> $GITHUB_ENV
-    - uses: actions/checkout@v3
-      with:
-        repository: emqx/emqx-fvt
-        ref: broker-autotest-v5
-        path: scripts
     - name: run jwks_server
       timeout-minutes: 10
       run: |
@@ -409,27 +293,6 @@ jobs:
         cd target
         docker run --name jwks_server --network emqx_bridge --ip 172.100.239.88 -d -v $(pwd)/jwkserver-0.0.1.jar:/jwks_server/jwkserver-0.0.1.jar --workdir /jwks_server openjdk:8-jdk bash \
         -c "java -jar jwkserver-0.0.1.jar"
-    - uses: actions/setup-java@v3
-      with:
-        java-version: '8.0.282' # The JDK version to make available on the path.
-        java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
-        architecture: x64 # (x64 or x86) - defaults to x64
-        # https://github.com/actions/setup-java/blob/main/docs/switching-to-v2.md
-        distribution: 'zulu'
-    - uses: actions/download-artifact@v3
-      with:
-        name: apache-jmeter.tgz
-        path: /tmp
-    - name: install jmeter
-      timeout-minutes: 10
-      env:
-          JMETER_VERSION: 5.4.3
-      run: |
-        cd /tmp && tar -xvf apache-jmeter.tgz
-        echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        echo "jmeter.save.saveservice.response_data.on_error=true" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        wget --no-verbose -O /tmp/apache-jmeter-$JMETER_VERSION/lib/ext/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar https://raw.githubusercontent.com/xmeter-net/mqtt-jmeter/master/Download/v2.0.2/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar
-        ln -s /tmp/apache-jmeter-$JMETER_VERSION /opt/jmeter
     - name: run jmeter
       run: |
         /opt/jmeter/bin/jmeter.sh \
@@ -453,8 +316,6 @@ jobs:
 
   built_in_database_authn_authz:
     runs-on: ${{ github.repository_owner == 'emqx' && 'aws-amd64' || 'ubuntu-22.04' }}
-    env:
-      ImageOS: ubuntu22
 
     strategy:
       fail-fast: false
@@ -465,16 +326,10 @@ jobs:
 
     needs: jmeter_artifact
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: AutoModality/action-clean@v1
+    - uses: ./.github/actions/prepare-jmeter
       with:
-        name: emqx-docker
+        version-emqx: ${{ inputs.version-emqx }}
-        path: /tmp
-    - name: load docker image
-      env:
-        PKG_VSN: ${{ inputs.version-emqx }}
-      run: |
-        EMQX_DOCKER_IMAGE_TAG=$(docker load < /tmp/emqx-docker-${PKG_VSN}.tar.gz | sed 's/Loaded image: //g')
-        echo "_EMQX_DOCKER_IMAGE_TAG=$EMQX_DOCKER_IMAGE_TAG" >> $GITHUB_ENV
     - name: docker compose up
       timeout-minutes: 5
       run: |
@@ -494,44 +349,17 @@ jobs:
         done
         docker ps -a
         echo HAPROXY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' haproxy) >> $GITHUB_ENV
-    - uses: actions/checkout@v3
-      with:
-        repository: emqx/emqx-fvt
-        ref: broker-autotest-v5
-        path: scripts
-    - uses: actions/setup-java@v3
-      with:
-        java-version: '8.0.282' # The JDK version to make available on the path.
-        java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
-        architecture: x64 # (x64 or x86) - defaults to x64
-        # https://github.com/actions/setup-java/blob/main/docs/switching-to-v2.md
-        distribution: 'zulu'
-    - uses: actions/download-artifact@v3
-      with:
-        name: apache-jmeter.tgz
-        path: /tmp
-    - name: install jmeter
-      timeout-minutes: 10
-      env:
-          JMETER_VERSION: 5.4.3
-      run: |
-        cd /tmp && tar -xvf apache-jmeter.tgz
-        echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        echo "jmeter.save.saveservice.response_data.on_error=true" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
-        wget --no-verbose -O /tmp/apache-jmeter-$JMETER_VERSION/lib/ext/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar https://raw.githubusercontent.com/xmeter-net/mqtt-jmeter/master/Download/v2.0.2/mqtt-xmeter-fuse-2.0.2-jar-with-dependencies.jar
-        wget --no-verbose -O /tmp/apache-jmeter-$JMETER_VERSION/lib/mysql-connector-java-8.0.16.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar
-        ln -s /tmp/apache-jmeter-$JMETER_VERSION /opt/jmeter
     - name: run jmeter
       run: |
         /opt/jmeter/bin/jmeter.sh \
           -Jjmeter.save.saveservice.output_format=xml -n \
           -t scripts/broker-autotest-suite/${{ matrix.scripts_type }}.jmx \
           -Demqx_ip=$HAPROXY_IP \
-          -l jmeter_logs/${{ matrix.scripts_type }}_${{ matrix.mysql_tag }}.jtl \
+          -l jmeter_logs/${{ matrix.scripts_type }}.jtl \
-          -j jmeter_logs/logs/${{ matrix.scripts_type }}_${{ matrix.mysql_tag }}.log
+          -j jmeter_logs/logs/${{ matrix.scripts_type }}.log
     - name: check logs
       run: |
-        if cat jmeter_logs/${{ matrix.scripts_type }}_${{ matrix.mysql_tag }}.jtl | grep -e '<failure>true</failure>' > /dev/null 2>&1; then
+        if cat jmeter_logs/${{ matrix.scripts_type }}.jtl | grep -e '<failure>true</failure>' > /dev/null 2>&1; then
           echo "check logs failed"
           exit 1
         fi