diff options
| -rw-r--r-- | docker/healthcheck/testcases.yaml | 4 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 4 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile | 6 | ||||
| -rw-r--r-- | functest/ci/config_patch.yaml | 7 | ||||
| -rw-r--r-- | functest/ci/download_images.sh | 1 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 8 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/blacklist.txt | 7 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/vmtp/vmtp.py | 1 | ||||
| -rw-r--r-- | upper-constraints.txt | 2 |
9 files changed, 10 insertions, 30 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 65190f414..167471959 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -96,6 +96,8 @@ tiers: VMTP is a small python application that will automatically perform ping connectivity, round trip time measurement (latency) and TCP/UDP throughput + dependencies: + - POD_ARCH: '^(?!aarch64$)' run: module: 'functest.opnfv_tests.openstack.vmtp.vmtp' @@ -129,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/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index a09a562fd..dc9c9dede 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -2,7 +2,8 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens -ARG RALLY_TAG=0.11.2 +ARG RALLY_TAG=1.1.0 +ARG RALLY_OPENSTACK_TAG=1.2.0 ARG OS_FAULTS_TAG=0.1.17 RUN apk --no-cache add --virtual .build-deps --update \ @@ -28,7 +29,8 @@ RUN apk --no-cache add --virtual .build-deps --update \ git clone https://github.com/openstack/rally.git /src/rally && \ (cd /src/rally && git checkout $RALLY_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ - git clone --depth 1 https://github.com/openstack/rally-openstack.git /src/rally-openstack && \ + git clone https://github.com/openstack/rally-openstack.git /src/rally-openstack && \ + (cd /src/rally-openstack && git checkout $RALLY_OPENSTACK_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ tempest /src/rally-openstack /src/os-faults && \ 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 bff4da191..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' @@ -287,6 +283,8 @@ tiers: VMTP is a small python application that will automatically perform ping connectivity, round trip time measurement (latency) and TCP/UDP throughput + dependencies: + - POD_ARCH: '^(?!aarch64$)' run: module: 'functest.opnfv_tests.openstack.vmtp.vmtp' @@ -320,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,13 +1,6 @@ scenario: - scenarios: - - '^os-nosdn-lxd-(no)?ha$' - installers: - - '.+' # all installers - tests: - - NovaServers.boot_server_from_volume_and_delete - - - scenarios: - '^os-' # all scenarios installers: - '.+' # all installers diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py index 9e6fd8e15..8831078db 100644 --- a/functest/opnfv_tests/openstack/vmtp/vmtp.py +++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py @@ -114,6 +114,7 @@ class Vmtp(singlevm.VmReady2): vmtp_conf["security_group_name"] = "pns-security{}".format( self.guid) vmtp_conf["dns_nameservers"] = [env.get('NAMESERVER')] + vmtp_conf["generic_retry_count"] = self.create_server_timeout // 2 conf.write(yaml.dump(vmtp_conf)) def run_vmtp(self): diff --git a/upper-constraints.txt b/upper-constraints.txt index 5ede34017..cb24576d9 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -17,7 +17,7 @@ robotframework-httplibrary===0.4.2 robotframework-requests===0.4.7 robotframework-sshlibrary===2.1.3;python_version=='2.7' ansible===2.3.2.0 -xtesting===0.56.0 +xtesting===0.57.0 networking-bgpvpn===8.0.0 networking-sfc===6.0.0 sphinx-opnfv-theme===0.1.1 |