From 160d66586d91a10ed05501b3dca92514e38d99ba Mon Sep 17 00:00:00 2001 From: moabu <47318409+moabu@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:43:32 +0300 Subject: [PATCH] ci: fix override on runnign tests and registered FQDN Signed-off-by: moabu <47318409+moabu@users.noreply.github.com> --- .github/workflows/test_docker_linux_installer.yml | 3 +-- automation/startjanssenmonolithdemo.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_docker_linux_installer.yml b/.github/workflows/test_docker_linux_installer.yml index 2e9ef08515e..d3214f714ae 100644 --- a/.github/workflows/test_docker_linux_installer.yml +++ b/.github/workflows/test_docker_linux_installer.yml @@ -61,8 +61,7 @@ jobs: run: | ip=$(ifconfig eth0 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1') sudo chmod u+x automation/startjanssenmonolithdemo.sh - export RUN_TESTS=true - sudo bash ./automation/startjanssenmonolithdemo.sh "demoexample.jans.io" "${{ matrix.persistence-backends }}" "${ip}" "${{ github.sha }}" + sudo RUN_TESTS=true bash ./automation/startjanssenmonolithdemo.sh "demoexample.jans.io" "${{ matrix.persistence-backends }}" "${ip}" "${{ github.sha }}" persistence=$(echo "${{ matrix.persistence-backends }}" | tr '[:upper:]' '[:lower:]') mv /tmp/reports /${{ matrix.persistence-backends }}-reports diff --git a/automation/startjanssenmonolithdemo.sh b/automation/startjanssenmonolithdemo.sh index 814948e63c5..89888cc4a79 100644 --- a/automation/startjanssenmonolithdemo.sh +++ b/automation/startjanssenmonolithdemo.sh @@ -6,8 +6,8 @@ JANS_PERSISTENCE=$2 EXT_IP=$3 # commit to build jans off JANS_BUILD_COMMIT=$4 -IS_FQDN_REGISTERED="" -RUN_TESTS="" +: "${IS_FQDN_REGISTERED:=}" +: "${RUN_TESTS:=}" if [[ ! "$JANS_FQDN" ]]; then read -rp "Enter Hostname [demoexample.jans.io]: " JANS_FQDN fi