这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/commands/ci-setup
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 11 additions & 9 deletions tests/unit/test_helper.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down