Bump to debian-base 2.0.0 (buster)

This changed `git fetch` to require a `-f` the way we use it.

Also fix a flaky test case for SSH.
This commit is contained in:
Tim Hockin 2020-01-31 09:20:54 -08:00
parent 629c8d2464
commit ef8f5cf703
3 changed files with 3 additions and 2 deletions

View File

@ -36,7 +36,7 @@ ALL_PLATFORMS := linux/amd64 linux/arm linux/arm64 linux/ppc64le linux/s390x
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
BASEIMAGE ?= k8s.gcr.io/debian-base:1.0.0
BASEIMAGE ?= k8s.gcr.io/debian-base:v2.0.0
IMAGE := $(REGISTRY)/$(BIN)
TAG := $(VERSION)__$(OS)_$(ARCH)

View File

@ -480,7 +480,7 @@ func setRepoReady() {
func addWorktreeAndSwap(ctx context.Context, gitRoot, dest, branch, rev string, depth int, hash string) error {
log.V(0).Info("syncing git", "rev", rev, "hash", hash)
args := []string{"fetch", "--tags"}
args := []string{"fetch", "-f", "--tags"}
if depth != 0 {
args = append(args, "--depth", strconv.Itoa(depth))
}

View File

@ -995,6 +995,7 @@ CTR=$(docker run \
-v "$DOT_SSH":/dot_ssh:ro \
-v "$REPO":/src:ro \
e2e/test/test-sshd)
sleep 3 # wait for sshd to come up
IP=$(docker inspect "$CTR" | jq -r .[0].NetworkSettings.IPAddress)
git -C "$REPO" commit -qam "$TESTCASE"
GIT_SYNC \