Modify tests.yaml which specifies bundletester config params

with the following key:value pairs:

- reset_timeout: 600

Also remove additional tests.yaml from ./src/

Change-Id: I52157b13b1ce6871f672de56266e5d15405eb599

src/tests.yaml

@@ -1,17 +0,0 @@
-# Bootstrap the model if necessary.
-bootstrap: True
-# Re-use bootstrap node.
-reset: True
-# Use tox/requirements to drive the venv instead of bundletester's venv feature.
-virtualenv: False
-# Leave makefile empty, otherwise unit/lint tests will rerun ahead of amulet.
-makefile: []
-# Do not specify juju PPA sources.  Juju is presumed to be pre-installed
-# and configured in all test runner environments.
-#sources:
-# Do not specify or rely on system packages.
-#packages:
-# Do not specify python packages here.  Use test-requirements.txt
-# and tox instead.  ie. The venv is constructed before bundletester
-# is invoked.
-#python-packages:

src/tests/tests.yaml

@@ -15,3 +15,4 @@ makefile: []
 # and tox instead.  ie. The venv is constructed before bundletester
 # is invoked.
 #python-packages:
+reset_timeout: 600