From: Morgan Richomme Date: Thu, 10 Mar 2016 08:34:38 +0000 (+0100) Subject: reorganization of Test folder in Releng X-Git-Tag: colorado.1.0~620^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F11087%2F2;p=releng.git reorganization of Test folder in Releng Change-Id: I92b507105e820198691ab8b1c44e1011b983b849 Signed-off-by: Morgan Richomme --- diff --git a/utils/test/result_collection_api/tools/dashboard/css/bootstrap.min.css b/utils/test/dashboard/css/bootstrap.min.css similarity index 100% rename from utils/test/result_collection_api/tools/dashboard/css/bootstrap.min.css rename to utils/test/dashboard/css/bootstrap.min.css diff --git a/utils/test/result_collection_api/tools/dashboard/css/opnfv_dashboard_tests.css b/utils/test/dashboard/css/opnfv_dashboard_tests.css similarity index 100% rename from utils/test/result_collection_api/tools/dashboard/css/opnfv_dashboard_tests.css rename to utils/test/dashboard/css/opnfv_dashboard_tests.css diff --git a/utils/test/result_collection_api/tools/dashboard/js/bootstrap.min.js b/utils/test/dashboard/js/bootstrap.min.js similarity index 100% rename from utils/test/result_collection_api/tools/dashboard/js/bootstrap.min.js rename to utils/test/dashboard/js/bootstrap.min.js diff --git a/utils/test/result_collection_api/tools/dashboard/js/dygraph-combined.js b/utils/test/dashboard/js/dygraph-combined.js similarity index 100% rename from utils/test/result_collection_api/tools/dashboard/js/dygraph-combined.js rename to utils/test/dashboard/js/dygraph-combined.js diff --git a/utils/test/result_collection_api/tools/dashboard/js/jquery-2.2.0.min.js b/utils/test/dashboard/js/jquery-2.2.0.min.js similarity index 100% rename from utils/test/result_collection_api/tools/dashboard/js/jquery-2.2.0.min.js rename to utils/test/dashboard/js/jquery-2.2.0.min.js diff --git a/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests.js b/utils/test/dashboard/js/opnfv_dashboard_tests.js similarity index 100% rename from utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests.js rename to utils/test/dashboard/js/opnfv_dashboard_tests.js diff --git a/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests_conf.js b/utils/test/dashboard/js/opnfv_dashboard_tests_conf.js similarity index 100% rename from utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests_conf.js rename to utils/test/dashboard/js/opnfv_dashboard_tests_conf.js diff --git a/utils/test/result_collection_api/tools/dashboard/opnfv_dashboard_tests.html b/utils/test/dashboard/opnfv_dashboard_tests.html similarity index 100% rename from utils/test/result_collection_api/tools/dashboard/opnfv_dashboard_tests.html rename to utils/test/dashboard/opnfv_dashboard_tests.html diff --git a/utils/test/result_collection_api/tools/reporting/default.css b/utils/test/reporting/default.css similarity index 100% rename from utils/test/result_collection_api/tools/reporting/default.css rename to utils/test/reporting/default.css diff --git a/utils/test/result_collection_api/tools/reporting/index-tempest-tmpl.html b/utils/test/reporting/index-tempest-tmpl.html similarity index 100% rename from utils/test/result_collection_api/tools/reporting/index-tempest-tmpl.html rename to utils/test/reporting/index-tempest-tmpl.html diff --git a/utils/test/result_collection_api/tools/reporting/index-tmpl.html b/utils/test/reporting/index-tmpl.html similarity index 100% rename from utils/test/result_collection_api/tools/reporting/index-tmpl.html rename to utils/test/reporting/index-tmpl.html diff --git a/utils/test/result_collection_api/tools/reporting/reporting-tempest.py b/utils/test/reporting/reporting-tempest.py similarity index 94% rename from utils/test/result_collection_api/tools/reporting/reporting-tempest.py rename to utils/test/reporting/reporting-tempest.py index 6d90f863c..944b42809 100644 --- a/utils/test/result_collection_api/tools/reporting/reporting-tempest.py +++ b/utils/test/reporting/reporting-tempest.py @@ -56,14 +56,15 @@ for installer in installers: crit_time = False # Expect that at least 200 tests are run - if nb_tests_run > 200: + if nb_tests_run >= 200: crit_tests = True # Expect that at least 90% of success - if success_rate > 90: + if success_rate >= 90: crit_rate = True - if result['details']['duration'] < 900: + # Expect that the suite duration is inferior to 45m + if result['details']['duration'] < 2700: crit_time = True result['criteria'] = {'tests': crit_tests, diff --git a/utils/test/result_collection_api/tools/reporting/reporting.py b/utils/test/reporting/reporting.py similarity index 100% rename from utils/test/result_collection_api/tools/reporting/reporting.py rename to utils/test/reporting/reporting.py diff --git a/utils/test/result_collection_api/tools/samples/sample.json.postman_collection b/utils/test/result_collection_api/samples/sample.json.postman_collection similarity index 100% rename from utils/test/result_collection_api/tools/samples/sample.json.postman_collection rename to utils/test/result_collection_api/samples/sample.json.postman_collection diff --git a/utils/test/result_collection_api/tools/backup-db.sh b/utils/test/scripts/backup-db.sh similarity index 100% rename from utils/test/result_collection_api/tools/backup-db.sh rename to utils/test/scripts/backup-db.sh