diff --git a/.github/workflows/az-e2e.yaml b/.github/workflows/az-e2e.yaml index 2c08b344..d5efa8ec 100644 --- a/.github/workflows/az-e2e.yaml +++ b/.github/workflows/az-e2e.yaml @@ -25,7 +25,7 @@ jobs: sudo apt-get install -y ansible python-is-python3 - name: Run e2e tests - continue-on-error: true + continue-on-error: false run: | cd tests/e2e export PATH="$PATH:/usr/local/bin" diff --git a/tests/e2e/cluster/up.sh b/tests/e2e/cluster/up.sh index 1a414223..b30da584 100755 --- a/tests/e2e/cluster/up.sh +++ b/tests/e2e/cluster/up.sh @@ -52,16 +52,29 @@ configure_flannel() { main() { init_kubeadm + echo __INIT__ configure_flannel + echo __FLANNEL__ + echo NODES + kubectl get nodes -o wide + echo "HOSTNAME: $(hostname)" + echo "ALL_HOSTNAME: $(hostname -A)" + echo ALL + kubectl get all -A + echo hosts + cat /etc/hosts check_node_is_ready + echo __CHECK_NODE_IS_READY__ # Untaint the node so that pods can be scheduled on it. for role in master control-plane; do - kubectl taint nodes "$(hostname)" \ + kubectl taint nodes "$(hostname | tr '[:upper:]' '[:lower:]')" \ "node-role.kubernetes.io/$role:NoSchedule-" done + echo __TAINTED__ - kubectl label node "$(hostname)" node.kubernetes.io/worker= + kubectl label node "$(hostname | tr '[:upper:]' '[:lower:]')" node.kubernetes.io/worker= + echo __LABELED__ } main "$@" diff --git a/tests/e2e/operator.sh b/tests/e2e/operator.sh index 9806156e..52bc8eac 100755 --- a/tests/e2e/operator.sh +++ b/tests/e2e/operator.sh @@ -86,9 +86,9 @@ install_operator() { # The node should be 'worker' labeled local label="node.kubernetes.io/worker" - if ! kubectl get node "$(hostname)" -o jsonpath='{.metadata.labels}' \ + if ! kubectl get node "$(hostname | tr '[:upper:]' '[:lower:]')" -o jsonpath='{.metadata.labels}' \ | grep -q "$label"; then - kubectl label node "$(hostname)" "$label=" + kubectl label node "$(hostname | tr '[:upper:]' '[:lower:]')" "$label=" fi handle_older_containerd