Fixup configuration files

Signed-off-by: Toni Finger <[email protected]>

Author: tonifinger

Tests/config.toml

@@ -66,10 +66,10 @@ clusterspec         = "kaas/clusterspec.yaml"
 clusterspec_cluster = "current-k8s-release"
 
 
-[subjects."cspA-v1.30".kubernetes_setup]
+[subjects.cspA-current-1.kubernetes_setup]
 clusterspec_cluster = "current-k8s-release-1"
 
 
-[subjects."cspA-v1.29".kubernetes_setup]
+[subjects.cspA-current-2.kubernetes_setup]
 clusterspec_cluster = "current-k8s-release-2"
 

Tests/scs-compatible-kaas.yaml

@@ -7,11 +7,9 @@ modules:
   - id: cncf-k8s-conformance
     name: CNCF Kubernetes conformance
     url: https://github.com/cncf/k8s-conformance/tree/master
-    parameters:
-      result_dir_name: 
-    run:
-      - executable: ./kaas/plugin/run_sonobuoy_executor.py
-        args: -k {subject_root}/kubeconfig.yaml -r {subject_root}/{result_dir_name} -c 'cncf-conformance'
+    #run:
+    #  - executable: ./kaas/plugin/run_sonobuoy_executor.py
+    #    args: -k {subject_root}/kubeconfig.yaml -r {result_dir_path} -c 'cncf-conformance'
     testcases:
       - id: cncf-k8s-conformance
         tags: [mandatory]
@@ -42,8 +40,6 @@ versions:
   - version: v1
     include:
       - ref: cncf-k8s-conformance
-        parameters:
-          result_dir_name: "sonobuoy_cncf_results"
       - ref: scs-0210-v2
       - ref: scs-0214-v2
     targets: