Add tempest black list

Signed-off-by: James Gu <james.gu@att.com>
Change-Id: I341cc8faab3d9be8365bb062ae8eb80e002125e8

4 files changed, 49 insertions, 4 deletions

diff --git a/tools/deploy.sh b/tools/deploy.sh
index be9669c..1fa2e80 100755
--- a/tools/deploy.sh
+++ b/tools/deploy.sh
@@ -260,7 +260,8 @@ create_cirros_image() {
 
 deploy_test_conf() {
   sudo mkdir -p /home/opnfv/functest
-  sudo cp airship/tools/files/blacklist.yaml /home/opnfv/functest
+  sudo cp airship/tools/files/rally_blacklist.yaml /home/opnfv/functest
+  sudo cp airship/tools/files/tempest_blacklist.yaml /home/opnfv/functest
   sudo cp airship/tools/files/tempest_conf.yaml /home/opnfv/functest
 }
 
diff --git a/tools/files/blacklist.yaml b/tools/files/rally_blacklist.yaml
index ea3e717..ea3e717 100644
--- a/tools/files/blacklist.yaml
+++ b/tools/files/rally_blacklist.yaml
diff --git a/tools/files/tempest_blacklist.yaml b/tools/files/tempest_blacklist.yaml
new file mode 100644
index 0000000..365120b
--- /dev/null
+++ b/tools/files/tempest_blacklist.yaml
@@ -0,0 +1,36 @@
+---
+-
+    scenarios:
+        - os-ovn-nofeature-ha
+        - os-ovn-nofeature-noha
+    tests:
+        - neutron_tempest_plugin.api.admin.test_dhcp_agent_scheduler
+        - neutron_tempest_plugin.api.test_trunk.TrunkTestInheritJSONBase.test_add_subport
+        - patrole_tempest_plugin.tests.api.network.test_agents_rbac
+        - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type
+        - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id
+        - tempest.api.network.admin.test_dhcp_agent_scheduler
+
+-
+    scenarios:
+        - ovs
+    tests:
+        # Bug detected by tempest_smoke
+        # - tempest.api.identity.v3.test_domains.DefaultDomainTestJSON.test_default_domain_exists
+#        - neutron_tempest_plugin.api.admin.test_floating_ips_admin_actions.FloatingIPAdminTestJSON.test_associate_floating_ip_with_port_from_another_project
+#        - neutron_tempest_plugin.api.admin.test_floating_ips_admin_actions.FloatingIPAdminTestJSON.test_create_floatingip_with_specified_ip_address
+#        - tempest.api.network.test_extensions.ExtensionsTestJSON.test_list_show_extensions
+#        - tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_admin_modify_quota
+#        - tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_upload_valid_object
+#        - tempest.api.object_storage.test_account_services.AccountTest.test_list_account_metadata
+#        - tempest.api.object_storage.test_account_services.AccountTest.test_list_containers
+#        - tempest.api.object_storage.test_object_services.ObjectTest.test_create_object
+#        - tempest.api.object_storage.test_object_services.ObjectTest.test_get_object
+#        - tempest.api.object_storage.test_object_services.ObjectTest.test_list_object_metadata
+#        - tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata
+#        - tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_large_object
+#        - tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_too_many_objects
+#        - tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_valid_object
+#        - tempest.api.object_storage.test_container_services.ContainerTest.test_create_container
+#        - tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents
+#        - tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_metadata
diff --git a/tools/test.sh b/tools/test.sh
index 35c0667..7f3cf59 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -9,7 +9,8 @@ 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}
+cp tools/files/rally_blacklist.yaml ${FUNCTEST_CACHE}
+cp tools/files/tempest_blacklist.yaml ${FUNCTEST_CACHE}
 TMP_DIR=$(mktemp -d)
 cd $TMP_DIR
 
@@ -17,6 +18,11 @@ trap "{ sudo rm -rf $TMP_DIR; }" EXIT
 
 
 cat > env << EOF
+S3_ENDPOINT_URL=https://storage.googleapis.com
+S3_DST_URL=s3://artifacts.opnfv.org/xtesting/test
+HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/test
+TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results
+TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results
 EXTERNAL_NETWORK=public
 BLOCK_MIGRATION=False
 DEPLOY_SCENARIO=ovs
@@ -53,13 +59,15 @@ help() {
 run_tests() {
 
   sudo rm -rf ${FUNCTEST_CACHE}/results && mkdir ${FUNCTEST_CACHE}/results
-
+  sudo docker pull opnfv/functest-${1}:iruya
   sudo docker run -it --env-file env --network host \
       -v $(pwd)/openstack.env:/home/opnfv/functest/conf/env_file \
+      -v ${FUNCTEST_CACHE}/.boto:/root/.boto \
       -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 ${FUNCTEST_CACHE}/tempest_blacklist.yaml:/usr/lib/python3.6/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml \
+      -v ${FUNCTEST_CACHE}/rally_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
 }