diff options
| -rw-r--r-- | site/intel-pod15/site-definition.yaml | 2 | ||||
| -rw-r--r-- | site/intel-pod17/site-definition.yaml | 2 | ||||
| -rwxr-xr-x | tools/deploy.sh | 13 | ||||
| -rw-r--r-- | tools/files/blacklist.yaml | 46 | ||||
| -rw-r--r-- | tools/files/tempest.conf | 193 | ||||
| -rw-r--r-- | tools/files/tempest_conf.yaml | 6 | ||||
| -rwxr-xr-x | tools/test.sh | 12 |
7 files changed, 71 insertions, 203 deletions
diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml index 37a8549..1cfe8e6 100644 --- a/site/intel-pod15/site-definition.yaml +++ b/site/intel-pod15/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: refs/changes/47/757647/7 + revision: a757b06879380931e4c9e2b54671dcbeb2c16d08 url: https://opendev.org/airship/treasuremap.git ... diff --git a/site/intel-pod17/site-definition.yaml b/site/intel-pod17/site-definition.yaml index 051fe0c..ab08724 100644 --- a/site/intel-pod17/site-definition.yaml +++ b/site/intel-pod17/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: refs/changes/47/757647/7 + revision: a757b06879380931e4c9e2b54671dcbeb2c16d08 url: https://opendev.org/airship/treasuremap.git ... diff --git a/tools/deploy.sh b/tools/deploy.sh index b5b97a2..d1be5d6 100755 --- a/tools/deploy.sh +++ b/tools/deploy.sh @@ -28,6 +28,7 @@ source $(dirname "$(realpath $0)")/../site/$1/$1.env if [ -z "$AS_HOME" ]; then WORK_DIR=$(mktemp -d) + echo "Working directory is set to $WORK_DIR" trap "{ sudo rm -rf $WORK_DIR; }" EXIT else WORK_DIR=$AS_HOME @@ -155,7 +156,7 @@ pre_genesis() { fi ssh $GEN_SSH 'sudo cp /etc/default/grub /etc/default/grub.orig' - ssh $GEN_SSH 'sudo sed -i "/GRUB_CMDLINE_LINUX=\"/c GRUB_CMDLINE_LINUX=\"hugepagesz=1G hugepages=12 transparent_hugepage=never default_hugepagesz=1G dpdk-socket-mem=4096,4096 iommu=pt intel_iommu=on amd_iommu=on cgroup_disable=hugetlb console=ttyS1,115200n8\"" /etc/default/grub' + ssh $GEN_SSH 'sudo sed -i "/GRUB_CMDLINE_LINUX=\"/c GRUB_CMDLINE_LINUX=\"hugepagesz=1G hugepages=10 transparent_hugepage=never default_hugepagesz=1G dpdk-socket-mem=4096,4096 iommu=pt intel_iommu=on amd_iommu=on cgroup_disable=hugetlb console=ttyS1,115200n8\"" /etc/default/grub' ssh $GEN_SSH 'sudo update-grub' # upstream pre-geneis is not ready to be used directly yet @@ -235,7 +236,6 @@ create_public_network() { public-network } - create_dpdk_flavor() { export OS_AUTH_URL=${OS_AUTH_URL_IDENTITY} sudo -E treasuremap/tools/openstack flavor create --ram 1024 --disk 1 --vcpus 1 --public --property hw:mem_page_size=large dpdk.tiny @@ -248,6 +248,12 @@ create_cirros_image() { rm -rf cirros-0.5.1-x86_64-disk.img cirros } +deploy_test_conf() { + sudo mkdir -p /home/opnfv/functest + sudo cp airship/tools/files/blacklist.yaml /home/opnfv/functest + sudo cp airship/tools/files/tempest_conf.yaml /home/opnfv/functest +} + case "$2" in 'pre_genesis') pre_genesis @@ -263,16 +269,19 @@ case "$2" in create_cirros_image create_dpdk_flavor create_public_network + deploy_test_conf ;; 'update_site') clone_repos pegleg_collect site_action $2 + deploy_test_conf ;; 'update_software') clone_repos pegleg_collect site_action $2 + deploy_test_conf ;; 'init_cloud') create_cirros_image diff --git a/tools/files/blacklist.yaml b/tools/files/blacklist.yaml new file mode 100644 index 0000000..b97aa48 --- /dev/null +++ b/tools/files/blacklist.yaml @@ -0,0 +1,46 @@ +--- +scenario: + - + scenarios: + - '^os-' # all scenarios + tests: + - 'NovaServers.boot_and_live_migrate_server' + - 'NovaServers.boot_server_attach_created_volume_and_live_migrate' + - 'NovaServers.boot_server_from_volume_and_live_migrate' + - 'NovaServers.boot_and_migrate_server' + - 'NovaServers.resize_server' + - 'NovaServers.boot_and_get_console_url' + # Following test occasionally fails due to race condition issue on + # quota manipulation in nova. + # Ref: https://bugs.launchpad.net/nova/+bug/1552622 + - 'Quotas.nova_update_and_delete' + +functionality: + - + functions: + - block_migration + tests: + - NovaServers.boot_server_from_volume_and_live_migrate + - + functions: + - no_migration + tests: + - NovaServers.boot_and_live_migrate_server + - NovaServers.boot_server_attach_created_volume_and_live_migrate + - NovaServers.boot_server_from_volume_and_live_migrate + - NovaServers.boot_and_migrate_server + - + functions: + - no_net_trunk_service + tests: + - '^NeutronTrunk' + - + functions: + - no_floating_ip + tests: + - HeatStacks.create_and_delete_stack + - NovaServers.boot_and_associate_floating_ip + - NovaServers.boot_server_associate_and_dissociate_floating_ip + - NeutronNetworks.create_and_delete_floating_ips + - NeutronNetworks.create_and_list_floating_ips + - NeutronNetworks.associate_and_dissociate_floating_ips diff --git a/tools/files/tempest.conf b/tools/files/tempest.conf deleted file mode 100644 index eff2f74..0000000 --- a/tools/files/tempest.conf +++ /dev/null @@ -1,193 +0,0 @@ -[DEFAULT] -debug = True -use_stderr = False -log_file = - -[auth] -use_dynamic_credentials = True -# admin_username = tempest_neutron-user_7013fc57-36b2-40ad-a2b9-20840ec44a3c -# admin_password = 0E3k=gRf@|ko7^mguXK]!4Vtq?TPaX -# admin_project_name = tempest_neutron-project_7013fc57-36b2-40ad-a2b9-20840ec44a3c -admin_domain_name = default -tempest_roles = _member_ - -[compute] -# image_ref = 1ff5944f-89b7-413e-981a-523d81c57754 -# image_ref_alt = 8189311a-76cf-4e40-9a2c-3ce32dba3be0 -# flavor_ref = 0b6b2be7-42d4-44ff-bcc2-ddb22576c714 -# flavor_ref_alt = b35737c8-9673-450e-a106-f6dd82c3485d -# fixed_network_name = tempest_neutron-net_7013fc57-36b2-40ad-a2b9-20840ec44a3c -volume_device_name = vdb -min_compute_nodes = 2 -endpoint_type = public -max_microversion = 2.72 - -[compute-feature-enabled] -# disabled since Airship 1.7 -live_migration = False -resize = True -# disabled since Airship 1.7 -vnc_console = False -attach_encrypted_volume = False -block_migration_for_live_migration = False -block_migrate_cinder_iscsi = False -change_password = False -cold_migration = True -config_drive = True -console_output = True -disk_config = True -enable_instance_password = True -interface_attach = True -live_migrate_back_and_forth = False -metadata_service = True -pause = True -personality = False -rdp_console = False -rescue = True -scheduler_available_filters = RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter -serial_console = False -# disabled by airship -shelve = False -snapshot = True -spice_console = False -suspend = True -swap_volume = False -volume_backed_live_migration = False -volume_multiattach = False - -[data-processing] -endpoint_type = public - -[identity] -auth_version = v3 -v2_endpoint_type = public -v3_endpoint_type = public -disable_ssl_certificate_validation = False -ca_certificates_file = -admin_role = admin -default_domain_id = default -user_unique_last_password_count = 2 -user_lockout_duration = 10 -user_lockout_failure_attempts = 2 - -[identity-feature-enabled] -trust = True -api_v2 = False -api_v2_admin = False -security_compliance = True -federation = False -external_idp = False -project_tags = True -application_credentials = True - -[image-feature-enabled] -deactivate_image = True -api_v2 = True -api_v1 = False - -[input-scenario] -ssh_user_regex = [["^.*[Cc]irros.*$", "cirros"], ["^.*[Tt]est[VvMm].*$", "cirros"], ["^.*rally_verify.*$", "cirros"]] - -[network] -# public_network_id = 2f8e366e-50ca-4662-a854-104b770ad119 -floating_network_name = public -default_network = 192.168.120.0/24 -project_network_cidr = 192.168.120.0/24 -project_networks_reachable = False -endpoint_type = public - -[network-feature-enabled] -ipv6_subnet_attributes = True -ipv6 = True -api_extensions = address-scope,agent,agent-resources-synced,allowed-address-pairs,auto-allocated-topology,availability_zone,availability_zone_filter,default-subnetpools,dhcp_agent_scheduler,dvr,empty-string-filtering,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,floatingip-pools,ip-substring-filtering,router,ext-gw-mode,l3-ha,l3-flavors,l3-port-ip-change-not-allowed,l3_agent_scheduler,multi-provider,net-mtu,net-mtu-writable,network_availability_zone,network-ip-availability,pagination,port-mac-address-regenerate,port-resource-request,binding,binding-extended,port-security,project-id,provider,qos,qos-bw-limit-direction,qos-bw-minimum-ingress,qos-default,qos-fip,qos-gateway-ip,qos-rule-type-details,qos-rules-alias,quotas,quota_details,rbac-policies,rbac-security-groups,revision-if-match,standard-attr-revisions,router_availability_zone,port-security-groups-filtering,security-group,service-type,sorting,standard-attr-description,subnet_onboard,subnet-service-types,subnet_allocation,standard-attr-tag,standard-attr-timestamp,trunk,trunk-details -port_admin_state_change = True -port_security = True -floating_ips = True - -[object-storage] -operator_role = member -reseller_admin_role = ResellerAdmin -endpoint_type = public - -[oslo_concurrency] -lock_path = - -[orchestration] -instance_type = -stack_owner_role = heat_stack_owner -stack_user_role = heat_stack_user -endpoint_type = public - -[scenario] -img_dir = /home/opnfv/functest/images -img_file = cirros-0.4.0-x86_64-disk.img -img_disk_format = qcow2 -img_properties = - -[service_available] -cinder = True -glance = True -heat = True -ironic = False -neutron = True -nova = True -sahara = False -swift = True - -[validation] -run_validation = True -image_ssh_user = cirros -connect_method = floating -ssh_timeout = 196 -ip_version_for_ssh = 4 -# network_for_ssh = tempest_neutron-net_7013fc57-36b2-40ad-a2b9-20840ec44a3c - -[volume-feature-enabled] -bootable = True -multi_backend = False -backup = True -snapshot = True -clone = True -manage_snapshot = True -manage_volume = True -extend_attached_volume = False -consistency_group = False -volume_revert = True - -[volume] -endpoint_type = public -max_microversion = 3.59 -storage_protocol = ceph -manage_volume_ref = source-name,volume-%s -manage_snapshot_ref = source-name,snapshot-%s - -[image] -endpoint_type = public - -[placement] -# max_microversion = 1.31 -max_microversion: 1.4 - - -[load_balancer] -test_with_ipv6 = False - -[neutron_plugin_options] -agent_availability_zone = nova -available_type_drivers = flat,geneve,vlan,gre,local,vxlan -provider_vlans = external - -[object-storage-feature-enabled] -discoverable_apis = account_quotas,formpost,bulk_upload,bulk_delete,tempurl,crossdomain,container_quotas,staticweb,account_quotas,slo -object_versioning = True -# disabled since Airship 1.7 -discoverability = False - -[heat_plugin] -skip_functional_test_list = EncryptionVolTypeTest -skip_scenario_test_list = AodhAlarmTest,SoftwareConfigIntegrationTest,VolumeBackupRestoreIntegrationTest,CfnInitIntegrationTest,LoadBalancerTest -auth_version = 3 - -[heat_features_enabled] -multi_cloud = False - diff --git a/tools/files/tempest_conf.yaml b/tools/files/tempest_conf.yaml index 048f59f..7301d36 100644 --- a/tools/files/tempest_conf.yaml +++ b/tools/files/tempest_conf.yaml @@ -59,13 +59,13 @@ network-feature-enabled: # not supported in Airship 1.8 due to DPDK floating_ips: false placement: - max_microversion: 1.31 + max_microversion: 1.4 validation: image_ssh_user: cirros ssh_timeout: 196 ip_version_for_ssh: 4 run_validation: true - connect_method: floating + connect_method: fixed volume: max_microversion: 3.59 storage_protocol: ceph @@ -86,7 +86,7 @@ load_balancer: neutron_plugin_options: agent_availability_zone: nova available_type_drivers: flat,vlan,vxlan - provider_vlans: public + provider_vlans: ovsnet object-storage-feature-enabled: discoverable_apis: "account_quotas,formpost,bulk_upload,bulk_delete,\ tempurl,crossdomain,container_quotas,staticweb,account_quotas,slo" diff --git a/tools/test.sh b/tools/test.sh index 32f298a..35c0667 100755 --- a/tools/test.sh +++ b/tools/test.sh @@ -9,6 +9,7 @@ export FUNCTEST_CACHE=${FUNCTEST_CACHE:-"${HOME}/.opnfv/functest"} export SITE=${2:-"intel-pod17"} cp tools/files/tempest_conf.yaml ${FUNCTEST_CACHE} +cp tools/files/blacklist.yaml ${FUNCTEST_CACHE} TMP_DIR=$(mktemp -d) cd $TMP_DIR @@ -18,10 +19,13 @@ trap "{ sudo rm -rf $TMP_DIR; }" EXIT cat > env << EOF EXTERNAL_NETWORK=public BLOCK_MIGRATION=False +DEPLOY_SCENARIO=ovs +NO_TENANT_NETWORK=true +FLAVOR_EXTRA_SPECS=hw:mem_page_size:large +NEW_USER_ROLE=_member_ EOF -cat > env_file << EOF -export NEW_USER_ROLE=_member_ +cat > openstack.env << EOF export OS_AUTH_URL=http://identity-nc.$SITE.opnfv.org/v3 export OS_USER_DOMAIN_NAME=default export OS_PROJECT_DOMAIN_NAME=default @@ -51,10 +55,12 @@ run_tests() { sudo rm -rf ${FUNCTEST_CACHE}/results && mkdir ${FUNCTEST_CACHE}/results sudo docker run -it --env-file env --network host \ - -v $(pwd)/env_file:/home/opnfv/functest/conf/env_file \ + -v $(pwd)/openstack.env:/home/opnfv/functest/conf/env_file \ -v ${FUNCTEST_CACHE}/images:/home/opnfv/functest/images \ -v ${FUNCTEST_CACHE}/results:/home/opnfv/functest/results \ -v ${FUNCTEST_CACHE}/tempest_conf.yaml:/usr/lib/python3.6/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \ + -v ${FUNCTEST_CACHE}/blacklist.yaml:/usr/lib/python3.6/site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \ + -v /home/ubuntu/nc/functest/functest/core/singlevm.py:/usr/lib/python3.6/site-packages/functest/core/singlevm.py \ opnfv/functest-${1}:iruya bash } |