add a test that use the deploy scripts from models
diff --git a/README.md b/README.md
index 05324f9..caa78a6 100644
--- a/README.md
+++ b/README.md
@@ -40,10 +40,8 @@
export ENV_NAME=tcpcloud-mk22 # You can set any env name
-export LAB_CONFIG_NAME=mk22-lab-basic # Prefix for names of the templates.
- # Currently there are two template sets:
- # mk22-lab-basic
- # mk22-lab-advanced
+export LAB_CONFIG_NAME=mk22-lab-basic # mk22-lab-basic or mk22-lab-advanced
+
Run deploy test
---------------
@@ -52,6 +50,12 @@
py.test -vvv -s -k test_tcp_install_default
+, or as an alternative there is another test that use deploy scripts from models repository written on bash [1]:
+
+py.test -vvv -s -k test_tcp_install_with_scripts
+
+[1] https://github.com/Mirantis/mk-lab-salt-model/tree/dash/scripts
+
Create and start the env for manual tests
-----------------------------------------
diff --git a/tcp_tests/tests/system/test_tcp_install.py b/tcp_tests/tests/system/test_tcp_install.py
index cf40b3c..dcb31d6 100644
--- a/tcp_tests/tests/system/test_tcp_install.py
+++ b/tcp_tests/tests/system/test_tcp_install.py
@@ -58,3 +58,32 @@
fail_msg = 'Tempest verification fails {}'.format(res)
assert res['failures'] == 0, fail_msg
+
+ @pytest.mark.revert_snapshot(ext.SNAPSHOT.salt_deployed)
+ # @pytest.mark.snapshot_needed
+ # @pytest.mark.fail_snapshot
+ def test_tcp_install_with_scripts(self, config, underlay, salt_deployed,
+ show_step, rally):
+ """Test for deploying an tcp environment with scripts and check it
+
+ Scenario:
+ 1. Prepare salt on hosts
+ 2. Setup controller nodes
+ 3. Setup compute nodes
+
+ """
+
+ cmd = 'cd /srv/salt/reclass/scripts/; ./bootstrap_all.sh'
+ underlay.check_call(cmd, host=config.salt.salt_master_host, verbose=True)
+
+ # prepare rally
+ rally.prepare()
+ rally.pull_image()
+ rally.run()
+ # run tempest
+ rally.run_tempest()
+
+ res = rally.get_results()
+
+ fail_msg = 'Tempest verification fails {}'.format(res)
+ assert res['failures'] == 0, fail_msg