From a90c4410958d39e7f7fc373e22e170337fe0f96b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 12 Mar 2024 06:30:21 -0400 Subject: [PATCH] tests: run tests with a specified server ip --- .github/commands/ci-setup | 1 + tests/unit/test_helper.bash | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/commands/ci-setup b/.github/commands/ci-setup index f756adff8..4c33bd55e 100755 --- a/.github/commands/ci-setup +++ b/.github/commands/ci-setup @@ -7,6 +7,7 @@ DOKKU_DOMAIN=${DOKKU_DOMAIN:="dokku.me"} echo "=====> set hostname" hostname internal_ip="$(ifconfig eth0 | grep 'inet ' | awk '{print $2}')" +echo "CI_SERVER_IP=${internal_ip}" >>"$GITHUB_ENV" sudo hostname "$DOKKU_DOMAIN" echo "$DOKKU_DOMAIN" | sudo tee /etc/hostname hostname diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash index b141fd437..59930cdb2 100644 --- a/tests/unit/test_helper.bash +++ b/tests/unit/test_helper.bash @@ -655,18 +655,20 @@ install_k3s() { assert_output_contains "Login Succeeded" INGRESS_CLASS="${INGRESS_CLASS:-traefik}" + local args="--ingress-class $INGRESS_CLASS" if [[ "$TAINT_SCHEDULING" == "true" ]]; then - run /bin/bash -c "dokku scheduler-k3s:initialize --ingress-class $INGRESS_CLASS --taint-scheduling" - echo "output: $output" - echo "status: $status" - assert_success - else - run /bin/bash -c "dokku scheduler-k3s:initialize --ingress-class $INGRESS_CLASS" - echo "output: $output" - echo "status: $status" - assert_success + args="$args --taint-scheduling" fi + if [[ -n "$CI_SERVER_IP" ]]; then + args="$args --server-ip $CI_SERVER_IP" + fi + + run /bin/bash -c "dokku scheduler-k3s:initialize ${args}" + echo "output: $output" + echo "status: $status" + assert_success + sleep 20 }