Merge "Add reporting flag to push reuslts only from CI"

1 files changed, 18 insertions, 25 deletions

diff --git a/testcases/features/copper.py b/testcases/features/copper.py
index 78c0fb4d2..74ef43902 100755
--- a/testcases/features/copper.py
+++ b/testcases/features/copper.py
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and

 # limitations under the License.

 #

-

+import argparse

 import os

 import sys

 import time

@@ -22,6 +22,11 @@ import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as functest_utils

 import yaml

 

+parser = argparse.ArgumentParser()

+parser.add_argument("-r", "--report",

+                    help="Create json result file",

+                    action="store_true")

+args = parser.parse_args()

 

 with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:

     functest_yaml = yaml.safe_load(f)

@@ -29,7 +34,6 @@ with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
 dirs = functest_yaml.get('general').get('directories')

 FUNCTEST_REPO = dirs.get('dir_repo_functest')

 COPPER_REPO = dirs.get('dir_repo_copper')

-TEST_DB_URL = functest_yaml.get('results').get('test_db_url')

 

 logger = ft_logger.Logger("copper").getLogger()

 

@@ -55,30 +59,19 @@ def main():
         'duration': duration,

         'status': test_status,

     }

-    pod_name = functest_utils.get_pod_name(logger)

-    scenario = functest_utils.get_scenario(logger)

-    version = functest_utils.get_version(logger)

-    build_tag = functest_utils.get_build_tag(logger)

-

+    functest_utils.logger_test_results(logger, "Copper",

+                                       "copper-notification",

+                                       details['status'], details)

     try:

-        logger.info("Pushing COPPER results: TEST_DB_URL=%(db)s "

-                    "pod_name=%(pod)s version=%(v)s scenario=%(s)s "

-                    "criteria=%(c)s details=%(d)s" % {

-                        'db': TEST_DB_URL,

-                        'pod': pod_name,

-                        'v': version,

-                        's': scenario,

-                        'c': details['status'],

-                        'b': build_tag,

-                        'd': details,

-                    })

-        functest_utils.push_results_to_db("copper",

-                                          "copper-notification",

-                                          logger,

-                                          start_time,

-                                          stop_time,

-                                          details['status'],

-                                          details)

+        if args.report:

+            functest_utils.push_results_to_db("copper",

+                                              "copper-notification",

+                                              logger,

+                                              start_time,

+                                              stop_time,

+                                              details['status'],

+                                              details)

+            logger.info("COPPER results pushed to DB")

     except:

         logger.error("Error pushing results into Database '%s'"

                      % sys.exc_info()[0])