diff options
| -rw-r--r-- | docker/vnf/testcases.yaml | 10 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 8 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py | 7 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/vmtp/vmtp.py | 1 |
4 files changed, 1 insertions, 25 deletions
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index 170eed0e5..9822a515a 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -13,8 +13,6 @@ tiers: blocking: false description: >- This test case deploys the Cloudify orchestrator. - dependencies: - - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: name: cloudify - @@ -26,8 +24,6 @@ tiers: This test case deploys an OpenSource vIMS solution from Clearwater using the Cloudify orchestrator. It also runs some signaling traffic. - dependencies: - - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: name: cloudify_ims @@ -40,8 +36,6 @@ tiers: This test case deploys an OpenSource vIMS solution from Clearwater using the OpenStack Heat orchestrator. It also runs some signaling traffic. - dependencies: - - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: name: heat_ims @@ -52,8 +46,6 @@ tiers: blocking: false description: >- This test case is vRouter testing. - dependencies: - - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: name: vyos_vrouter @@ -65,7 +57,5 @@ tiers: description: >- vEPC validation with Juju as VNF manager and ABoT as test executor. - dependencies: - - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: name: juju_epc diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 16365b0b7..095e2f955 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -560,8 +560,6 @@ tiers: blocking: false description: >- This test case deploys the Cloudify orchestrator. - dependencies: - - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: name: cloudify - @@ -587,8 +585,6 @@ tiers: This test case deploys an OpenSource vIMS solution from Clearwater using the OpenStack Heat orchestrator. It also runs some signaling traffic. - dependencies: - - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: name: heat_ims @@ -599,8 +595,6 @@ tiers: blocking: false description: >- This test case is vRouter testing. - dependencies: - - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: name: vyos_vrouter @@ -612,7 +606,5 @@ tiers: description: >- vEPC validation with Juju as VNF manager and ABoT as test executor. - dependencies: - - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: name: juju_epc diff --git a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py index 309709276..1dd85a118 100644 --- a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py +++ b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py @@ -76,8 +76,6 @@ from snaps.openstack.utils.tests.neutron_utils_tests import ( from snaps.openstack.utils.tests.nova_utils_tests import ( NovaSmokeTests, NovaUtilsKeypairTests, NovaUtilsFlavorTests, NovaUtilsInstanceTests, NovaUtilsInstanceVolumeTests) -from snaps.provisioning.tests.ansible_utils_tests import ( - AnsibleProvisioningTests) def add_openstack_client_tests(suite, os_creds, ext_net_name, @@ -434,8 +432,3 @@ def add_openstack_integration_tests(suite, os_creds, ext_net_name, ext_net_name=ext_net_name, use_keystone=use_keystone, flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level)) - suite.addTest(OSIntegrationTestCase.parameterize( - AnsibleProvisioningTests, os_creds=os_creds, - ext_net_name=ext_net_name, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, image_metadata=image_metadata, - log_level=log_level)) diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py index d37e344ce..2e0be28ad 100644 --- a/functest/opnfv_tests/openstack/vmtp/vmtp.py +++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py @@ -50,6 +50,7 @@ class Vmtp(singlevm.VmReady2): flavor_ram = 2048 flavor_vcpus = 1 flavor_disk = 0 + create_server_timeout = 300 def __init__(self, **kwargs): if "case_name" not in kwargs: |