dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-08-09 01:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix cache for CI
This commit is contained in:
Tõnis Tiigi
2020-11-24 11:58:48 -08:00
committed by GitHub
parent bdfc5d9511 bade6e1b3d
commit b0ed56c6d0
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hack/test
View File

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