提交 5659a1df 编写于 作者: P Priya Wadhwa

Remove cloudbuild stuff, run preload generation in jenkins

上级 2778bd1c
...@@ -523,10 +523,6 @@ kic-base-image: ## builds the base image used for kic. ...@@ -523,10 +523,6 @@ kic-base-image: ## builds the base image used for kic.
docker rmi -f $(REGISTRY)/kicbase:$(KIC_VERSION)-snapshot || true docker rmi -f $(REGISTRY)/kicbase:$(KIC_VERSION)-snapshot || true
docker build -f ./hack/images/kicbase.Dockerfile -t $(REGISTRY)/kicbase:$(KIC_VERSION)-snapshot --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) --target base . docker build -f ./hack/images/kicbase.Dockerfile -t $(REGISTRY)/kicbase:$(KIC_VERSION)-snapshot --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) --target base .
.PHONY: preload-generator-image
preload-generator-image:
docker build -t gcr.io/k8s-minikube/preload-generator -f deploy/preload/Dockerfile deploy/preload
.PHONY: upload-preloaded-images-tar .PHONY: upload-preloaded-images-tar
upload-preloaded-images-tar: out/minikube # Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS. upload-preloaded-images-tar: out/minikube # Upload the preloaded images for oldest supported, newest supported, and default kubernetes versions to GCS.
go run ./hack/preload-images/*.go go run ./hack/preload-images/*.go
......
steps:
- image: gcr.io/cloud-builders/docker
args: ["build", "-t", "preload-generator", "-f", "deploy/preload/Dockerfile", "deploy/preload"]
- image: preload-generator
...@@ -39,7 +39,7 @@ declare -rx TAG="${ghprbActualCommit}" ...@@ -39,7 +39,7 @@ declare -rx TAG="${ghprbActualCommit}"
docker kill $(docker ps -q) || true docker kill $(docker ps -q) || true
docker rm $(docker ps -aq) || true docker rm $(docker ps -aq) || true
make -j 16 all && failed=$? || failed=$? make -j 16 all && failed=$? || failed=$?
"out/minikube-$(go env GOOS)-$(go env GOARCH)" version "out/minikube-$(go env GOOS)-$(go env GOARCH)" version
......
# Copyright 2020 The Kubernetes Authors All rights reserved. #!/bin/bash
# Copyright 2016 The Kubernetes Authors All rights reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -12,36 +14,15 @@ ...@@ -12,36 +14,15 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Download gcloud # This script builds all the minikube binary for all 3 platforms as well as Windows-installer and .deb
FROM alpine:3.10 as download-gcloud # This is intended to be run on a new release tag in order to build/upload the required files for a release
ENV GCLOUD_VERSION 276.0.0
ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-x86_64.tar.gz
RUN wget -O gcloud.tar.gz "${GCLOUD_URL}"
RUN tar -zxf gcloud.tar.gz
FROM gcr.io/gcp-runtimes/ubuntu_16_0_4
# Install python and make
RUN apt-get update && \
apt-get install --no-install-recommends --no-install-suggests -y \
python make && \
rm -rf /var/lib/apt/lists/*
# Install docker
COPY --from=docker:18.09.6 /usr/local/bin/docker /usr/local/bin/
# Install gcloud dependencies set -eux -o pipefail
COPY --from=download-gcloud google-cloud-sdk/ /google-cloud-sdk/
# Finish installation of gcloud
RUN CLOUDSDK_PYTHON="python2.7" /google-cloud-sdk/install.sh \
--usage-reporting=false \
--bash-completion=false \
--disable-installation-options
ENV PATH=$PATH:/google-cloud-sdk/bin
RUN gcloud auth configure-docker
# Install go # Make sure the right golang version is installed based on Makefile
COPY --from=golang:1.14 /usr/local/go /usr/local/go WANT_GOLANG_VERSION=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }')
ENV PATH=$PATH:/usr/local/go/bin ./hack/jenkins/installers/check_install_golang.sh $WANT_GOLANG_VERSION /usr/local
CMD make upload-preloaded-images-tar make upload-preloaded-images-tar
make clean
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册