fix the ci build failures and add back the perf test on binary (#238)

Author: mwang2016

.circleci/config.yml

@@ -160,6 +160,7 @@ workflows:
               only:
                 - develop
                 - master
+
 #      - execute_perf_tests:
 #          requires:
 #            - build

testing/integration/conftest.py

@@ -90,7 +90,6 @@ def test_env(request):
 
     if os.path.exists(join(config_folder, 'local.ini')):
         parser.read(join(config_folder, 'local.ini'))
-
-    conf.update(parser.items('LOCAL'))
+        conf.update(parser.items('LOCAL'))
 
     return conf

testing/integration/lib/update_env.py

@@ -31,8 +31,8 @@ def get_default_env():
     if os.path.exists(join(config_folder, 'env.json')):
         with open(join(config_folder, 'env.json')) as json_file:
             local_env = json.load(json_file)
+        default_dict.update(local_env)
 
-    default_dict.update(local_env)
     return default_dict
 
 

testing/integration/testcases/test_nozzle_performance.py

@@ -16,27 +16,27 @@ def teardown_method(self):
     @classmethod
     def teardown_class(cls):
         delete_pcf_org()
-    #
-    # @pytest.mark.Perf_Binary
-    # @pytest.mark.parametrize("config_input", [
-    #     {'HEC_WORKERS': 1, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:01worker100batch'},
-    #     {'HEC_WORKERS': 2, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:02worker100batch'},
-    #     {'HEC_WORKERS': 4, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:04worker100batch'},
-    #     {'HEC_WORKERS': 8, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:08worker100batch'},
-    #     {'HEC_WORKERS': 16, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:16worker100batch'},
-    #     {'HEC_WORKERS': 1, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:01worker1000batch'},
-    #     {'HEC_WORKERS': 2, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:02worker1000batch'},
-    #     {'HEC_WORKERS': 4, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:04worker1000batch'},
-    #     {'HEC_WORKERS': 8, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:08worker1000batch'},
-    #     {'HEC_WORKERS': 16, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:16worker1000batch'},
-    # ])
-    # def test_nozzle_performance_with_local_binary(self, config_input, test_env):
-    #     self.data_gen_name = config_input['EXTRA_FIELDS'].split(':')[1]
-    #     update_data_gen_manifest(input_dict={'name': self.data_gen_name,
-    #                                          'env': {'GOPACKAGENAME': 'main', 'EPS': 500, 'TOTAL_EVENTS': 0}})
-    #     deploy_date_gen_to_pcf()
-    #     update_environment_variables(input_dict=config_input)
-    #     start_local_nozzle_binary(time_interval=1200)
+
+    @pytest.mark.Perf_Binary
+    @pytest.mark.parametrize("config_input", [
+        {'HEC_WORKERS': 1, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:01worker100batch'},
+        {'HEC_WORKERS': 2, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:02worker100batch'},
+        {'HEC_WORKERS': 4, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:04worker100batch'},
+        {'HEC_WORKERS': 8, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:08worker100batch'},
+        {'HEC_WORKERS': 16, 'HEC_BATCH_SIZE': 100, 'EXTRA_FIELDS': 'test_tag:16worker100batch'},
+        {'HEC_WORKERS': 1, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:01worker1000batch'},
+        {'HEC_WORKERS': 2, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:02worker1000batch'},
+        {'HEC_WORKERS': 4, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:04worker1000batch'},
+        {'HEC_WORKERS': 8, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:08worker1000batch'},
+        {'HEC_WORKERS': 16, 'HEC_BATCH_SIZE': 1000, 'EXTRA_FIELDS': 'test_tag:16worker1000batch'},
+    ])
+    def test_nozzle_performance_with_local_binary(self, config_input, test_env):
+        self.data_gen_name = config_input['EXTRA_FIELDS'].split(':')[1]
+        update_data_gen_manifest(input_dict={'name': self.data_gen_name,
+                                             'env': {'GOPACKAGENAME': 'main', 'EPS': 500, 'TOTAL_EVENTS': 0}})
+        deploy_date_gen_to_pcf()
+        update_environment_variables(input_dict=config_input)
+        start_local_nozzle_binary(time_interval=1200)
 
     @pytest.mark.Perf_Romote
     @pytest.mark.parametrize("config_input", [