Reworking tests, green now

stackabletech · Aug 26, 2024 · 4931d73 · 4931d73
1 parent c1348af
commit 4931d73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2
@@ -48,20 +48,17 @@ spec:
     configOverrides:
       webserver_config.py:
         EXPERIMENTAL_FILE_HEADER: |
-          COMMON_HEADER_VAR = '"role-value"' # overridden by role group below
-          ROLE_HEADER_VAR = '"role-value"' # only defined here at role level
+          COMMON_HEADER_VAR = "role-value"
+          ROLE_HEADER_VAR = "role-value"
         EXPERIMENTAL_FILE_FOOTER: |
-          COMMON_FOOTER_VAR = '"role-value"' # overridden by role group below
-          ROLE_FOOTER_VAR = '"role-value"' # only defined here at role level
+          ROLE_FOOTER_VAR = "role-value"
     roleGroups:
       default:
         replicas: 1
         configOverrides:
           webserver_config.py:
             EXPERIMENTAL_FILE_HEADER: |
-              COMMON_HEADER_VAR = '"group-value"' # overridden by role group below
-            EXPERIMENTAL_FILE_FOOTER: |
-              COMMON_FOOTER_VAR = '"group-value"' # overridden by role group below
+              COMMON_HEADER_VAR = "group-value"
 {% if test_scenario['values']['executor'] == 'celery' %}
   celeryExecutors:
     config:

diff --git a/tests/templates/kuttl/smoke/41-assert.yaml b/tests/templates/kuttl/smoke/41-assert.yaml
@@ -8,8 +8,4 @@ commands:
   #
   - script: |
       kubectl -n $NAMESPACE get cm airflow-webserver-default -o yaml | yq -e '.data."webserver_config.py"' | grep "COMMON_HEADER_VAR = \"group-value\""
-      kubectl -n $NAMESPACE get cm airflow-webserver-default -o yaml | yq -e '.data."webserver_config.py"' | grep "GROUP_HEADER_VAR = \"group-value\""
-      kubectl -n $NAMESPACE get cm airflow-webserver-default -o yaml | yq -e '.data."webserver_config.py"' | grep "ROLE_HEADER_VAR = \"role-value\""
-      kubectl -n $NAMESPACE get cm airflow-webserver-default -o yaml | yq -e '.data."webserver_config.py"' | grep "COMMON_FOOTER_VAR = \"group-value\""
-      kubectl -n $NAMESPACE get cm airflow-webserver-default -o yaml | yq -e '.data."webserver_config.py"' | grep "GROUP_FOOTER_VAR = \"group-value\""
       kubectl -n $NAMESPACE get cm airflow-webserver-default -o yaml | yq -e '.data."webserver_config.py"' | grep "ROLE_FOOTER_VAR = \"role-value\""