Refactor tests

db-operator · Jan 14, 2024 · e869872 · e869872
1 parent 0b43ebf
commit e869872
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 27 deletions.
diff --git a/charts/db-operator/ci/0-crds-test-values.yaml b/charts/db-operator/ci/0-crds-test-values.yaml
@@ -2,8 +2,7 @@ reconcileInterval: "10"
 crds:
   keep: false
 tests:
-  scripts:
-    enabled: true
+  enabled:
+    - crds
   crds:
-    enabled: true
     installed: true
diff --git a/charts/db-operator/ci/0-nocrds-test-values.yaml b/charts/db-operator/ci/0-nocrds-test-values.yaml
@@ -3,8 +3,7 @@ crds:
   keep: false
   install: false
 tests:
-  scripts:
-    enabled: true
+  enabled:
+    - crds
   crds:
-    enabled: true
     installed: false
diff --git a/charts/db-operator/ci/1-mysql-test-values.yaml b/charts/db-operator/ci/1-mysql-test-values.yaml
@@ -4,8 +4,9 @@ crds:
   keep: false
 
 tests:
+  enabled:
+    - mysql
   mysql:
-    enabled: true
     admin:
       password: 123123!!
       user: root

diff --git a/charts/db-operator/ci/1-postgresql-test-values.yaml b/charts/db-operator/ci/1-postgresql-test-values.yaml
@@ -4,8 +4,9 @@ crds:
   keep: false
 
 tests:
+  enabled: 
+    - postgresql
   postgresql:
-    enabled: true
     admin:
       password: 123123!!
       user: postgres

diff --git a/charts/db-operator/ci/2-gsql-test-values.yaml b/charts/db-operator/ci/2-gsql-test-values.yaml
@@ -32,10 +32,9 @@ secrets:
       }
 
 tests:
-  scripts:
-    enabled: true
+  enabled:
+    - gsql
   gsql:
-    enabled: true
     cloudishSQL:
       image:
         repository: ghcr.io/db-operator/cloudish-sql

diff --git a/charts/db-operator/templates/test/crds-test.yaml b/charts/db-operator/templates/test/crds-test.yaml
@@ -1,5 +1,5 @@
 {{- $version := semver .Capabilities.KubeVersion.Version }}
-{{- if .Values.tests.crds.enabled }}
+{{- if has "crds" .Values.tests.enabled }} 
 # ---------------------------------------------------------------------
 # -- Test that CRDs are installed
 # ---------------------------------------------------------------------

diff --git a/charts/db-operator/templates/test/gsql_test.yaml b/charts/db-operator/templates/test/gsql_test.yaml
@@ -1,5 +1,5 @@
 {{- $version := semver .Capabilities.KubeVersion.Version }}
-{{- if .Values.tests.gsql.enabled }}
+{{- if has "gsql" .Values.tests.enabled }} 
 # ---------------------------------------------------------------------
 # -- Test Google API requests with cloudish-sql
 # -- https://github.com/db-operator/cloudish-sql

diff --git a/charts/db-operator/templates/test/mysql-test.yaml b/charts/db-operator/templates/test/mysql-test.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.tests.mysql.enabled }}
+{{- if has "mysql" .Values.tests.enabled }} 
 ---
 apiVersion: v1
 kind: Secret

diff --git a/charts/db-operator/templates/test/postgres-test.yaml b/charts/db-operator/templates/test/postgres-test.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.tests.postgresql.enabled }}
+{{- if has "postgresql" .Values.tests.enabled }} 
 ---
 apiVersion: v1
 kind: Secret
@@ -180,4 +180,4 @@ spec:
         name: {{ template "db-operator.name" . }}-postgresql-test-script
     - name: shared-data
       emptyDir: {}
-{{- end }}
+{{- end }}
diff --git a/charts/db-operator/templates/test/test-scripts.yaml b/charts/db-operator/templates/test/test-scripts.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.tests.scripts.enabled }}
+{{- if or (has "crds" .Values.tests.enabled) (has "gsql" .Values.tests.enabled) }} 
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/charts/db-operator/values.yaml b/charts/db-operator/values.yaml
@@ -157,16 +157,7 @@ service:
 # -- These values are used in tests, they should not affect users
 # ---------------------------------------------------------------------
 tests:
-  scripts:
-    enabled: false
-  gsql:
-    enabled: false
-  mysql:
-    enabled: false
-  postgresql:
-    enabled: false
-  crds:
-    enabled: false
+  enabled: [] 
   attempts:
     amount: 10
     timeout: 30