travis.yml: rearrange/sort by name/type and remove duplicates

Also fixes regression from rebase

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

.travis.yml

@@ -32,6 +32,7 @@ env:
   global:
      - PATH=$HOME/.local/bin:$PATH
   matrix:
+    # Keep the TESTS sorted by name and grouped by type
     - TESTS="smoke/test_accounts
              smoke/test_affinity_groups
              smoke/test_affinity_groups_projects
@@ -108,29 +109,21 @@ env:
              component/test_acl_listsnapshot
              component/test_acl_listvm
              component/test_acl_listvolume
-             component/test_acl_sharednetwork
-             component/test_affinity_groups_projects"
+             component/test_acl_sharednetwork"
 
     - TESTS="component/test_allocation_states
              component/test_acl_sharednetwork_deployVM-impersonation
              component/test_affinity_groups_projects
              component/test_cpu_domain_limits
              component/test_cpu_limits"
 
-    - TESTS="component/test_acl_sharednetwork_deployVM-impersonation
-             component/test_affinity_groups_projects
-             component/test_allocation_states"
-
-    - TESTS="component/test_cpu_domain_limits"
-
     - TESTS="component/test_cpu_max_limits
              component/test_acl_isolatednetwork
              component/test_cpu_project_limits
              component/test_deploy_vm_userdata_multi_nic
              component/test_egress_fw_rules
              component/test_invalid_gw_nm
              component/test_ip_reservation
-             component/test_acl_isolatednetwork
              component/test_lb_secondary_ip"
 
     - TESTS="component/test_memory_limits
@@ -150,7 +143,7 @@ env:
              component/test_snapshots
              component/test_stopped_vm"
 
-    - TESTS="component/test_project_resources"
+    - TESTS="component/test_resource_limits"
 
     - TESTS="component/test_tags
              component/test_templates

test/integration/component/test_host_ha.py

@@ -281,9 +281,19 @@ def disconnectHostfromNetwork(self, hostIp, timeout):
         ssh = SshClient(hostIp, 22, self.hostConfig["username"],
                     self.hostConfig["password"])
         ssh.scp(srcFile, "/root/test_host_ha.sh")
-        ssh.execute("nohup sh /root/test_host_ha.sh -t %s -d agent > /dev/null 2>&1 &\n" % timeout)
+        ssh.execute("nohup sh /root/test_host_ha.sh -t %s -d all > /dev/null 2>&1 &\n" % timeout)
         return
 
+    def stopAgentOnHost(self, hostIp, timeout):
+        srcFile = os.path.dirname(os.path.realpath(__file__)) + "/test_host_ha.sh"
+        if not(os.path.isfile(srcFile)):
+            self.logger.debug("File %s not found" % srcFile)
+            raise unittest.SkipTest("Script file %s required for HA not found" % srcFile)
+
+        ssh = SshClient(hostIp, 22, self.hostConfig["username"], self.hostConfig["password"])
+        ssh.scp(srcFile, "/root/test_host_ha.sh")
+        ssh.execute("nohup sh /root/test_host_ha.sh -t %s -d agent > /dev/null 2>&1 &\n" % timeout)
+        return
 
     @attr(
         tags=[