ci: more fixes

.github/workflows/_pr_entrypoint.yaml

@@ -154,6 +154,7 @@ jobs:
     uses: ./.github/workflows/run_docker_tests.yaml
     with:
       version-emqx: ${{ needs.sanity-checks.outputs.version-emqx }}
+      version-emqx-enterprise: ${{ needs.sanity-checks.outputs.version-emqx-enterprise }}
 
   run_helm_tests:
     needs:
@@ -162,3 +163,4 @@ jobs:
     uses: ./.github/workflows/run_helm_tests.yaml
     with:
       version-emqx: ${{ needs.sanity-checks.outputs.version-emqx }}
+      version-emqx-enterprise: ${{ needs.sanity-checks.outputs.version-emqx-enterprise }}

.github/workflows/run_docker_tests.yaml

@@ -10,6 +10,9 @@ on:
       version-emqx:
         required: true
         type: string
+      version-emqx-enterprise:
+        required: true
+        type: string
 
 # on:
 #   push:
@@ -21,12 +24,8 @@ on:
 #   pull_request:
 
 jobs:
-  main:
+  basic-tests:
     runs-on: ${{ github.repository_owner == 'emqx' && 'aws-amd64' || 'ubuntu-22.04' }}
-    env:
-      EMQX_NAME: ${{ matrix.profile[0] }}
-      PKG_VSN: ${{ matrix.profile[0] == 'emqx-enterprise' && inputs.version-emqx-enterprise || inputs.version-emqx }}
-      EMQX_IMAGE_OLD_VERSION_TAG: emqx/${{ matrix.profile[0] }}:${{ matrix.profile[1] }}
 
     strategy:
       fail-fast: false
@@ -36,8 +35,12 @@ jobs:
           - ["emqx-elixir", "5.0.16"]
           - ["emqx-enterprise", "5.0.1"]
 
+    env:
+      EMQX_NAME: ${{ matrix.profile[0] }}
+      PKG_VSN: ${{ matrix.profile[0] == 'emqx-enterprise' && inputs.version-emqx-enterprise || inputs.version-emqx }}
+      EMQX_IMAGE_OLD_VERSION_TAG: emqx/${{ matrix.profile[0] }}:${{ matrix.profile[1] }}
+
     steps:
-    - uses: AutoModality/action-clean@v1
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
         with:

.github/workflows/run_helm_tests.yaml

@@ -10,6 +10,9 @@ on:
       version-emqx:
         required: true
         type: string
+      version-emqx-enterprise:
+        required: true
+        type: string
 
 # on:
 #   push: