github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24274 from euank/configurable-release-bucket

Browse Source 
Automatic merge from submit-queue

jenkins: Allow configuration of release bucket

This allows others to leverage the existing E2E code to test some
patched kube binary by simply overriding the bucket and reusing many of
the existing scripts
This commit is contained in:
k8s-merge-robot 2016-04-21 23:09:05 -07:00
commit 19a106f61e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/push-ci-build.sh
View File

@ -40,7 +40,7 @@ KUBE_GCS_NO_CACHING='n'
KUBE_GCS_MAKE_PUBLIC='y' KUBE_GCS_MAKE_PUBLIC='y'
KUBE_GCS_UPLOAD_RELEASE='y' KUBE_GCS_UPLOAD_RELEASE='y'
KUBE_GCS_DELETE_EXISTING='y' KUBE_GCS_DELETE_EXISTING='y'
KUBE_GCS_RELEASE_BUCKET='kubernetes-release' : ${KUBE_GCS_RELEASE_BUCKET:='kubernetes-release'}
KUBE_GCS_RELEASE_PREFIX="ci/${LATEST}" KUBE_GCS_RELEASE_PREFIX="ci/${LATEST}"
KUBE_GCS_PUBLISH_VERSION="${LATEST}" KUBE_GCS_PUBLISH_VERSION="${LATEST}"

4
cluster/gce/util.sh
View File

@ -738,8 +738,8 @@ function create-nodes() {
--template "$template_name" || true; --template "$template_name" || true;
gcloud compute instance-groups managed wait-until-stable \ gcloud compute instance-groups managed wait-until-stable \
"${NODE_INSTANCE_PREFIX}-group-$i" \ "${NODE_INSTANCE_PREFIX}-group-$i" \
--zone "${ZONE}" \ --zone "${ZONE}" \
--project "${PROJECT}" || true; --project "${PROJECT}" || true;
done done
# TODO: We don't add a suffix for the last group to keep backward compatibility when there's only one MIG. # TODO: We don't add a suffix for the last group to keep backward compatibility when there's only one MIG.

8
hack/jenkins/e2e-runner.sh
View File

@ -21,6 +21,8 @@ set -o nounset
set -o pipefail set -o pipefail
set -o xtrace set -o xtrace
: ${KUBE_GCS_RELEASE_BUCKET:="kubernetes-release"}
function running_in_docker() { function running_in_docker() {
grep -q docker /proc/self/cgroup grep -q docker /proc/self/cgroup
} }
@ -46,7 +48,7 @@ function fetch_published_version_tars() {
local -r published_version="${1}" local -r published_version="${1}"
IFS='/' read -a varr <<< "${published_version}" IFS='/' read -a varr <<< "${published_version}"
bucket="${varr[0]}" bucket="${varr[0]}"
build_version=$(gsutil cat gs://kubernetes-release/${published_version}.txt) build_version=$(gsutil cat gs://${KUBE_GCS_RELEASE_BUCKET}/${published_version}.txt)
echo "Using published version $bucket/$build_version (from ${published_version})" echo "Using published version $bucket/$build_version (from ${published_version})"
fetch_tars_from_gcs "${bucket}" "${build_version}" fetch_tars_from_gcs "${bucket}" "${build_version}"
unpack_binaries unpack_binaries
@ -66,8 +68,8 @@ function fetch_tars_from_gcs() {
local -r build_version="${2}" local -r build_version="${2}"
echo "Pulling binaries from GCS; using server version ${bucket}/${build_version}." echo "Pulling binaries from GCS; using server version ${bucket}/${build_version}."
gsutil -mq cp \ gsutil -mq cp \
"gs://kubernetes-release/${bucket}/${build_version}/kubernetes.tar.gz" \ "gs://${KUBE_GCS_RELEASE_BUCKET}/${bucket}/${build_version}/kubernetes.tar.gz" \
"gs://kubernetes-release/${bucket}/${build_version}/kubernetes-test.tar.gz" \ "gs://${KUBE_GCS_RELEASE_BUCKET}/${bucket}/${build_version}/kubernetes-test.tar.gz" \
. .
} }