docker
/
buildx
mirror of https://github.com/docker/buildx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: type integration not needed 

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2023-05-30 00:24:01 +02:00
parent 73c17ef4d2
commit ecf8dd0a26
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -40,8 +40,6 @@ jobs:
- remote - remote
pkg: pkg:
- ./tests - ./tests
typ:
- integration
include: include:
- pkg: ./... - pkg: ./...
skip-integration-tests: 1 skip-integration-tests: 1
@ -66,7 +64,7 @@ jobs:
name: Test name: Test
run: | run: |
export TEST_REPORT_SUFFIX=-${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.worker }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]') export TEST_REPORT_SUFFIX=-${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.worker }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')
./hack/test ${{ matrix.typ }} ./hack/test
env: env:
TEST_DOCKERD: "${{ (matrix.worker == 'docker' || matrix.worker == 'docker-container') && '1' || '0' }}" TEST_DOCKERD: "${{ (matrix.worker == 'docker' || matrix.worker == 'docker-container') && '1' || '0' }}"
TESTFLAGS: "${{ (matrix.worker == 'docker' || matrix.worker == 'docker-container') && env.TESTFLAGS_DOCKER || env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$" TESTFLAGS: "${{ (matrix.worker == 'docker' || matrix.worker == 'docker-container') && env.TESTFLAGS_DOCKER || env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"

25
hack/test
View File

@ -6,11 +6,10 @@ set -eu -o pipefail
: "${CACHE_FROM=}" : "${CACHE_FROM=}"
: "${CACHE_TO=}" : "${CACHE_TO=}"
: ${TEST_INTEGRATION=} : "${TEST_REPORT_SUFFIX=}"
: ${TEST_REPORT_SUFFIX=} : "${TEST_KEEP_CACHE=}"
: ${TEST_KEEP_CACHE=} : "${TEST_DOCKERD=}"
: ${TEST_DOCKERD=} : "${TEST_BUILDKIT_IMAGE=}"
: ${TEST_BUILDKIT_IMAGE=}
if [ -n "$CACHE_FROM" ]; then if [ -n "$CACHE_FROM" ]; then
for cfrom in $CACHE_FROM; do for cfrom in $CACHE_FROM; do
@ -23,20 +22,6 @@ if [ -n "$CACHE_TO" ]; then
done done
fi fi
if [ "$#" == 0 ]; then TEST_INTEGRATION=1; fi
while test $# -gt 0; do
case "$1" in
integration)
TEST_INTEGRATION=1
;;
*)
echo "unknown arg $1"
;;
esac
shift
done
iid="buildx-tests" iid="buildx-tests"
testReportsDir="$(pwd)/bin/testreports" testReportsDir="$(pwd)/bin/testreports"
@ -52,10 +37,8 @@ if ! docker container inspect "$cacheVolume" >/dev/null 2>/dev/null; then
docker create -v /root/.cache -v /root/.cache/registry -v /go/pkg/mod --name "$cacheVolume" alpine docker create -v /root/.cache -v /root/.cache/registry -v /go/pkg/mod --name "$cacheVolume" alpine
fi fi
if [ "$TEST_INTEGRATION" == 1 ]; then
cid=$(docker create --rm -v /tmp $testReportsVol --volumes-from=$cacheVolume -e GITHUB_REF -e TEST_DOCKERD -e TEST_BUILDKIT_IMAGE -e SKIP_INTEGRATION_TESTS -e GOTESTSUM_FORMAT ${BUILDKIT_INTEGRATION_SNAPSHOTTER:+"-eBUILDKIT_INTEGRATION_SNAPSHOTTER"} -e BUILDKIT_REGISTRY_MIRROR_DIR=/root/.cache/registry --privileged $iid gotestsum $gotestsumArgs --packages="${TESTPKGS:-./...}" -- $gotestArgs ${TESTFLAGS:--v}) cid=$(docker create --rm -v /tmp $testReportsVol --volumes-from=$cacheVolume -e GITHUB_REF -e TEST_DOCKERD -e TEST_BUILDKIT_IMAGE -e SKIP_INTEGRATION_TESTS -e GOTESTSUM_FORMAT ${BUILDKIT_INTEGRATION_SNAPSHOTTER:+"-eBUILDKIT_INTEGRATION_SNAPSHOTTER"} -e BUILDKIT_REGISTRY_MIRROR_DIR=/root/.cache/registry --privileged $iid gotestsum $gotestsumArgs --packages="${TESTPKGS:-./...}" -- $gotestArgs ${TESTFLAGS:--v})
docker start -a -i $cid docker start -a -i $cid
fi
if [ "$TEST_KEEP_CACHE" != "1" ]; then if [ "$TEST_KEEP_CACHE" != "1" ]; then
docker rm -v $cacheVolume docker rm -v $cacheVolume