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

Merge pull request #1834 from crazy-max/fix-ci-cache 

Fix cache for CI
v0.8
Tõnis Tiigi 2020-11-24 11:58:48 -08:00 committed by GitHub
parent bdfc5d9511 bade6e1b3d
commit b0ed56c6d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hack/test
View File

@ -3,6 +3,7 @@
. $(dirname $0)/util . $(dirname $0)/util
set -eu -o pipefail set -eu -o pipefail
: ${TRAVIS=}
: ${TEST_INTEGRATION=} : ${TEST_INTEGRATION=}
: ${TEST_GATEWAY=} : ${TEST_GATEWAY=}
: ${TEST_DOCKERFILE=} : ${TEST_DOCKERFILE=}
@ -17,12 +18,17 @@ if [ "$TEST_DOCKERD" == "1" ] && ! file $TEST_DOCKERD_BINARY | grep "statically
exit 1 exit 1
fi fi
importMasterCacheFlags=""
if [ "$TRAVIS" = "true" ]; then
importMasterCacheFlags="--cache-from=type=registry,ref=cicache.buildk.it/moby/buildkit/master:integration-tests"
fi
importCacheFlags="" importCacheFlags=""
if [ -n "$cacheref" ]; then if [ -n "$cacheref" ]; then
if [ "$cachetype" = "local" ]; then if [ "$cachetype" = "local" ]; then
importCacheFlags="--cache-from=type=local,src=$cacheref" importCacheFlags="--cache-from=type=local,src=$cacheref "
else else
importCacheFlags="--cache-from=type=registry,ref=cicache.buildk.it/moby/buildkit/master:integration-tests --cache-from=type=registry,ref=$cacheref:integration-tests" importCacheFlags="--cache-from=type=registry,ref=$cacheref:integration-tests "
fi fi
fi fi
@ -58,7 +64,7 @@ if [ "$TEST_COVERAGE" = "1" ]; then
coverageFlags="-coverprofile=/coverage/coverage.txt -covermode=atomic" coverageFlags="-coverprofile=/coverage/coverage.txt -covermode=atomic"
fi fi
buildxCmd build $importCacheFlags \ buildxCmd build $importMasterCacheFlags $importCacheFlags \
--target "integration-tests" \ --target "integration-tests" \
--output "type=docker,name=$iid" \ --output "type=docker,name=$iid" \
$currentcontext $currentcontext