Sfoglia il codice sorgente

Merge pull request #7765 from thalesmg/node-dump-license-info

feat(node_dump): add license info to node_dump
Thales Macedo Garitezi 3 anni fa
parent
commit
e59bea03ad
2 ha cambiato i file con 12 aggiunte e 1 eliminazioni
  1. 4 0
      .github/workflows/run_fvt_tests.yaml
  2. 8 1
      bin/node_dump

+ 4 - 0
.github/workflows/run_fvt_tests.yaml

@@ -114,6 +114,10 @@ jobs:
           echo "DUMP_CONTAINER_LOGS_END"
           exit 1
         fi
+    # simple smoke test for node_dump
+    - name: test node_dump
+      run: |
+        docker exec node1.emqx.io node_dump
 
   helm_test:
     runs-on: ubuntu-20.04

+ 8 - 1
bin/node_dump

@@ -12,6 +12,7 @@ cd "${RUNNER_ROOT_DIR}"
 
 DUMP="$RUNNER_LOG_DIR/node_dump_$(date +"%Y%m%d_%H%M%S").tar.gz"
 CONF_DUMP="$RUNNER_LOG_DIR/conf.dump"
+LICENSE_INFO="$RUNNER_LOG_DIR/license_info.txt"
 SYSINFO="$RUNNER_LOG_DIR/sysinfo.txt"
 
 LOG_MAX_AGE_DAYS=3
@@ -66,15 +67,21 @@ done
     collect "$RUNNER_BIN_DIR"/emqx eval-erl "'emqx_node_dump:app_env_dump()'"
 } > "${CONF_DUMP}"
 
+# Collect license info:
+{
+    collect "$RUNNER_BIN_DIR"/emqx_ctl license info
+} > "${LICENSE_INFO}"
+
 # Pack files
 {
     find "$RUNNER_LOG_DIR" -mtime -"${LOG_MAX_AGE_DAYS}" \( -name '*.log.*' -or -name 'run_erl.log*' \)
     echo "${SYSINFO}"
     echo "${CONF_DUMP}"
+    echo "${LICENSE_INFO}"
 } | tar czf "${DUMP}" -T -
 
 ## Cleanup:
-rm "${SYSINFO}"
+rm "${SYSINFO}" "${LICENSE_INFO}"
 #rm "${CONF_DUMP}" # Keep it for inspection
 
 echo "Created a node dump ${DUMP}"