From 48c58c1e12116589cd0af49d3d1c48948cc75b70 Mon Sep 17 00:00:00 2001
From: Philip Gaber <gaber@b1-systems.de>
Date: Wed, 16 Jul 2025 12:04:54 +0200
Subject: [PATCH] fix: Manually gather files from default first

---
 .gitlab-ci.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46296b5d..482bb63f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -292,9 +292,16 @@ db-cleanup:
           exit 1
           ;;
       esac
-    # Gather all files that contain the "database:" keyword
-    # Because of the fact that default < dev, this behaves like the statement before (overwrite)
-    - "export FILES=$(grep -r \"databases:\" \"${CI_PROJECT_DIR}/helmfile/environments/\" | awk -F ':' '{print $1}')"
+    # First: Gather all files that contain the "database:" keyword in the default environment
+    - |
+      export FILES="$(grep -r 'databases:' "${CI_PROJECT_DIR}/helmfile/environments/default" |
+                      awk -F ':' '{print $1}')"
+    # Second: Gather all files that contain the "database:" keyword in the dev environment
+    # where the adjustments from opendesk-env are placed
+    - |
+      export FILES="${FILES} $(grep -r 'databases:' "${CI_PROJECT_DIR}/helmfile/environments/dev" |
+                               awk -F ':' '{print $1}')"
+    - echo "${FILES[@]}"
     # Cleanup MariaDB
     - "export MARIADB_HOST=\"\""
     - "export MARIADB_PORT=\"\""