Merge to back to usage of one single clustersspec

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

Author: tonifinger

Tests/config.toml

@@ -39,15 +39,18 @@ scopes = [
 ]
 subjects = [
     "cspA-default",
-    "cspA-1.29",
-    "cspA-1.30",
+    "cspA-v1.29",
+    "cspA-v1.30",
 ]
 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)
@@ -57,5 +60,20 @@ subject_root = "{subject}"
 
 
 [subjects._.kubernetes_setup]
-kube_plugin = "kind"
-clusterspec = "kaas/clusterspec.yaml"
+kube_plugin         = "kind"
+clusterspec         = "kaas/clusterspec.yaml"
+clusterspec_cluster = "default"
+
+
+
+[subjects."cspA-v1.29".kubernetes_setup]
+kube_plugin         = "kind"
+clusterspec_cluster = "v1.29"
+
+
+
+[subjects."cspA-v1.30".kubernetes_setup]
+kube_plugin         = "kind"
+clusterspec_cluster = "v1.30"
+
+

Tests/kaas/clusterspec_default.yaml

@@ -22,16 +22,14 @@ def init_plugin(plugin_kind, config=None):
     return plugin_maker(config)
 
 
-def run_plugin_create(plugin_kind, clusterspec):
+def run_plugin_create(plugin_kind, clusterspec_cluster, clusterspec):
     plugin = init_plugin(plugin_kind)
-    for cluster_id, cluster_info in clusterspec.items():
-        plugin.create(cluster_id, cluster_info['branch'], os.path.abspath(cluster_info['kubeconfig']))
+    plugin.create(clusterspec_cluster, clusterspec[clusterspec_cluster]['branch'], os.path.abspath(clusterspec[clusterspec_cluster]['kubeconfig']))
 
 
-def run_plugin_delete(plugin_kind, clusterspec):
+def run_plugin_delete(plugin_kind, clusterspec_cluster, clusterspec):
     plugin = init_plugin(plugin_kind)
-    for cluster_id in clusterspec:
-        plugin.delete(cluster_id)
+    plugin.delete(clusterspec_cluster)
 
 
 def load_spec(clusterspec_path):
@@ -47,17 +45,19 @@ def cli():
 @cli.command()
 @click.argument('plugin_kind', type=click.Choice(list(PLUGIN_LOOKUP), case_sensitive=False))
 @click.argument('clusterspec_path', type=click.Path(exists=True, dir_okay=False))
-def create(plugin_kind, clusterspec_path):
+@click.argument('clusterspec_cluster', type=str, default="default")
+def create(plugin_kind, clusterspec_path, clusterspec_cluster):
     clusterspec = load_spec(clusterspec_path)['clusters']
-    run_plugin_create(plugin_kind, clusterspec)
+    run_plugin_create(plugin_kind, clusterspec_cluster, clusterspec)
 
 
 @cli.command()
 @click.argument('plugin_kind', type=click.Choice(list(PLUGIN_LOOKUP), case_sensitive=False))
 @click.argument('clusterspec_path', type=click.Path(exists=True, dir_okay=False))
-def delete(plugin_kind, clusterspec_path):
+@click.argument('clusterspec_cluster', type=str, default="default")
+def delete(plugin_kind, clusterspec_path, clusterspec_cluster):
     clusterspec = load_spec(clusterspec_path)['clusters']
-    run_plugin_delete(plugin_kind, clusterspec)
+    run_plugin_delete(plugin_kind, clusterspec_cluster, clusterspec)
 
 
 if __name__ == '__main__':

Tests/kaas/clusterspec_v1.29.yaml

@@ -47,18 +47,8 @@ versions:
     include:
       - ref: cncf-k8s-conformance
         parameters:
-          kubeconfig: kubeconfig.yaml
+          result_dir_name: "sonobuoy_cncf_results"
       - ref: scs-0210-v2
-        parameters:
-          kubeconfig: kubeconfig.yaml
-      - ref: scs-0210-v2
-        parameters:
-          kubeconfig: kubecfg129.yaml
-      - ref: scs-0210-v2
-        parameters:
-          kubeconfig: kubecfg130.yaml
       - ref: scs-0214-v2
-        parameters:
-          kubeconfig: kubeconfig.yaml
     targets:
       main: mandatory

Tests/kaas/clusterspec_v1.30.yaml

@@ -94,6 +94,7 @@ def build_provision_command(self, subject):
                 'create',
                 kubernetes_setup['kube_plugin'],
                 self.abspath(kubernetes_setup['clusterspec']),
+                kubernetes_setup['clusterspec_cluster'],
             ],
             'cwd': subject_root,
         }
@@ -108,6 +109,7 @@ def build_unprovision_command(self, subject):
                 'delete',
                 kubernetes_setup['kube_plugin'],
                 self.abspath(kubernetes_setup['clusterspec']),
+                kubernetes_setup['clusterspec_cluster'],
             ],
             'cwd': subject_root,
         }