Merge pull request #519 from fomars/develop

removed "regression" option from DataUploader
yandex · Feb 27, 2018 · cb128f9 · cb128f9
2 parents 4f89cc3 + 6de59b9
commit cb128f9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/yandextank/config_converter/tests/test_config3.yaml b/yandextank/config_converter/tests/test_config3.yaml
@@ -7,10 +7,10 @@ uploader:
   component: '177'
   job_name: light
   ignore_target_lock: true
-  regress: true
   notify:
     - fomars
   meta:
+    regress: '1'
     launched_from: centurion
 #production log
 phantom:

diff --git a/yandextank/plugins/DataUploader/client.py b/yandextank/plugins/DataUploader/client.py
@@ -369,7 +369,6 @@ def edit_job_metainfo(
             ammo_path,
             loop_count,
             version_tested,
-            is_regression,
             component,
             cmdline,
             is_starred,
@@ -382,7 +381,6 @@ def edit_job_metainfo(
             'ammo': ammo_path,
             'loop': loop_count,
             'version': version_tested,
-            'regression': str(is_regression),
             'component': component,
             'tank_type': int(tank_type),
             'command_line': cmdline,

diff --git a/yandextank/plugins/DataUploader/config/schema.yaml b/yandextank/plugins/DataUploader/config/schema.yaml
@@ -99,10 +99,6 @@ operator:
   type: string
   nullable: true
   default: null
-regress:
-  description: mark test as regression
-  default: false
-  type: boolean
 send_status_period:
   description: delay between status notifications
   default: 10

diff --git a/yandextank/plugins/DataUploader/plugin.py b/yandextank/plugins/DataUploader/plugin.py
@@ -114,7 +114,6 @@ def get_available_options(self):
             "job_dsc",
             "notify",
             "ver", "component",
-            "regress",
             "operator",
             "jobno_file",
             "ignore_target_lock",
@@ -237,9 +236,6 @@ def prepare_test(self):
             instances=instances,
             ammo_path=ammo_path,
             loop_count=loop_count,
-            is_regression=self.get_option(
-                'regress',
-                '0'),
             regression_component=self.get_option("component"),
             cmdline=cmdline,
         )  # todo: tanktype?
@@ -736,7 +732,6 @@ def edit_metainfo(
             instances=0,
             ammo_path=None,
             loop_count=None,
-            is_regression=None,
             regression_component=None,
             cmdline=None,
             is_starred=False,
@@ -749,7 +744,6 @@ def edit_metainfo(
                                               ammo_path=ammo_path,
                                               loop_count=loop_count,
                                               version_tested=self.version,
-                                              is_regression=is_regression,
                                               component=regression_component,
                                               cmdline=cmdline,
                                               is_starred=is_starred,