diff --git a/py-scripts/regression_test.sh b/py-scripts/regression_test.sh index 31e6a4d6..01dbe211 100755 --- a/py-scripts/regression_test.sh +++ b/py-scripts/regression_test.sh @@ -77,7 +77,11 @@ if [[ ${#MGR} -eq 0 ]]; then # Allow the user to change the radio they test agai MGR="localhost" fi -PYTHON_VERSION=$(python -c 'import sys; print(sys.version)') +PYTHON_VERSION=$(python3 -c 'import sys; print(sys.version)') + +BuildVersion=$(wget $MGR:8080 -q -O - jq '.VersionInfo.BuildVersion') +BuildDate=$(wget $MGR:8080 -q -O - jq '.VersionInfo.BuildDate') +OS_Version=$(echo /etc/os-release | grep 'VERSION') #SCENARIO_CHECK="$(python3 -c "import requests; print(requests.get('http://${MGR}:8080/events/').status_code)")" #if [[ ${SCENARIO_CHECK} -eq 200 ]]; then @@ -644,9 +648,7 @@ td.testname { fname="${HOMEPATH}/html-reports/regression_file-${NOW}.html" echo "$header" >> "$fname" echo "${results[@]}" >> "$fname" - LANFORGE_DATA=$(python -c 'import lanforge_scripts - lfcli=lanforge_scripts.LFCliBase(\"192.168.92.12\",8080) - response=lfcli.json_get(\"/\")') + LANFORGE_DATA=$(python -c 'import lanforge_scripts; lfcli=lanforge_scripts.LFCliBase(\"192.168.92.12\",8080); response=lfcli.json_get(\"/\")') echo "
@@ -657,11 +659,13 @@ td.testname { Python version LANforge version LANforge build date + OS Version ${PYTHON_VERSION} - - + ${BuildVersion} + ${BuildDate} + ${OS_Version} " >> "$fname" echo "$tail" >> "$fname"