diff --git a/linux/svtminion.sh b/linux/svtminion.sh index b490bc1..c705de9 100755 --- a/linux/svtminion.sh +++ b/linux/svtminion.sh @@ -447,10 +447,6 @@ _get_desired_salt_version_fn() { "salt-minion to install, input directory $1" generic_versions_tmpdir="$1" - - echo "DGM _get_desired_salt_version_fn generic_versions_tmpdir listing" - ls -alh "${generic_versions_tmpdir}" - curr_pwd=$(pwd) cd ${generic_versions_tmpdir} || return 1 @@ -1187,13 +1183,6 @@ _fetch_salt_minion() { wget -r -np -nH --exclude-directories=windows,relenv,macos -x -l 1 "${base_url}/" cd ${curr_pwd} || return 1 - echo "DGM _ifetch_salt_minon generic_versions_tmpdir listing" - ls -alh "${generic_versions_tmpdir}" - - ls -alh "${generic_versions_tmpdir}/artifactory/saltproject-generic" - - ls -alh "${generic_versions_tmpdir}/artifactory/saltproject-generic/onedir" - # get desired specific version of Salt _get_desired_salt_version_fn "${generic_versions_tmpdir}/artifactory/saltproject-generic/onedir" diff --git a/tests/linux/test-linux.sh b/tests/linux/test-linux.sh index 8fa306c..5ef2a1c 100755 --- a/tests/linux/test-linux.sh +++ b/tests/linux/test-linux.sh @@ -146,14 +146,14 @@ cat /etc/salt/minion cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null ## wait for RC with 3008 ## ./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; } -## ./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://packages.broadcom.com/saltproject-generic/onedir +## ./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://packages.broadcom.com/artifactory/saltproject-generic/onedir ## ./svtminion.sh --status --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 100 ]]; then echo "test correct"; else echo "test failed, salt-minion should be installed, returned '${_retn}'"; exit 1; fi; } ## sleep 1 cat /etc/salt/minion cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null ./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; } # test stop and start -./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://packages.broadcom.com/saltproject-generic/onedir +./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://packages.broadcom.com/artifactory/saltproject-generic/onedir ./svtminion.sh --status --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 100 ]]; then echo "test correct"; else echo "test failed, salt-minion should be installed, returned '${_retn}'"; exit 1; fi; } sleep 1 cat /etc/salt/minion @@ -202,7 +202,7 @@ cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null cat /etc/salt/minion cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null ./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; } -./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://packages.broadcom.com/saltproject-generic/onedir +./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://packages.broadcom.com/artifactory/saltproject-generic/onedir ./svtminion.sh --status --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 100 ]]; then echo "test correct"; else echo "test failed, salt-minion should be installed, returned '${_retn}'"; exit 1; fi; } cat /etc/salt/minion cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null