Merge "Introduce SALT_VERSION var"
diff --git a/tcp_tests/managers/backup_restore_manager.py b/tcp_tests/managers/backup_restore_manager.py
index 4665eb8..d42c14e 100644
--- a/tcp_tests/managers/backup_restore_manager.py
+++ b/tcp_tests/managers/backup_restore_manager.py
@@ -187,3 +187,13 @@
'openstack image save {} --file test'.format(uuid))
step = {'cmd': cmd, 'node_name': self.get_node_name(tgt)}
self.execute_command(step, 'Save image after backup')
+
+ def create_cirros(self, tgt='ctl03'):
+ cmd = ('wget http://download.cirros-cloud.'
+ 'net/0.3.4/cirros-0.3.4-i386-disk.img; . '
+ '/root/keystonercv3; glance --timeout 120 '
+ 'image-create --name cirros --visibility '
+ 'public --disk-format qcow2 --container-format '
+ 'bare --progress < /root/cirros-0.3.4-i386-disk.img')
+ step = {'cmd': cmd, 'node_name': self.get_node_name(tgt)}
+ self.execute_command(step, 'Create image before run')
diff --git a/tcp_tests/tests/system/test_backup_restore.py b/tcp_tests/tests/system/test_backup_restore.py
index d32f71c..b99f408 100644
--- a/tcp_tests/tests/system/test_backup_restore.py
+++ b/tcp_tests/tests/system/test_backup_restore.py
@@ -11,6 +11,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
+import pytest
from tcp_tests import logger
from tcp_tests.managers import backup_restore_manager
@@ -21,6 +22,9 @@
class TestBackupRestoreMaster(object):
"""Test class for testing backup restore of master node"""
+ @pytest.mark.grab_versions
+ @pytest.mark.fail_snapshot
+ @pytest.mark.backup_all
def test_backup_cfg_backupninja_rsync(
self, underlay, config, openstack_deployed,
salt_actions, show_step):
@@ -74,7 +78,9 @@
class TestBackupVCP(object):
"""Test class for testing backup restore of VCP nodes"""
-
+ @pytest.mark.grab_versions
+ @pytest.mark.fail_snapshot
+ @pytest.mark.backup_all
def test_backup_restore_glance_images(
self, underlay, config, openstack_deployed,
salt_actions, show_step):
@@ -97,7 +103,7 @@
show_step(1)
show_step(2)
show_step(3)
-
+ backup.create_cirros()
# STEP #4
show_step(4)
backup.copy_glance_images_to_backup(