Skip to content

Commit eac16d0

Browse files
dmurphy18dmurphy18
committed
Updated tests before attempting add of Linux packages to testarea
1 parent 2b854b4 commit eac16d0

File tree

2 files changed

+21
-50
lines changed

2 files changed

+21
-50
lines changed

‎linux/svtminion.sh‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,8 @@ _set_log_level() {
425425
# for example: currently major version 3006 implies 3006.9
426426
# the latest version of Salt 3006.x
427427
#
428+
# if an unsupported version is input, for example: 3004.2, it will default to installing the latest version
429+
#
428430
# Input:
429431
# directory contains directory list of current available Salt versions, 3006.x - 3007.1
430432
#
@@ -445,27 +447,12 @@ _get_desired_salt_version_fn() {
445447
"salt-minion to install, input directory $1"
446448

447449
generic_versions_tmpdir="$1"
448-
449-
# DGM debugging
450-
ls -alh ${generic_versions_tmpdir}
451-
452450
curr_pwd=$(pwd)
453451
cd ${generic_versions_tmpdir} || return 1
454452

455-
# DGM debugging
456-
ls -alh ./.
457-
458-
dir_list=$(ls ./.)
459-
_debug_log "$0:${FUNCNAME[0]} found contents of input directory '${dir_list}'"
460-
echo "DGM dir listing, ${dir_list}"
461-
462-
# something werid is happening with tail, that does not fail in test programs
463-
# getting failures inside tail, hence using loop
464-
453+
# something werid is happening with tail, that does not fail in test programs getting failures inside tail hence use bash loop
465454
if [ "$salt_url_version" = "latest" ]; then
466455
# shellcheck disable=SC2010,SC2012
467-
# something werid is happening with tail, that does not fail in test programs
468-
# getting failures inside tail
469456
## ## _GENERIC_PKG_VERSION=$(ls ./. | grep -v 'index.html' | sort -V -u | tail -n 1)
470457
test_dir=$(ls ./. | grep -v 'index.html' | sort -V -u)
471458
for idx in $test_dir
@@ -487,6 +474,7 @@ _get_desired_salt_version_fn() {
487474

488475
elif [ "$(echo "$salt_url_version" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
489476
# Minor version Salt, want specific minor version
477+
# if old style VMTools version 3004.2-1 is used, defaults to else and install latest
490478
_GENERIC_PKG_VERSION="$salt_url_version"
491479
else
492480
# default to latest version Salt

‎tests/linux/test-linux.sh‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ pgrep -f "svtminion.sh"
3030
./svtminion.sh --status --loglevel info || { _retn=$?; if [[ ${_retn} -eq 102 ]]; then echo "test correct"; else echo "test failed, salt-minion should not be installed, returned '${_retn}'"; exit 1; fi; }
3131
ls -alh /var/log/vmware-svtminion.sh-status-*
3232
./svtminion.sh --status && { echo "test failed- expecting 102 exit code, salt-minion should not be installed"; exit 1; }
33-
34-
echo "DGM testing starts here - TBD remove once debugging is done"
35-
3633
./svtminion.sh --install master=192.168.0.5 --loglevel debug
3734
cat /etc/salt/minion
3835
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
@@ -62,6 +59,7 @@ for idx in ${list_files_to_chk_removed}; do if [[ -f "${idx}" ]]; then echo "fil
6259
./svtminion.sh --status && { echo "test failed- expecting 102 exit code, salt-minion should not be installed"; exit 1; }
6360
./svtminion.sh --version --loglevel debug
6461
ls -alh /var/log/vmware-svtminion.sh-default-*
62+
# if version not found, defaults to latest
6563
./svtminion.sh --minionversion "3004.2-1" --install master=192.168.0.6 --loglevel debug
6664
ls -alh /opt/saltstack/salt/run/
6765
cat /etc/salt/minion | grep 'master:\ 192.168.0.6' 1>/dev/null
@@ -131,39 +129,39 @@ sleep 1
131129
cat /etc/salt/minion
132130
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
133131
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
134-
# test source installs with repo.json post_3005 # DGM FIX
135-
./svtminion.sh --source ${oldpwd}/tests/testarea/test_onedir --install master=192.168.0.5 --loglevel debug
132+
./svtminion.sh --source ${oldpwd}/tests/testarea -m "3006.8" --install master=192.168.0.5 --loglevel debug
136133
./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; }
137134
sleep 1
138135
cat /etc/salt/minion
139136
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
140137
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
141138
./svtminion.sh --status --loglevel debug || { _retn=$?; if [[ ${_retn} -eq 102 ]]; then echo "test correct"; else echo "test failed, salt-minion should be installed, returned '${_retn}'"; exit 1; fi; }
142139
sleep 1
143-
./svtminion.sh --source ${oldpwd}/tests/testarea/test_onedir --install master=192.168.0.5 --loglevel debug --minionversion 3006 # DGM FIX
140+
./svtminion.sh --source ${oldpwd}/tests/testarea --install master=192.168.0.5 --loglevel debug --minionversion 3006 # DGM FIX
144141
cat /etc/salt/minion
145142
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
146143
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
147-
./svtminion.sh --source ${oldpwd}/tests/testarea/test_onedir --install master=192.168.0.5 --loglevel debug --minionversion 3006.6 # DGM FIX
144+
./svtminion.sh --source ${oldpwd}/tests/testarea --install master=192.168.0.5 --loglevel debug --minionversion 3006.9 # DGM FIX
148145
./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; }
149146
sleep 1
150147
cat /etc/salt/minion
151148
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
152149
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
153-
./svtminion.sh --source ${oldpwd}/tests/testarea/test_onedir --install master=192.168.0.5 --loglevel debug --minionversion 3007 # DGM FIX
150+
./svtminion.sh --source ${oldpwd}/tests/testarea --install master=192.168.0.5 --loglevel debug --minionversion 3007 # DGM FIX
154151
./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; }
155152
sleep 1
156153
cat /etc/salt/minion
157154
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
158-
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
159-
./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://staging.repo.saltproject.io/salt_rc/salt/py3/onedir # DGM FIX
160-
./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; }
161-
sleep 1
155+
## wait for RC with 3008
156+
## ./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
157+
## ./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://packages.broadcom.com/saltproject-generic/onedir
158+
## ./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; }
159+
## sleep 1
162160
cat /etc/salt/minion
163161
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
164162
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
165163
# test stop and start
166-
./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://staging.repo.saltproject.io/salt/py3/onedir # DGM FIX
164+
./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://packages.broadcom.com/saltproject-generic/onedir
167165
./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; }
168166
sleep 1
169167
cat /etc/salt/minion
@@ -189,55 +187,40 @@ systemctl is-active salt-minion
189187
# test 3006-3007 and upgrade
190188
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
191189
sleep 1
192-
./svtminion.sh --source ${oldpwd}/tests/testarea/test_onedir --install master=192.168.0.5 id="tup" --loglevel debug --minionversion 3006 # DGM FIX
190+
./svtminion.sh --source ${oldpwd}/tests/testarea --install master=192.168.0.5 id="tup" --loglevel debug --minionversion 3006 # DGM FIX
193191
cat /etc/salt/minion
194192
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
195193
cat /etc/salt/minion | grep 'id:\ tup' 1>/dev/null
196194
ps -ef | grep salt
197195
systemctl is-active salt-minion
198196
if [[ $(/usr/bin/salt-call --local test.version --out=pprint | awk '{print $2}' | cut -d "'" -f 2 | awk -F "." '{print $1}') -eq 3006 ]]; then echo "test correct"; else echo "test failed, wrong major version for salt-minion"; exit 1; fi
199-
./svtminion.sh --source ${oldpwd}/tests/testarea/test_onedir --upgrade --install --loglevel debug --minionversion 3007 # DGM FIX
197+
./svtminion.sh --source ${oldpwd}/tests/testarea --upgrade --install --loglevel debug --minionversion 3007 # DGM FIX
200198
cat /etc/salt/minion
201199
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
202200
cat /etc/salt/minion | grep 'id:\ tup' 1>/dev/null
203201
ps -ef | grep salt
204202
systemctl is-active salt-minion
205203
if [[ $(/usr/bin/salt-call --local test.version --out=pprint | awk '{print $2}' | cut -d "'" -f 2 | awk -F "." '{print $1}') -eq 3007 ]]; then echo "test correct"; else echo "test failed, wrong major version for salt-minion"; exit 1; fi
206-
# test source installs without repo.json
207-
cd ${oldpwd}/tests/testarea
208-
mv repo.json repo.json_hold # DGM FIX
209-
cd ${oldpwd}
210204
./svtminion.sh --source ${oldpwd}/tests/testarea --install master=192.168.0.5 --loglevel debug # DGM FIX
211205
cat /etc/salt/minion
212206
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
213207
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
214-
./svtminion.sh --install master=192.168.0.5 --loglevel debug --source file:/${oldpwd}/tests/testarea -m 3004-1 # DGM FIX
208+
./svtminion.sh --install master=192.168.0.5 --loglevel debug --source file:/${oldpwd}/tests/testarea -m 3007
215209
./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; }
216210
cat /etc/salt/minion
217211
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
218212
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
219-
./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://repo.saltproject.io/salt/vmware-tools-onedir # DGM FIX
213+
./svtminion.sh --install master=192.168.0.5 --loglevel debug --source https://packages.broadcom.com/saltproject-generic/onedir
220214
./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; }
221215
cat /etc/salt/minion
222216
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
223217
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
224-
cd ${oldpwd}/tests/testarea
225-
mv repo.json_hold repo.json
226-
cd ${oldpwd}
227-
# test source installs without repo.json for post_3005
228-
cd ${oldpwd}/tests/testarea/test_onedir # DGM FIX
229-
mv repo.json repo.json_hold # DGM FIX
230-
cd ${oldpwd}
231-
./svtminion.sh --source ${oldpwd}/tests/testarea/test_onedir --install master=192.168.0.5 --loglevel debug # DGM FIX
218+
./svtminion.sh --source ${oldpwd}/tests/testarea --install master=192.168.0.5 --loglevel debug
232219
cat /etc/salt/minion
233220
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
234221
./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; }
235222
./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
236-
# restore normal test source installs with 2 repo.json for post_3005
237-
cd ${oldpwd}/tests/testarea/test_onedir # DGM FIX
238-
mv repo.json_hold repo.json # DGM FIX
239-
cd ${oldpwd}
240-
bash -x ./svtminion.sh --install master=192.168.0.5 --loglevel debug --source file:/${oldpwd}/tests/testarea/test_onedir -m 3007.1 # DGM FIX
223+
bash -x ./svtminion.sh --install master=192.168.0.5 --loglevel debug --source file:/${oldpwd}/tests/testarea -m 3007.1 # DGM FIX
241224
cat /etc/salt/minion
242225
cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
243226
./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; }

0 commit comments

Comments
 (0)