From fa0a614c8ea3e757440c82380707e0221079e32a Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Mon, 4 Dec 2017 06:36:06 +0000 Subject: Fix the yamllint errors in functest/ci And also, remove the params "tempest_use_custom_images" and "unique_names" of vping, rally and tempest. Change-Id: Ic4243ef2f5e965910e5befa87db8d585cad34fa2 Signed-off-by: Linda Wang --- functest/ci/config_aarch64_patch.yaml | 62 ++++++++++++------------ functest/ci/config_functest.yaml | 89 ++++++++++++++++++----------------- functest/ci/config_patch.yaml | 9 ++-- 3 files changed, 83 insertions(+), 77 deletions(-) (limited to 'functest/ci') diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index a7b77374..a3f029a0 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -1,44 +1,48 @@ +--- os: general: openstack: image_name: TestVM - image_file_name: cirros-d161201-aarch64-disk.img - image_password: gocubsgo + image_file_name: cirros-d161201-aarch64-disk.img + image_password: gocubsgo extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' - short_id: 'ubuntu16.04' + hw_firmware_type: 'uefi' + hw_video_model: 'vga' + short_id: 'ubuntu16.04' snaps: images: - glance_tests: - disk_file: /home/opnfv/functest/images/cirros-d161201-aarch64-disk.img - extra_properties: - hw_firmware_type: 'uefi' - short_id: 'ubuntu16.04' - hw_video_model: 'vga' - cirros: - disk_file: /home/opnfv/functest/images/cirros-d161201-aarch64-disk.img - extra_properties: - hw_firmware_type: 'uefi' - short_id: 'ubuntu16.04' - hw_video_model: 'vga' - ubuntu: - disk_file: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-arm64-uefi1.img - extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' - centos: - disk_file: /home/opnfv/functest/images/CentOS-7-aarch64-GenericCloud.qcow2 - extra_properties: - hw_firmware_type: 'uefi' - hw_video_model: 'vga' + glance_tests: + disk_file: / + home/opnfv/functest/images/cirros-d161201-aarch64-disk.img + extra_properties: + hw_firmware_type: 'uefi' + short_id: 'ubuntu16.04' + hw_video_model: 'vga' + cirros: + disk_file: + /home/opnfv/functest/images/cirros-d161201-aarch64-disk.img + extra_properties: + hw_firmware_type: 'uefi' + short_id: 'ubuntu16.04' + hw_video_model: 'vga' + ubuntu: + disk_file: + /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-arm64-uefi1.img + extra_properties: + hw_firmware_type: 'uefi' + hw_video_model: 'vga' + centos: + disk_file: + /home/opnfv/functest/images/CentOS-7-aarch64-GenericCloud.qcow2 + extra_properties: + hw_firmware_type: 'uefi' + hw_video_model: 'vga' vping: image_name: TestVM tempest: - use_custom_images: True - use_custom_flavors: True + use_custom_flavors: 'True' odl_sfc: image_base_url: "http://artifacts.opnfv.org/sfc/demo" diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index e2746cf3..d636ec2e 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -1,23 +1,24 @@ +--- general: dir: - home: /home/opnfv - repos: /home/opnfv/repos - dir_repo_rally: /home/opnfv/repos/rally - repo_tempest: /src/tempest - dir_repo_releng: /home/opnfv/repos/releng - repo_vims_test: /src/vims-test - repo_barometer: /home/opnfv/repos/barometer - repo_odl_test: /src/odl_test - repo_fds: /src/fds - repo_securityscan: /home/opnfv/repos/securityscanning - functest: /home/opnfv/functest - results: /home/opnfv/functest/results - functest_conf: /home/opnfv/functest/conf - functest_data: /home/opnfv/functest/data - ims_data: /home/opnfv/functest/data/ims/ - router_data: /home/opnfv/functest/data/router/ - functest_images: /home/opnfv/functest/images - rally_inst: /root/.rally + home: /home/opnfv + repos: /home/opnfv/repos + dir_repo_rally: /home/opnfv/repos/rally + repo_tempest: /src/tempest + dir_repo_releng: /home/opnfv/repos/releng + repo_vims_test: /src/vims-test + repo_barometer: /home/opnfv/repos/barometer + repo_odl_test: /src/odl_test + repo_fds: /src/fds + repo_securityscan: /home/opnfv/repos/securityscanning + functest: /home/opnfv/functest + results: /home/opnfv/functest/results + functest_conf: /home/opnfv/functest/conf + functest_data: /home/opnfv/functest/data + ims_data: /home/opnfv/functest/data/ims/ + router_data: /home/opnfv/functest/data/router/ + functest_images: /home/opnfv/functest/images + rally_inst: /root/.rally openstack: creds: /home/opnfv/functest/conf/openstack.creds @@ -25,12 +26,13 @@ general: image_name: Cirros-0.3.5 image_name_alt: Cirros-0.3.5-1 - image_file_name: cirros-0.3.5-x86_64-disk.img - image_url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img + image_file_name: cirros-0.3.5-x86_64-disk.img + image_url: + http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img image_user: cirros - image_disk_format: qcow2 - image_username: cirros - image_password: cubswin:) + image_disk_format: qcow2 + image_username: cirros + image_password: cubswin:) flavor_name: opnfv_flavor flavor_name_alt: opnfv_flavor_1 @@ -48,19 +50,21 @@ general: neutron_router_name: functest-router snaps: - use_keystone: True - use_floating_ips: True + use_keystone: 'True' + use_floating_ips: 'True' images: - glance_tests: - disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img - cirros: - disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img - ubuntu: - disk_file: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img - centos: - disk_file: /home/opnfv/functest/images/CentOS-7-x86_64-GenericCloud.qcow2 - # All of these values are optional and will override the values retrieved - # by the RC file + glance_tests: + disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img + cirros: + disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img + ubuntu: + disk_file: + /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img + centos: + disk_file: + /home/opnfv/functest/images/CentOS-7-x86_64-GenericCloud.qcow2 +# All of these values are optional and will override the values retrieved +# by the RC file # os_creds_override: # username: {user} # password: {password} @@ -80,8 +84,8 @@ snaps: # ssh_proxy_cmd: {OpenSSH -o ProxyCommand value} vping: - ping_timeout: 200 - vm_flavor: m1.tiny # adapt to your environment + ping_timeout: 200 + vm_flavor: m1.tiny # adapt to your environment vm_name_1: opnfv-vping-1 vm_name_2: opnfv-vping-2 image_name: functest-vping @@ -100,8 +104,7 @@ vping: vm_boot_timeout: 180 vm_delete_timeout: 100 vm_ssh_connect_timeout: 60 - cleanup_objects: True - unique_names: True + cleanup_objects: 'True' odl_sfc: image_base_url: "http://artifacts.opnfv.org/sfc/images" @@ -110,7 +113,6 @@ odl_sfc: image_format: qcow2 tempest: - unique_names: True verifier_name: opnfv-tempest identity: tenant_name: tempest @@ -125,12 +127,10 @@ tempest: private_subnet_name: tempest-subnet private_subnet_cidr: 192.168.150.0/24 router_name: tempest-router - use_custom_images: True - use_custom_flavors: False + use_custom_flavors: 'False' volume_device_name: vdc rally: - unique_names: True deployment_name: opnfv-rally network_name: rally-net subnet_name: rally-subnet @@ -192,7 +192,8 @@ example: sg_desc: Example Security group results: - # you can also set a file (e.g. /home/opnfv/functest/results/dump.txt) to dump results + # you can also set a file (e.g. /home/opnfv/functest/results/dump.txt) + # to dump results # test_db_url: file:///home/opnfv/functest/results/dump.txt test_db_url: http://testresults.opnfv.org/test/api/v1/results diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml index 865a564e..f54c2d7c 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -1,9 +1,10 @@ +--- lxd: general: openstack: image_name: Cirros-0.3.5 - image_file_name: cirros-0.3.5-x86_64-lxc.tar.gz - image_disk_format: raw + image_file_name: cirros-0.3.5-x86_64-lxc.tar.gz + image_disk_format: raw healthcheck: disk_image: /home/opnfv/functest/data/cirros-0.3.5-x86_64-lxc.tar.gz @@ -13,10 +14,10 @@ fdio: flavor_extra_specs: {'hw:mem_page_size':'large'} image_properties: {'hw_mem_page_size':'large'} tempest: - use_custom_flavors: True + use_custom_flavors: 'True' ovs: general: flavor_extra_specs: {'hw:mem_page_size':'large'} image_properties: {'hw_mem_page_size':'large'} tempest: - use_custom_flavors: True + use_custom_flavors: 'True' -- cgit 1.2.3-korg