Use 1.3.1 in ops user upgrade test

[jzt]

This change uses 1.3.1 as the base VCH version from which to upgrade in the 5-25-OPS-User-Grant granted ops-user perms work after upgrade test. 1.3.0 would fail to create a VCH because of a bug that was fixed in 1.3.1.

Fixes #7796.

[skip ci]

[AngieCris]

do we want to make Cleanup VIC Appliance On Test Server a teardown or run if test failed? I noticed when it failed before cleaning up, no container logs were collected because collecting logs is part of the cleanup process

[jzt]

Is it not covered at the top by Test Teardown Run Keyword If Test Failed Gather vSphere Logs

[AngieCris]

that only gathers vSphere logs but not container logs and appliance tether debug log i think

[AngieCris]

in recent nightlies we saw failures in step Run privilege-dependent docker operations too, portlayer cannot wait for process launch status
but since cleanup keyword is never run, we don't have any container logs collected and it's hard to diagnose

[jzt]

Good call, I added [Teardown] for all Cleanup VIC Appliance On Test Server calls in this suite.

[AngieCris]

one thing I'm not very sure about: does this teardown overwrite the global teardown Run Keyword If Test Failed Gather vSphere Logs?
For example if the test failed, does it run Cleanup VIC Appliance On Test Server first and then Gather vSphere Logs? Or it only runs Cleanup VIC Appliance On Test Server because that's how we defined it

[jzt]

It would override, but since we don't really need the vsphere logs from these tests, we can get rid of the global teardown.

[mhagen-vmware]

lgtm