OZG-3034 OZG-6684 CR changes

src/test/helm/deployment_alfa_host_test.yaml

@@ -29,13 +29,15 @@ release:
 templates:
   - templates/deployment.yaml
 set:
-  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
-    bezeichner: helm
   imagePullSecret: test-image-pull-secret
 tests:
   - it: should set the alfa host
+    set:
+      baseUrl: test.sh.ozg-cloud.de
+      ozgcloud:
+        bezeichner: helm
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -44,6 +46,9 @@ tests:
             value: https://helm.test.sh.ozg-cloud.de
   - it: should use alfa host from values
     set:
+      baseUrl: test.sh.ozg-cloud.de
+      ozgcloud:
+        bezeichner: helm
       alfaHost: https://hamburg.mein-kreis.de
     asserts:
       - contains:
@@ -51,3 +56,16 @@ tests:
           content:
             name: ozgcloud_alfa_host
             value: https://hamburg.mein-kreis.de
+  - it: should fail if bezeichner is not set
+    set:
+      baseUrl: test.sh.ozg-cloud.de
+    asserts:
+      - failedTemplate:
+          errorMessage: "ozgcloud.bezeichner must be set"
+  - it: should fail if base url is not set
+    set:
+      ozgcloud:
+        bezeichner: helm
+    asserts:
+      - failedTemplate:
+          errorMessage: "baseUrl must be set"

src/test/helm/deployment_test_ozgcloud_base_values_test.yaml

@@ -31,36 +31,19 @@ templates:
 set:
   baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
-    environment: dev
     bezeichner: helm
-  imagePullSecret: test-image-pull-secret
 tests:
   - it: should fail on missing environment
     set:
-      ozgcloud:
-        environment:
+      imagePullSecret: test-image-pull-secret
     asserts:
       - failedTemplate:
           errorMessage: ozgcloud.environment must be set
-  - it: should fail on missing imagePullSecret
-    set:
-      imagePullSecret:
-    asserts:
-      - failedTemplate:
-          errorMessage: imagePullSecret must be set
-  - it: should fail if bezeichner is not set
+  - it: should not fail on not missing environment and not missing imagepullsecret
     set:
       ozgcloud:
-        bezeichner:
-    asserts:
-      - failedTemplate:
-          errorMessage: "ozgcloud.bezeichner must be set"
-  - it: should fail if base url is not set
-    set:
-      baseUrl:
-    asserts:
-      - failedTemplate:
-          errorMessage: "baseUrl must be set"
-  - it: should not fail on not missing required values
+        environment: dev
+      imagePullSecret: test-image-pull-secret
     asserts:
       - notFailedTemplate: {}
+