fix compatibility with distro using python3 to run agent and do some minor fix
This commit is contained in:
Родитель
9b995b7bb9
Коммит
f2c2b09b9e
|
@ -2290,7 +2290,7 @@ Function DoTestCleanUp($result, $testName, $DeployedServices, $ResourceGroups, [
|
|||
LogMsg "Cleaning up deployed test virtual machines."
|
||||
$isClened = DeleteResourceGroup -RGName $group
|
||||
|
||||
if ($isClened)
|
||||
if (!$isClened)
|
||||
{
|
||||
LogMsg "CleanUP unsuccessful for $group.. Please delete the services manually."
|
||||
}
|
||||
|
|
|
@ -33,4 +33,8 @@ def RunTest(command):
|
|||
if(distro == "COREOS"):
|
||||
RunTest("waagent --version")
|
||||
else:
|
||||
RunTest("/usr/sbin/waagent --version")
|
||||
output = Run("ps aux | grep waagent | grep python | grep -v 'ps aux | grep waagent | grep python'")
|
||||
if ("python3" in output) :
|
||||
RunTest("/usr/bin/python3 /usr/sbin/waagent --version")
|
||||
else :
|
||||
RunTest("/usr/sbin/waagent --version")
|
Загрузка…
Ссылка в новой задаче