Rearange configuration files

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

Author: tonifinger

Tests/config.toml

@@ -48,32 +48,28 @@ workers = 4
 [scopes.scs-compatible-iaas]
 spec = "./scs-compatible-iaas.yaml"
 
+
 [scopes.scs-compatible-kaas]
 spec = "./scs-compatible-kaas.yaml"
 
 
 # default subject (not a real subject, but used to declare a default mapping)
 # (this is the only mapping declaration that supports using Python string interpolation)
 [subjects._.mapping]
-os_cloud = "{subject}"
-subject_root = "{subject}"
+os_cloud      = "{subject}"
+subject_root  = "{subject}"
 
 
 [subjects._.kubernetes_setup]
 kube_plugin         = "kind"
 clusterspec         = "kaas/clusterspec.yaml"
-clusterspec_cluster = "default"
-
-
-
-[subjects."cspA-v1.29".kubernetes_setup]
-kube_plugin         = "kind"
-clusterspec_cluster = "v1.29"
-
+clusterspec_cluster = "current-k8s-release"
 
 
 [subjects."cspA-v1.30".kubernetes_setup]
-kube_plugin         = "kind"
-clusterspec_cluster = "v1.30"
+clusterspec_cluster = "current-k8s-release-1"
 
 
+[subjects."cspA-v1.29".kubernetes_setup]
+clusterspec_cluster = "current-k8s-release-2"
+

Tests/kaas/clusterspec.yaml

@@ -1,11 +1,11 @@
 # this file specifies all clusters that have to be provisioned for the tests to run
 clusters:
-  default:
+  current-k8s-release:
     branch: default
     kubeconfig: kubeconfig.yaml
-  v1.29:
+  current-k8s-release-1:
     branch: "1.29"
-    kubeconfig: kubecfg129.yaml
-  v1.30:
+    kubeconfig: kubeconfig.yaml
+  current-k8s-release-2:
     branch: "1.30"
-    kubeconfig: kubecfg130.yaml
+    kubeconfig: kubeconfig.yaml

Tests/scs-compatible-kaas.yaml

@@ -6,34 +6,30 @@ variables:
 modules:
   - id: cncf-k8s-conformance
     name: CNCF Kubernetes conformance
-    url: https://raw.githubusercontent.com/SovereignCloudStack/standards/main/Standards/scs-0210-v2-k8s-version-policy.md # TODO:!!! this standard mentions cncf but is is the right reference?
+    url: https://github.com/cncf/k8s-conformance/tree/master
     parameters:
-      kubeconfig: relative path to kubeconfig file
+      result_dir_name: 
     run:
       - executable: ./kaas/plugin/run_sonobuoy_executor.py
-        args: -k {subject_root}/{kubeconfig} -r {result_dir_name} -c 'cncf-conformance'
+        args: -k {subject_root}/kubeconfig.yaml -r {subject_root}/{result_dir_name} -c 'cncf-conformance'
     testcases:
       - id: cncf-k8s-conformance
         tags: [mandatory]
   - id: scs-0210-v2
     name: Kubernetes version policy
     url: https://raw.githubusercontent.com/SovereignCloudStack/standards/main/Standards/scs-0210-v2-k8s-version-policy.md
-    parameters:
-      kubeconfig: relative path to kubeconfig file
     run:
       - executable: ./kaas/k8s-version-policy/k8s_version_policy.py
-        args: -k {subject_root}/{kubeconfig}
+        args: -k {subject_root}/kubeconfig.yaml
     testcases:
       - id: version-policy-check
         tags: [mandatory]
   - id: scs-0214-v2
     name: Kubernetes node distribution and availability
     url: https://raw.githubusercontent.com/SovereignCloudStack/standards/main/Standards/scs-0214-v1-k8s-node-distribution.md
-    parameters:
-      kubeconfig: relative path to kubeconfig file
     run:
       - executable: ./kaas/k8s-node-distribution/k8s_node_distribution_check.py
-        args: -k {subject_root}/{kubeconfig}
+        args: -k {subject_root}/kubeconfig.yaml
     testcases:
       - id: node-distribution-check
         tags: [mandatory]