Adds missing clowder iqe cji options to bonfire (#319)

RedHatInsights · Aug 23, 2023 · 8a72995 · 8a72995
1 parent fa46833
commit 8a72995
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 0 deletions.
diff --git a/bonfire/bonfire.py b/bonfire/bonfire.py
@@ -633,6 +633,31 @@ def _validate_opposing_opts(ctx, param, value):
         type=str,
         default="",
     ),
+    click.option(
+        "--parallel-enabled",
+        help="iqe --parallel-enabled expression",
+        type=str,
+        default="",
+    ),
+    click.option(
+        "--parallel-worker-count",
+        help="iqe --parallel-worker-count expression",
+        type=str,
+        default="",
+    ),
+    click.option(
+        "--rp-args",
+        help="iqe --rp-args expression",
+        type=str,
+        default="",
+    ),
+    click.option(
+        "--ibutsu-source",
+        help="iqe --ibutsu-source expression",
+        type=str,
+        default="",
+    ),
+
     _local_option,
 ]
 
@@ -1284,6 +1309,10 @@ def _cmd_process_iqe_cji(
     plugins,
     local,
     selenium,
+    parallel_enabled,
+    parallel_worker_count,
+    rp_args,
+    ibutsu_source,
 ):
     """Process IQE ClowdJobInvocation template and print output"""
     cji_config = process_iqe_cji(
@@ -1301,6 +1330,10 @@ def _cmd_process_iqe_cji(
         plugins,
         local,
         selenium,
+        parallel_enabled,
+        parallel_worker_count,
+        rp_args,
+        ibutsu_source,
     )
     print(json.dumps(cji_config, indent=2))
 
@@ -1331,6 +1364,10 @@ def _cmd_deploy_iqe_cji(
     duration,
     local,
     selenium,
+    parallel_enabled,
+    parallel_worker_count,
+    rp_args,
+    ibutsu_source,
     pool,
     force,
 ):
@@ -1355,6 +1392,10 @@ def _cmd_deploy_iqe_cji(
         plugins,
         local,
         selenium,
+        parallel_enabled,
+        parallel_worker_count,
+        rp_args,
+        ibutsu_source,
     )
 
     log.debug("processed CJI config:\n%s", cji_config)

diff --git a/bonfire/processor.py b/bonfire/processor.py
@@ -140,6 +140,10 @@ def process_iqe_cji(
     plugins="",
     local=True,
     selenium=False,
+    parallel_enabled="",
+    parallel_worker_count="",
+    rp_args="",
+    ibutsu_source=""
 ):
     log.info("processing IQE ClowdJobInvocation")
 
@@ -168,6 +172,10 @@ def process_iqe_cji(
     params["REQUIREMENTS_PRIORITY"] = json.dumps(requirements_priority)
     params["TEST_IMPORTANCE"] = json.dumps(test_importance)
     params["DEPLOY_SELENIUM"] = json.dumps(selenium)
+    params["PARALLEL_ENABLED"] = json.dumps(parallel_enabled)
+    params["PARALLEL_WORKER_COUNT"] = json.dumps(parallel_worker_count)
+    params["RP_ARGS"] = json.dumps(rp_args)
+    params["IBUTSU_SOURCE"] = json.dumps(ibutsu_source)
 
     processed_template = _process_template(template_data, params=params, local=local)
 

diff --git a/bonfire/resources/default-iqe-cji.yaml b/bonfire/resources/default-iqe-cji.yaml
@@ -21,6 +21,10 @@ objects:
         requirements: ${{REQUIREMENTS}}
         requirementsPriority: ${{REQUIREMENTS_PRIORITY}}
         testImportance: ${{TEST_IMPORTANCE}}
+        parallelEnabled: ${{PARALLEL_ENABLED}}
+        parallelWorkerCount: ${{PARALLEL_WORKER_COUNT}}
+        rpArgs: ${{RP_ARGS}}
+        ibutsuSource: ${{IBUTSU_SOURCE}}
         ui:
           selenium:
             deploy: ${{DEPLOY_SELENIUM}}
@@ -51,3 +55,12 @@ parameters:
   value: ""
 - name: DEPLOY_SELENIUM
   value: "false"
+- name: PARALLEL_ENABLED
+  value: "true"
+- name: PARALLEL_WORKER_COUNT
+  value: "2"
+- name: RP_ARGS
+  value: ""
+- name: IBUTSU_SOURCE
+  value: ""
+