Merge pull request #544 from vshn/golden-tests

Consolidate golden tests
vshn · Nov 20, 2024 · 427cc85 · 427cc85
2 parents a805933 + 3cb9c14
commit 427cc85
Show file tree

Hide file tree

Showing 927 changed files with 75,751 additions and 20,030 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -15,7 +15,8 @@ def yaml_path_recursion(yaml_dict, path):
         return yaml_path_recursion(yaml_dict.get(path[0], {}), path[1:])
 
 current_dir = os.path.dirname(os.path.realpath(__file__))
-tests_vshn_file = os.path.join(current_dir, '../../tests/vshn.yml')
+tests_vshn_cloud_file = os.path.join(current_dir, '../../tests/vshn-cloud.yml')
+tests_vshn_managed_file = os.path.join(current_dir, '../../tests/vshn-managed.yml')
 defaults_file = os.path.join(current_dir, '../../class/defaults.yml')
 
 
@@ -25,12 +26,20 @@ keys_to_check_yaml = [
     'parameters.appcat.services.emailAlerting.smtpPassword',
     ]
 
-with open(tests_vshn_file, 'r') as f:
+with open(tests_vshn_cloud_file, 'r') as f:
     defaults = yaml.safe_load(f)
     for key in keys_to_check_yaml:
         splitted = key.split(".")
         if yaml_path_recursion(defaults, splitted):
-            print(f'password is not empty in or broken vault declaration in {tests_vshn_file} for key {key}')
+            print(f'password is not empty in or broken vault declaration in {tests_vshn_cloud_file} for key {key}')
+            sys.exit(1)
+
+with open(tests_vshn_managed_file, 'r') as f:
+    defaults = yaml.safe_load(f)
+    for key in keys_to_check_yaml:
+        splitted = key.split(".")
+        if yaml_path_recursion(defaults, splitted):
+            print(f'password is not empty in or broken vault declaration in {tests_vshn_managed_file} for key {key}')
             sys.exit(1)
 
 with open(defaults_file, 'r') as f:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -21,53 +21,17 @@ jobs:
       - name: Run ${{ matrix.command }}
         run: make ${{ matrix.command }}
 
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        instance:
-          - defaults
-          - exoscale
-          - cloudscale
-          - openshift
-          - vshn
-          - apiserver
-          - controllers
-          - minio
-          - cloudscale-metrics-collector-cloud
-          - cloudscale-metrics-collector-managed
-          - exoscale-metrics-collector-cloud
-          - exoscale-metrics-collector-managed
-          - control-plane
-          - service-cluster
-    defaults:
-      run:
-        working-directory: ${{ env.COMPONENT_NAME }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: ${{ env.COMPONENT_NAME }}
-      - name: Compile component
-        run: make test -e instance=${{ matrix.instance }}
   golden:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         instance:
-          - defaults
-          - exoscale
-          - cloudscale
-          - openshift
-          - vshn
-          - apiserver
-          - controllers
-          - minio
-          - cloudscale-metrics-collector-cloud
-          - cloudscale-metrics-collector-managed
-          - exoscale-metrics-collector-cloud
-          - exoscale-metrics-collector-managed
-          - control-plane
+          - vshn-cloud
+          - vshn-managed
           - service-cluster
+          - control-plane
+          - defaults
+          - dev
     defaults:
       run:
         working-directory: ${{ env.COMPONENT_NAME }}

diff --git a/Makefile.vars.mk b/Makefile.vars.mk
@@ -46,7 +46,7 @@ KUBENT_IMAGE    ?= ghcr.io/doitintl/kube-no-trouble:latest
 KUBENT_DOCKER   ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=/app/kubent $(KUBENT_IMAGE)
 
 instance ?= defaults
-test_instances = tests/defaults.yml tests/billing.yaml tests/exoscale.yml tests/cloudscale.yml tests/openshift.yml tests/vshn.yml tests/apiserver.yml tests/controllers.yml tests/minio.yml tests/cloudscale-metrics-collector-cloud.yml tests/cloudscale-metrics-collector-managed.yml tests/exoscale-metrics-collector-cloud.yml tests/exoscale-metrics-collector-managed.yml tests/control-plane.yml tests/service-cluster.yml
+test_instances = tests/defaults.yml tests/vshn-cloud.yml tests/vshn-managed.yml tests/control-plane.yml tests/service-cluster.yml tests/dev.yml
 
 YAMLLINT_ARGS   ?= --no-warnings
 YAMLLINT_CONFIG ?= .yamllint.yml

diff --git a/tests/billing.yml b/tests/billing.yml
diff --git a/tests/cloudscale-metrics-collector-cloud.yml b/tests/cloudscale-metrics-collector-cloud.yml
diff --git a/tests/cloudscale-metrics-collector-managed.yml b/tests/cloudscale-metrics-collector-managed.yml
diff --git a/tests/cloudscale.yml b/tests/cloudscale.yml
diff --git a/tests/controllers.yml b/tests/controllers.yml
diff --git a/tests/vshn.yml → tests/dev.yml b/tests/vshn.yml → tests/dev.yml
diff --git a/tests/exoscale-metrics-collector-cloud.yml b/tests/exoscale-metrics-collector-cloud.yml
diff --git a/tests/exoscale-metrics-collector-managed.yml b/tests/exoscale-metrics-collector-managed.yml
diff --git a/tests/exoscale.yml b/tests/exoscale.yml
diff --git a/tests/golden/apiserver/appcat/appcat/statefuleset-resize-controller.yaml b/tests/golden/apiserver/appcat/appcat/statefuleset-resize-controller.yaml