From dcb90a06f0dfa25f696aeb964e861354dbd94eee Mon Sep 17 00:00:00 2001 From: Morgan Richomme Date: Thu, 10 Mar 2016 09:34:38 +0100 Subject: [PATCH] reorganization of Test folder in Releng Change-Id: I92b507105e820198691ab8b1c44e1011b983b849 Signed-off-by: Morgan Richomme --- .../tools/dashboard => dashboard}/css/bootstrap.min.css | 0 .../tools/dashboard => dashboard}/css/opnfv_dashboard_tests.css | 0 .../tools/dashboard => dashboard}/js/bootstrap.min.js | 0 .../tools/dashboard => dashboard}/js/dygraph-combined.js | 0 .../tools/dashboard => dashboard}/js/jquery-2.2.0.min.js | 0 .../tools/dashboard => dashboard}/js/opnfv_dashboard_tests.js | 0 .../tools/dashboard => dashboard}/js/opnfv_dashboard_tests_conf.js | 0 .../tools/dashboard => dashboard}/opnfv_dashboard_tests.html | 0 {result_collection_api/tools/reporting => reporting}/default.css | 0 .../tools/reporting => reporting}/index-tempest-tmpl.html | 0 .../tools/reporting => reporting}/index-tmpl.html | 0 .../tools/reporting => reporting}/reporting-tempest.py | 7 ++++--- {result_collection_api/tools/reporting => reporting}/reporting.py | 0 .../{tools => }/samples/sample.json.postman_collection | 0 {result_collection_api/tools => scripts}/backup-db.sh | 0 15 files changed, 4 insertions(+), 3 deletions(-) rename {result_collection_api/tools/dashboard => dashboard}/css/bootstrap.min.css (100%) rename {result_collection_api/tools/dashboard => dashboard}/css/opnfv_dashboard_tests.css (100%) rename {result_collection_api/tools/dashboard => dashboard}/js/bootstrap.min.js (100%) rename {result_collection_api/tools/dashboard => dashboard}/js/dygraph-combined.js (100%) rename {result_collection_api/tools/dashboard => dashboard}/js/jquery-2.2.0.min.js (100%) rename {result_collection_api/tools/dashboard => dashboard}/js/opnfv_dashboard_tests.js (100%) rename {result_collection_api/tools/dashboard => dashboard}/js/opnfv_dashboard_tests_conf.js (100%) rename {result_collection_api/tools/dashboard => dashboard}/opnfv_dashboard_tests.html (100%) rename {result_collection_api/tools/reporting => reporting}/default.css (100%) rename {result_collection_api/tools/reporting => reporting}/index-tempest-tmpl.html (100%) rename {result_collection_api/tools/reporting => reporting}/index-tmpl.html (100%) rename {result_collection_api/tools/reporting => reporting}/reporting-tempest.py (94%) rename {result_collection_api/tools/reporting => reporting}/reporting.py (100%) rename result_collection_api/{tools => }/samples/sample.json.postman_collection (100%) rename {result_collection_api/tools => scripts}/backup-db.sh (100%) diff --git a/result_collection_api/tools/dashboard/css/bootstrap.min.css b/dashboard/css/bootstrap.min.css similarity index 100% rename from result_collection_api/tools/dashboard/css/bootstrap.min.css rename to dashboard/css/bootstrap.min.css diff --git a/result_collection_api/tools/dashboard/css/opnfv_dashboard_tests.css b/dashboard/css/opnfv_dashboard_tests.css similarity index 100% rename from result_collection_api/tools/dashboard/css/opnfv_dashboard_tests.css rename to dashboard/css/opnfv_dashboard_tests.css diff --git a/result_collection_api/tools/dashboard/js/bootstrap.min.js b/dashboard/js/bootstrap.min.js similarity index 100% rename from result_collection_api/tools/dashboard/js/bootstrap.min.js rename to dashboard/js/bootstrap.min.js diff --git a/result_collection_api/tools/dashboard/js/dygraph-combined.js b/dashboard/js/dygraph-combined.js similarity index 100% rename from result_collection_api/tools/dashboard/js/dygraph-combined.js rename to dashboard/js/dygraph-combined.js diff --git a/result_collection_api/tools/dashboard/js/jquery-2.2.0.min.js b/dashboard/js/jquery-2.2.0.min.js similarity index 100% rename from result_collection_api/tools/dashboard/js/jquery-2.2.0.min.js rename to dashboard/js/jquery-2.2.0.min.js diff --git a/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests.js b/dashboard/js/opnfv_dashboard_tests.js similarity index 100% rename from result_collection_api/tools/dashboard/js/opnfv_dashboard_tests.js rename to dashboard/js/opnfv_dashboard_tests.js diff --git a/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests_conf.js b/dashboard/js/opnfv_dashboard_tests_conf.js similarity index 100% rename from result_collection_api/tools/dashboard/js/opnfv_dashboard_tests_conf.js rename to dashboard/js/opnfv_dashboard_tests_conf.js diff --git a/result_collection_api/tools/dashboard/opnfv_dashboard_tests.html b/dashboard/opnfv_dashboard_tests.html similarity index 100% rename from result_collection_api/tools/dashboard/opnfv_dashboard_tests.html rename to dashboard/opnfv_dashboard_tests.html diff --git a/result_collection_api/tools/reporting/default.css b/reporting/default.css similarity index 100% rename from result_collection_api/tools/reporting/default.css rename to reporting/default.css diff --git a/result_collection_api/tools/reporting/index-tempest-tmpl.html b/reporting/index-tempest-tmpl.html similarity index 100% rename from result_collection_api/tools/reporting/index-tempest-tmpl.html rename to reporting/index-tempest-tmpl.html diff --git a/result_collection_api/tools/reporting/index-tmpl.html b/reporting/index-tmpl.html similarity index 100% rename from result_collection_api/tools/reporting/index-tmpl.html rename to reporting/index-tmpl.html diff --git a/result_collection_api/tools/reporting/reporting-tempest.py b/reporting/reporting-tempest.py similarity index 94% rename from result_collection_api/tools/reporting/reporting-tempest.py rename to reporting/reporting-tempest.py index 6d90f86..944b428 100644 --- a/result_collection_api/tools/reporting/reporting-tempest.py +++ b/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/result_collection_api/tools/reporting/reporting.py b/reporting/reporting.py similarity index 100% rename from result_collection_api/tools/reporting/reporting.py rename to reporting/reporting.py diff --git a/result_collection_api/tools/samples/sample.json.postman_collection b/result_collection_api/samples/sample.json.postman_collection similarity index 100% rename from result_collection_api/tools/samples/sample.json.postman_collection rename to result_collection_api/samples/sample.json.postman_collection diff --git a/result_collection_api/tools/backup-db.sh b/scripts/backup-db.sh similarity index 100% rename from result_collection_api/tools/backup-db.sh rename to scripts/backup-db.sh -- 2.16.6