From d43e95e8fbe826143ecd63ba4d00f26afc05909d Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Wed, 16 Jun 2021 21:58:01 +0200
Subject: [PATCH] export env vars befor

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00c18a452..4df93ade8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -307,8 +307,11 @@ setup-openappstack:
     # Set up cluster
     # TODO: I set --no-install-openappstack to skip the old installation procedure, should be removed eventually
     - python3 -m openappstack $HOSTNAME install --install-kubernetes --no-install-openappstack
+    # export IP_ADDRESS and FQDN vars
+    - source clusters/${CI_COMMIT_REF_SLUG}/.cluster.env
     - cp install/.env.example  clusters/${CI_COMMIT_REF_SLUG}/.env
-    - sed "s/1.2.3.4/$IP_ADDRESS/; s/example.org/$FQDN/" clusters/${CI_COMMIT_REF_SLUG}/.env
+    - sed -i "s/1.2.3.4/$IP_ADDRESS/; s/example.org/$FQDN/" clusters/${CI_COMMIT_REF_SLUG}/.env
+    - cat clusters/${CI_COMMIT_REF_SLUG}/.env
     - source clusters/${CI_COMMIT_REF_SLUG}/.env
     - install/install-openappstack.sh
     # TODO: Should also be removed or made up-to-date
-- 
GitLab