From d15fff4b85a215e7b7e69165e0c051090b92a8d8 Mon Sep 17 00:00:00 2001
From: Anton Belodedenko <2033996+ab77@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:09:18 -0700
Subject: [PATCH] add verbose

---
 .github/workflows/tests.yml | 9 +++++++--
 Makefile                    | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f51d5dda2..d8b49bae2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -840,10 +840,13 @@ jobs:
         CMDS="set -ax \
           && cloud-init status --wait --long && cat </var/log/cloud-init-output.log \
           && sudo -u balena git clone https://token:${{ steps.ephemeral.outputs.token }}/${{ github.repository }}.git /home/balena/open-balena \
+          && sudo -u balena git config --global --add safe.directory /home/balena/open-balena \
           && cd /home/balena/open-balena \
-          && sudo -u balena git checkout ${COMMIT}
+          && sudo -u balena git checkout ${COMMIT} \
+          && sleep infinity \
           && source /root/.env \
-          && sudo -Eu balena make up \
+          && sed -i '/^version:.*/d' docker-compose.yml \
+          && sudo -u balena --preserve-env=DNS_TLD,VERBOSE,PRODUCTION_MODE make up \
           && sudo -u balena make self-signed \
           && sudo -u balena make verify \
           && sudo -u balena make restart \
@@ -852,6 +855,8 @@ jobs:
 
 
 
+
+
         # https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-getting-started-enable-ssh-connections.html
         cat << EOF > "${HOME}/.ssh/config"
         host i-*
diff --git a/Makefile b/Makefile
index 4d7ed1003..ddb21f20f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ STAGING_PKI ?= /usr/local/share/ca-certificates
 PRODUCTION_MODE ?= true
 ORG_UNIT ?= openBalena
 SUPERUSER_EMAIL ?= admin@$(DNS_TLD)
+VERBOSE ?= false
 
 .NOTPARALLEL: $(DOCKERCOMPOSE)
 
@@ -43,6 +44,7 @@ endif
 	@echo "ORG_UNIT=$(ORG_UNIT)" >> .env
 	@echo "SUPERUSER_EMAIL=$(SUPERUSER_EMAIL)" >> .env
 	@echo "PRODUCTION_MODE=$(PRODUCTION_MODE)" >> .env
+	@echo "VERBOSE=$(VERBOSE)" >> .env
 ifneq ($(GANDI_API_TOKEN),)
 	@echo "GANDI_API_TOKEN=$(GANDI_API_TOKEN)" >> .env
 endif