arg to option.

Author: guettli

Tests/kaas/sonobuoy-config.yaml Tests/kaas/scs-sonobuoy-config.yamlTests/kaas/sonobuoy-config.yaml renamed to Tests/kaas/scs-sonobuoy-config.yaml

@@ -20,18 +20,18 @@ def cli():
 @click.option("-k", "--kubeconfig", "kubeconfig", required=True, type=click.Path(exists=True), help="path/to/kubeconfig_file.yaml",)
 @click.option("-r", "--result_dir_name", "result_dir_name", type=str, default="sonobuoy_results", help="directory name to store results at",)
 @click.option("-c", "--check", "check_name", type=str, default="sonobuoy_executor", help="this MUST be the same name as the id in 'scs-compatible-kaas.yaml'",)
-@click.option("--sonobuoy-config", "sonobuoy_config_yaml", type=click.Path(exists=True), default="kaas/sonobuoy-config.yaml", help="Configuration for Sonobuoy (yaml format)")
+@click.option("--scs-sonobuoy-config", "scs_sonobuoy_config_yaml", type=click.Path(exists=True), default="kaas/sonobuoy-config.yaml", help="Configuration for Sonobuoy (yaml format)")
 @click.option("-a", "--arg", "args", multiple=True)
-def sonobuoy_run(kubeconfig, result_dir_name, check_name, sonobuoy_config_yaml, args):
-    sonobuoy_handler = SonobuoyHandler(check_name, kubeconfig, result_dir_name, sonobuoy_config_yaml, args)
+def sonobuoy_run(kubeconfig, result_dir_name, check_name, scs_sonobuoy_config_yaml, args):
+    sonobuoy_handler = SonobuoyHandler(check_name, kubeconfig, result_dir_name, scs_sonobuoy_config_yaml, args)
     sys.exit(sonobuoy_handler.run())
 
 
 @cli.command("check-results")
-@click.argument("sonobuoy_config_yaml", type=click.Path(exists=True))
+@click.option("--scs-sonobuoy-config", "scs_sonobuoy_config_yaml", type=click.Path(exists=True), default="kaas/scs-sonobuoy-config.yaml", help="Configuration for Sonobuoy (yaml format)")
 @click.argument("sonobuoy_result_yaml", type=click.Path(exists=True))
-def check_results(sonobuoy_config_yaml, sonobuoy_result_yaml):
-    check_sonobuoy_result(sonobuoy_config_yaml, sonobuoy_result_yaml)
+def check_results(scs_sonobuoy_config_yaml, sonobuoy_result_yaml):
+    check_sonobuoy_result(scs_sonobuoy_config_yaml, sonobuoy_result_yaml)
     sys.exit(0)
 
 

Tests/kaas/sonobuoy_handler/run_sonobuoy.py

@@ -11,7 +11,7 @@ variables:
   - kubeconfig
 scripts:
 - executable: ./kaas/sonobuoy_handler/run_sonobuoy.py
-  args: -k {kubeconfig} -r {subject_root}/sono-results-e2e -c 'cncf-k8s-conformance'  -a '--mode=certified-conformance'
+  args: run -k {kubeconfig} --scs-sonobuoy-config kaas/scs-sonobuoy-config.yaml -r {subject_root}/sono-results-e2e -c 'cncf-k8s-conformance'  -a '--mode=certified-conformance'
   #~ args: -k {kubeconfig} -r {subject_root}/sono-results -c 'cncf-k8s-conformance'  -a '--plugin-env e2e.E2E_DRYRUN=true'
   testcases:
   - id: cncf-k8s-conformance
@@ -31,7 +31,7 @@ scripts:
     description: Must fulfill all requirements of scs-0214-v2.
     url: https://docs.scs.community/standards/scs-0214-v2-k8s-node-distribution#decision
 - executable: ./kaas/sonobuoy_handler/run_sonobuoy.py
-  args: -k {kubeconfig} -r {subject_root}/sono-results-0219 -c 'kaas-networking-check' -a '--e2e-focus "NetworkPolicy"'
+  args: run -k {kubeconfig} --scs-sonobuoy-config kaas/scs-sonobuoy-config.yaml -r {subject_root}/sono-results-0219 -c 'kaas-networking-check' -a '--e2e-focus "NetworkPolicy"'
   testcases:
   - id: kaas-networking-check
     description: Must fulfill all requirements of scs-0219-v1.