e6538b8bce
The cri-integration.sh script sets errexit option. This does not work properly on Bash in Windows, espectially when the script is piped to something else ( tee in this case ). In this particular case, the problem arises from the fact that if the script exits prematurely, it will not get a chance to call test_teardown and thus clean the remaining containerd process, thus the whole command will hang indefinetly. Adding a simple trap on EXIT to call test_teardown will easily fix this. Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
52 lines
1.4 KiB
Bash
Executable File
52 lines
1.4 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Copyright The containerd Authors.
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
set -o errexit
|
|
set -o nounset
|
|
set -o pipefail
|
|
|
|
basedir="$(dirname "${BASH_SOURCE[0]}")"
|
|
source "${basedir}/utils.sh"
|
|
|
|
trap test_teardown EXIT
|
|
|
|
ROOT="$( cd "${basedir}" && pwd )"/../..
|
|
cd "${ROOT}"
|
|
|
|
# FOCUS focuses the test to run.
|
|
FOCUS=${FOCUS:-""}
|
|
# REPORT_DIR is the the directory to store test logs.
|
|
REPORT_DIR=${REPORT_DIR:-"/tmp/test-integration"}
|
|
# RUNTIME is the runtime handler to use in the test.
|
|
RUNTIME=${RUNTIME:-""}
|
|
|
|
CRI_ROOT="${CONTAINERD_ROOT}/io.containerd.grpc.v1.cri"
|
|
|
|
mkdir -p "${REPORT_DIR}"
|
|
test_setup "${REPORT_DIR}"
|
|
|
|
# Run integration test.
|
|
${sudo} bin/cri-integration.test --test.run="${FOCUS}" --test.v \
|
|
--cri-endpoint="${CONTAINERD_SOCK}" \
|
|
--cri-root="${CRI_ROOT}" \
|
|
--runtime-handler="${RUNTIME}" \
|
|
--containerd-bin="${CONTAINERD_BIN}" \
|
|
--image-list="${TEST_IMAGE_LIST:-}"
|
|
|
|
test_exit_code=$?
|
|
|
|
exit ${test_exit_code}
|