From b0486547c558e22271096c29224d52052822e025 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 14 Aug 2018 14:28:03 +0200 Subject: Remove all lxd refs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All Joid runs are stopped, then these scenarios can't be maintained. Change-Id: Ida7c8c86cbd377024047d4abbbc1806ad65afc8a Signed-off-by: Cédric Ollivier --- docker/healthcheck/testcases.yaml | 4 ---- docker/smoke/testcases.yaml | 2 -- functest/ci/config_patch.yaml | 7 ------- functest/ci/download_images.sh | 1 - functest/ci/testcases.yaml | 6 ------ functest/opnfv_tests/openstack/rally/blacklist.txt | 7 ------- 6 files changed, 27 deletions(-) diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index 75c186d75..84135678b 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -169,8 +169,6 @@ tiers: simple queries. When the config value of snaps.use_keystone is True, functest must have access to the cloud's private network. - dependencies: - - DEPLOY_SCENARIO: '^((?!lxd).)*$' run: module: 'functest.opnfv_tests.openstack.snaps.api_check' class: 'ApiCheck' @@ -185,8 +183,6 @@ tiers: Python test class which creates an, image, flavor, network, and Cirros VM instance and observes the console output to validate the single port obtains the correct IP address. - dependencies: - - DEPLOY_SCENARIO: '^((?!lxd).)*$' run: module: 'functest.opnfv_tests.openstack.snaps.health_check' class: 'HealthCheck' diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 18b7ed01b..167471959 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -131,8 +131,6 @@ tiers: this functionality. When the config value of snaps.use_keystone is True, functest must have access to the cloud's private network. - dependencies: - - DEPLOY_SCENARIO: '^((?!lxd).)*$' run: module: 'functest.opnfv_tests.openstack.snaps.smoke' class: 'SnapsSmoke' diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index 39ab946a8..d9df47c87 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -1,11 +1,4 @@ --- -lxd: - general: - openstack: - image_name: Cirros-0.4.0 - image_file_name: cirros-0.4.0-x86_64-lxc.tar.gz - image_disk_format: raw - fdio: general: flavor_extra_specs: {'hw:mem_page_size':'large'} diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index a23d8f707..b7626972e 100644 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -10,7 +10,6 @@ https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloud https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2 -http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-lxc.tar.gz http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-aarch64-disk.img https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-arm64-uefi1.img http://cloud.centos.org/altarch/7/images/aarch64/CentOS-7-aarch64-GenericCloud.qcow2.xz diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 32fbacd51..3aeebcab9 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -169,8 +169,6 @@ tiers: simple queries. When the config value of snaps.use_keystone is True, functest must have access to the cloud's private network. - dependencies: - - DEPLOY_SCENARIO: '^((?!lxd).)*$' run: module: 'functest.opnfv_tests.openstack.snaps.api_check' class: 'ApiCheck' @@ -185,8 +183,6 @@ tiers: Python test class which creates an, image, flavor, network, and Cirros VM instance and observes the console output to validate the single port obtains the correct IP address. - dependencies: - - DEPLOY_SCENARIO: '^((?!lxd).)*$' run: module: 'functest.opnfv_tests.openstack.snaps.health_check' class: 'HealthCheck' @@ -322,8 +318,6 @@ tiers: this functionality. When the config value of snaps.use_keystone is True, functest must have access to the cloud's private network. - dependencies: - - DEPLOY_SCENARIO: '^((?!lxd).)*$' run: module: 'functest.opnfv_tests.openstack.snaps.smoke' class: 'SnapsSmoke' diff --git a/functest/opnfv_tests/openstack/rally/blacklist.txt b/functest/opnfv_tests/openstack/rally/blacklist.txt index c9d7c6007..ce929d733 100644 --- a/functest/opnfv_tests/openstack/rally/blacklist.txt +++ b/functest/opnfv_tests/openstack/rally/blacklist.txt @@ -1,11 +1,4 @@ scenario: - - - scenarios: - - '^os-nosdn-lxd-(no)?ha$' - installers: - - '.+' # all installers - tests: - - NovaServers.boot_server_from_volume_and_delete - scenarios: - '^os-' # all scenarios -- cgit 1.2.3-korg