diff --git a/.travis.yml b/.travis.yml index 8b8425507a..1f6c776058 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,8 @@ jobs: if: (branch = master AND env(COMPONENT) != "docs") OR (type = pull_request AND commit_message !~ /(skip-e2e)/) before_script: - sudo mkdir -p /home/travis/.kube/ && sudo chmod 777 /home/travis/.kube/ - - curl -sSL -o kubectl https://storage.googleapis.com/kubernetes-release/release/v1.13.4/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/ - - curl -sSL -o kind https://github.com/kubernetes-sigs/kind/releases/download/0.2.0/kind-linux-amd64 && chmod +x kind && sudo mv kind /usr/local/bin/ + - curl -sSL -o kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/ + - curl -sSL -o kind https://github.com/kubernetes-sigs/kind/releases/download/0.2.1/kind-linux-amd64 && chmod +x kind && sudo mv kind /usr/local/bin/ - make e2e-test-image script: - test/e2e/run.sh diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh index cd9cc0f198..d90f230c07 100755 --- a/build/go-in-docker.sh +++ b/build/go-in-docker.sh @@ -40,7 +40,7 @@ if [ "$missing" = true ];then exit 1 fi -E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04172019-3fa3923cb +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v05062019-b4f2880ee DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 8dc2fbf708..712c688fbc 100644 --- a/images/e2e/Dockerfile +++ b/images/e2e/Dockerfile @@ -25,9 +25,9 @@ RUN clean-install \ python \ pkg-config -ENV GOLANG_VERSION 1.12.4 +ENV GOLANG_VERSION 1.12.5 ENV GO_ARCH linux-amd64 -ENV GOLANG_SHA d7d1f1f88ddfe55840712dc1747f37a790cbcaa448f6c9cf51bbe10aa65442f5 +ENV GOLANG_SHA aea86e3c73495f205929cfebba0d63f1382c8ac59be081b6351681415f4063cf RUN set -eux; \ url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \ @@ -63,5 +63,5 @@ RUN luarocks install luacheck \ RUN go get github.com/onsi/ginkgo/ginkgo \ && go get golang.org/x/lint/golint -RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/kubectl \ +RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl \ && chmod +x /usr/local/bin/kubectl diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index 2b0297b915..efc9813114 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v04172019-3fa3923cb AS BASE +FROM quay.io/kubernetes-ingress-controller/e2e:v05062019-b4f2880ee AS BASE FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1 @@ -9,7 +9,7 @@ RUN clean-install \ tzdata RUN curl -Lo /usr/local/bin/kubectl \ - https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/kubectl \ + https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl \ && chmod +x /usr/local/bin/kubectl COPY --from=BASE /go/bin/ginkgo /usr/local/bin/