summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dovetail/compliance/proposed_tests.yml60
-rw-r--r--dovetail/conf/dovetail_config.yml4
-rw-r--r--dovetail/container.py4
-rw-r--r--dovetail/testcase/smoke.tc002.yml9
4 files changed, 21 insertions, 56 deletions
diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml
index 672d9fb0..594abf49 100644
--- a/dovetail/compliance/proposed_tests.yml
+++ b/dovetail/compliance/proposed_tests.yml
@@ -2,59 +2,7 @@
proposed_tests:
name: proposed_tests
testcases_list:
- # mandatory test cases
- # osinterop
- - dovetail.osinterop.tc001
- # vping
- - dovetail.vping.tc001
- - dovetail.vping.tc002
- # HA
- - dovetail.ha.tc001
- - dovetail.ha.tc002
- - dovetail.ha.tc003
- - dovetail.ha.tc004
- - dovetail.ha.tc005
- - dovetail.ha.tc006
- - dovetail.ha.tc007
- - dovetail.ha.tc008
- # optional test cases
- # ipv6
- - dovetail.ipv6.tc001
- - dovetail.ipv6.tc002
- - dovetail.ipv6.tc003
- - dovetail.ipv6.tc004
- - dovetail.ipv6.tc005
- - dovetail.ipv6.tc006
- - dovetail.ipv6.tc007
- - dovetail.ipv6.tc008
- - dovetail.ipv6.tc009
- - dovetail.ipv6.tc010
- - dovetail.ipv6.tc011
- - dovetail.ipv6.tc012
- - dovetail.ipv6.tc013
- - dovetail.ipv6.tc014
- - dovetail.ipv6.tc015
- - dovetail.ipv6.tc016
- - dovetail.ipv6.tc017
- - dovetail.ipv6.tc018
- - dovetail.ipv6.tc019
- - dovetail.ipv6.tc020
- - dovetail.ipv6.tc021
- - dovetail.ipv6.tc022
- - dovetail.ipv6.tc023
- - dovetail.ipv6.tc024
- - dovetail.ipv6.tc025
- # tempest
- - dovetail.tempest.tc001
- - dovetail.tempest.tc002
- - dovetail.tempest.tc003
- - dovetail.tempest.tc004
- - dovetail.tempest.tc005
- # sdnvpn
- - dovetail.sdnvpn.tc001
- - dovetail.sdnvpn.tc002
- - dovetail.sdnvpn.tc004
- - dovetail.sdnvpn.tc008
- # other test cases
- # resiliency
- # - dovetail.resiliency.tc001
+ # proposed test cases for 2nd release
+ # smoke
+ - dovetail.smoke.tc001
+ - dovetail.smoke.tc002
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index 5c0ea510..ed11a6bd 100644
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -20,6 +20,9 @@ sdnvpn_image: 'ubuntu-16.04-server-cloudimg-amd64-disk1.img'
# Tempest image
cirros_image: 'cirros-0.3.5-x86_64-disk.img'
+# Ubuntu 14.04 image for snaps_smoke
+ubuntu14_image: 'ubuntu-14.04-server-cloudimg-amd64-disk1.img'
+
COMPLIANCE_PATH: compliance/
TESTCASE_PATH: testcase/
# testsuite supported, should adjust accordingly
@@ -62,6 +65,7 @@ functest_testcase:
- copper
- cloudify_ims
- odl
+ - snaps_smoke
# used for testcase cmd template in jinja2 format
# we have two variables available now
diff --git a/dovetail/container.py b/dovetail/container.py
index e1191094..69dd5e9a 100644
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -237,6 +237,10 @@ class Container(object):
src_path = os.path.join(prefix_path, 'pre_config', file_name)
dest_path = '/home/opnfv/functest/images'
Container.pre_copy(container_id, src_path, dest_path)
+ file_name = dt_cfg.dovetail_config['ubuntu14_image']
+ src_path = os.path.join(prefix_path, 'pre_config', file_name)
+ dest_path = '/home/opnfv/functest/images'
+ Container.pre_copy(container_id, src_path, dest_path)
if type.lower() == 'yardstick':
cls.set_yardstick_conf_file(container_id)
diff --git a/dovetail/testcase/smoke.tc002.yml b/dovetail/testcase/smoke.tc002.yml
new file mode 100644
index 00000000..ae9a87f5
--- /dev/null
+++ b/dovetail/testcase/smoke.tc002.yml
@@ -0,0 +1,9 @@
+---
+dovetail.smoke.tc002:
+ name: dovetail.smoke.tc002
+ objective: snaps smoke test cases
+ validate:
+ type: functest
+ testcase: snaps_smoke
+ report:
+ sub_testcase_list: