Merge pull request #23020 from medyagh/avoid_gsutilconflict

infra: Isolate `gsutil` State Directory to Prevent Resumable Upload Conflicts

Author: medyagh

hack/jenkins/common.sh

@@ -32,6 +32,14 @@ readonly OS_ARCH="${OS}-${ARCH}"
 readonly TEST_ROOT="${HOME}/minikube-integration"
 readonly TEST_HOME="${TEST_ROOT}/${MINIKUBE_LOCATION}-$$"
 
+# Set up isolated gsutil state directory to avoid resumable upload/download conflicts
+mkdir -p "${TEST_HOME}/.gsutil_state"
+cat <<EOF > "${TEST_HOME}/.gsutil_boto"
+[GSUtil]
+state_dir = ${TEST_HOME}/.gsutil_state
+EOF
+export BOTO_PATH="${TEST_HOME}/.gsutil_boto:${HOME}/.boto"
+
 export GOPATH="$HOME/go"
 export KUBECONFIG="${TEST_HOME}/kubeconfig"
 export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin"

hack/jenkins/minikube_cross_build_and_upload.sh

@@ -25,6 +25,15 @@ set -eux -o pipefail
 
 readonly bucket="minikube-builds"
 
+# Set up isolated gsutil state directory to avoid resumable upload conflicts
+export WORKSPACE_TMP="${WORKSPACE_TMP:-/tmp}"
+mkdir -p "${WORKSPACE_TMP}/.gsutil_state"
+cat <<EOF > "${WORKSPACE_TMP}/.gsutil_boto"
+[GSUtil]
+state_dir = ${WORKSPACE_TMP}/.gsutil_state
+EOF
+export BOTO_PATH="${WORKSPACE_TMP}/.gsutil_boto:${HOME}/.boto"
+
 # Make sure the right golang version is installed based on Makefile
 ./hack/jenkins/installers/check_install_golang.sh /usr/local
 
@@ -52,10 +61,10 @@ make -j 16 \
 && failed=$? || failed=$?
 
 BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version)
-echo ${BUILT_VERSION}
+echo "${BUILT_VERSION}"
 
-COMMIT=$(echo ${BUILT_VERSION} | grep 'commit:' | awk '{print $2}')
-if (echo ${COMMIT} | grep -q dirty); then
+COMMIT=$(echo "${BUILT_VERSION}" | grep 'commit:' | awk '{print $2}')
+if echo "${COMMIT}" | grep -q dirty; then
   echo "'minikube version' reports dirty commit: ${COMMIT}"
   exit 1
 fi

hack/prow/minikube_cross_build.sh

@@ -43,10 +43,10 @@ chmod +x "${MINIKUBE_BIN}" "${E2E_BIN}"
 if [ "${OS}" != "darwin" ]; then
 
 	BUILT_VERSION=$("out/minikube-${OS_ARCH}" version)
-	echo ${BUILT_VERSION}
+	echo "${BUILT_VERSION}"
 
-	COMMIT=$(echo ${BUILT_VERSION} | grep 'commit:' | awk '{print $2}')
-	if (echo ${COMMIT} | grep -q dirty); then
+	COMMIT=$(echo "${BUILT_VERSION}" | grep 'commit:' | awk '{print $2}')
+	if echo "${COMMIT}" | grep -q dirty; then
 		echo "'minikube version' reports dirty commit: ${COMMIT}"
 		exit 1
 	fi