diff --git a/.drone.yml b/.drone.yml index 6c90bac8..97d5aa5d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,7 +32,7 @@ steps: commands: - apk add git bash curl sudo jq make - sleep 5 # give docker enough time to start - - make e2e + - make e2e -e E2E_EXTRA=true # E2E_EXTRA=true enables tests with multiple k3s versions when: event: - push diff --git a/pkg/client/node.go b/pkg/client/node.go index 2a2f732e..1998b423 100644 --- a/pkg/client/node.go +++ b/pkg/client/node.go @@ -244,6 +244,9 @@ func NodeStart(ctx context.Context, runtime runtimes.Runtime, node *k3d.Node, no return nil } + startTime := time.Now() + log.Debugf("Node %s Start Time: %+v", node.Name, startTime) + // execute lifecycle hook actions for _, hook := range nodeStartOpts.NodeHooks { if hook.Stage == k3d.LifecycleStagePreStart { @@ -257,7 +260,6 @@ func NodeStart(ctx context.Context, runtime runtimes.Runtime, node *k3d.Node, no // start the node log.Tracef("Starting node '%s'", node.Name) - startTime := time.Now() if err := runtime.StartNode(ctx, node); err != nil { log.Errorf("Failed to start node '%s'", node.Name) return err diff --git a/tests/dind.sh b/tests/dind.sh index 84963558..25200a7a 100755 --- a/tests/dind.sh +++ b/tests/dind.sh @@ -50,6 +50,7 @@ done if [ -z "$E2E_HELPER_IMAGE_TAG" ]; then docker exec --workdir /src "$k3de2e" make build-helper-images # execute tests + echo "Start time outside runner: $(date)" docker exec "$k3de2e" /src/tests/runner.sh else # execute tests diff --git a/tests/extra_test_k3s_versions.sh b/tests/extra_test_k3s_versions.sh index 43e7510c..8b2288dd 100755 --- a/tests/extra_test_k3s_versions.sh +++ b/tests/extra_test_k3s_versions.sh @@ -3,7 +3,7 @@ CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" [ -d "$CURR_DIR" ] || { echo "FATAL: no current dir (maybe running in zsh?)"; exit 1; } -K3S_VERSIONS=("v1.17.14-k3s2" "v1.18.12-k3s1" "v1.19.2-k3s1" "v1.19.4-k3s1") +K3S_VERSIONS=("v1.17.17-k3s1" "v1.18.15-k3s1" "v1.19.7-k3s1" "v1.20.2-k3s1") FAILED_TESTS=() # shellcheck source=./common.sh @@ -25,11 +25,22 @@ for version in "${K3S_VERSIONS[@]}"; do FAILED_TESTS+=("full_lifecycle: $version") fi + $EXE cluster rm -a || failed "failed to delete clusters" + K3S_IMAGE_TAG="$version" $CURR_DIR/test_multi_master.sh if [[ $? -eq 1 ]]; then FAILED_TESTS+=("multi_master: $version") fi + $EXE cluster rm -a || failed "failed to delete clusters" + + K3S_IMAGE_TAG="$version" $CURR_DIR/test_multi_master_start_stop.sh + if [[ $? -eq 1 ]]; then + FAILED_TESTS+=("multi_master_start_stop: $version") + fi + + $EXE cluster rm -a || failed "failed to delete clusters" + done if [[ ${#FAILED_TESTS[@]} -gt 0 ]]; then diff --git a/tests/runner.sh b/tests/runner.sh index 2a54ff10..fe2a627f 100755 --- a/tests/runner.sh +++ b/tests/runner.sh @@ -18,6 +18,8 @@ info "Preparing filesystem and environment..." mkdir -p $HOME/.kube +echo "Start time inside runner: $(date)" + section "BASIC TESTS" for i in $CURR_DIR/test_*.sh ; do