openshift/source-to-image
1
0
Fork 0
mirror of https://github.com/openshift/source-to-image.git synced 2026-02-05 12:44:54 +01:00
Code Issues Releases Activity

Add exclude_graphdriver_devicemapper and exclude_graphdriver_btrfs build tags

Browse Source
This commit is contained in:
Igor Sutton Lopes
2020-02-11 12:40:43 +01:00
parent 820f21584e
commit 98b1e01118
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/test-docker.sh
View File

@@ -24,4 +24,4 @@ echo
echo "Running docker integration tests ..."
echo
S2I_TIMEOUT="-timeout 600s" "${S2I_ROOT}/hack/test-go.sh" test/integration/docker -v -tags "integration" "${@:1}"
S2I_BUILD_TAGS="integration" S2I_TIMEOUT="-timeout 600s" "${S2I_ROOT}/hack/test-go.sh" test/integration/docker -v "${@:1}"

2
hack/test-dockerfile.sh
View File

@@ -17,4 +17,4 @@ echo
echo "Running dockerfile integration tests ..."
echo
S2I_TIMEOUT="-timeout 600s" "${S2I_ROOT}/hack/test-go.sh" test/integration/dockerfile -v -tags "integration" "${@:1}"
S2I_BUILD_TAGS="integration" S2I_TIMEOUT="-timeout 600s" "${S2I_ROOT}/hack/test-go.sh" test/integration/dockerfile -v "${@:1}"

5
hack/test-go.sh
View File

@@ -28,6 +28,7 @@ find_test_dirs() {
S2I_RACE=${S2I_RACE--race}
S2I_COVER=${S2I_COVER--cover}
S2I_TIMEOUT=${S2I_TIMEOUT--timeout 60s}
S2I_BUILD_TAGS=""
if [ "${1-}" != "" ]; then
test_packages="$S2I_GO_PACKAGE/$1"
@@ -49,7 +50,7 @@ if [[ -n "${OUTPUT_COVERAGE}" ]]; then
fi
S2I_COVER_PROFILE="-coverprofile=${PROFILEPATH}"
go test $S2I_RACE $S2I_TIMEOUT $S2I_COVER "$S2I_COVER_PROFILE" "$test_package" "${@:2}"
go test -tags "$S2I_BUILD_TAGS exclude_graphdriver_devicemapper exclude_graphdriver_btrfs" $S2I_RACE $S2I_TIMEOUT $S2I_COVER "$S2I_COVER_PROFILE" "$test_package" "${@:2}"
done
echo 'mode: atomic' > ${OUTPUT_COVERAGE}/profiles.out
@@ -66,5 +67,5 @@ if [[ -n "${OUTPUT_COVERAGE}" ]]; then
# remove ${OUTPUT_COVERAGE}/github.com
rm -rf $OUTPUT_COVERAGE/${S2I_GO_PACKAGE%%/*}
else
go test $S2I_RACE $S2I_TIMEOUT $S2I_COVER "${@:2}" $test_packages
go test -tags "$S2I_BUILD_TAGS exclude_graphdriver_devicemapper exclude_graphdriver_btrfs" $S2I_RACE $S2I_TIMEOUT $S2I_COVER "${@:2}" $test_packages
fi

2
hack/verify-govet.sh
View File

@@ -15,7 +15,7 @@ FAILURE=false
test_dirs=$(s2i::util::find_files | cut -d '/' -f 1-2 | sort -u)
for test_dir in $test_dirs
do
if ! go vet $test_dir
if ! go vet -tags "exclude_graphdriver_devicemapper exclude_graphdriver_btrfs" $test_dir
then
FAILURE=true
fi