Update config.yml

Author: mwang2016

.circleci/config.yml

@@ -3,50 +3,64 @@ version: 2.1
 workflows:
   test:
     jobs:
-      - build_test_kafka_1-0:
+      - build_test_kafka:
+          kafka_version: 1.0.0
+          kafka_package: kafka_2.11-1.0.0.tgz
+          filters:
+            branches:
+              ignore:
+                - /^release\/.*/
+                - master
+      - build_test_kafka:
+          kafka_version: 1.1.1
+          kafka_package: kafka_2.11-1.1.1.tgz
+          filters:
+            branches:
+              ignore:
+                - /^release\/.*/
+                - master
+      - build_test_kafka:
+          kafka_version: 2.0.0
+          kafka_package: kafka_2.11-2.0.0.tgz
           filters:
             branches:
               ignore:
                 - /^release\/.*/
                 - master
-      - build_test_kafka_2-0:
+      - build_test_kafka:
+          kafka_version: 2.1.0
+          kafka_package: kafka_2.12-2.1.0.tgz
           filters:
             branches:
               ignore:
                 - /^release\/.*/
                 - master
-      - build_test_kafka_2-6:
+      - build_test_kafka:
+          kafka_version: 2.6.0
+          kafka_package: kafka_2.13-2.6.0.tgz
           filters:
             branches:
               ignore:
                 - /^release\/.*/
                 - master
 
 jobs:
-  build_test_kafka_1-0:
-    working_directory: ~/repo
-    executor:
-      name: kafka_connect_linux
-    steps:
-      - build_test:
-          kafka_version: 1.0.0
-          kafka_package: kafka_2.12-1.0.0.tgz
-  build_test_kafka_2-0:
-    working_directory: ~/repo
-    executor:
-      name: kafka_connect_linux
-    steps:
-      - build_test:
-          kafka_version: 2.0.0
-          kafka_package: kafka_2.12-2.0.0.tgz
-  build_test_kafka_2-6:
+  build_test_kafka:
     working_directory: ~/repo
     executor:
       name: kafka_connect_linux
+    parameters:
+      kafka_version:
+        description: "Kafka version"
+        type: string
+      kafka_package:
+        description: "Kafka package name"
+        type: string
     steps:
       - build_test:
-          kafka_version: 2.6.0
-          kafka_package: kafka_2.13-2.6.0.tgz
+          kafka_version: << parameters.kafka_version >>
+          kafka_package: << parameters.kafka_package >>
+
 
 commands:
   build_test:

test/lib/commonkafka.py

@@ -118,15 +118,18 @@ def get_running_kafka_connector_task_status(setup, params):
     '''
     Get running kafka connect connector tasks status using kafka connect REST API
     '''
-    response = requests.get(url=setup["kafka_connect_url"] + "/connectors/" + params["name"] + "/status",
-                            headers={'Accept': 'application/json', 'Content-Type': 'application/json'})
-    content = response.json()
-
-    if content.get('connector'):
-        if content['connector']['state'] == 'RUNNING':
-            task_status = jsonpath.jsonpath(content, '$.tasks.*.state')
-            return task_status
-
+    t_end = time.time() + 60
+    url = setup["kafka_connect_url"] + "/connectors/" + params["name"] + "/status"
+    header = {'Accept': 'application/json', 'Content-Type': 'application/json'}
+    while time.time() < t_end:
+        content = requests.get(url=url, headers=header).json()
+        if content.get('connector'):
+            if content['connector']['state'] == 'RUNNING' and len(content['tasks']) > 0:
+                time.sleep(2)
+                content = requests.get(url=url, headers=header).json()
+                logger.info(content)
+                task_status = jsonpath.jsonpath(content, '$.tasks.*.state')
+                return task_status
 
 
 

test/testcases/test_crud.py

@@ -128,5 +128,4 @@ def test_invalid_crud_event_enrichment_tasks(self, setup, test_case, config_inpu
         setup['connectors'].append(test_case)
 
         assert create_kafka_connector(setup, connector_definition_invalid_tasks) is True
-        time.sleep(2)
         assert get_running_kafka_connector_task_status(setup, connector_definition_invalid_tasks) == expected