Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use release/push-build.sh in ci-kubernetes-bazel-build #2732

Closed
wants to merge 1 commit into from
Closed

Use release/push-build.sh in ci-kubernetes-bazel-build #2732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion jobs/ci-kubernetes-bazel-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,14 @@ if [[ "${rc}" == 0 ]]; then
echo "Kubernetes version missing; not uploading ci artifacts."
rc=1
else
bazel run //:ci-artifacts -- "gs://kubernetes-release-dev/bazel/${version}" && rc=$? || rc=$?
push_build="../release/push-build.sh"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused. Does this actually work at CI time? Even given your changes in #2731, I'm not sure what mechanism pulls the release repository. Is that done automatically for all jobs? I thought that this job only pulled k8s.io/kubernetes, so this looks like something that would only work locally.

if [[ -x "${push_build}" ]]; then
"${push_build}" --bucket=kubernetes-release-dev --nomock --verbose --ci \
--gcs-suffix=-bazel && rc=$? || rc=$?
else
echo "release repository missing; using Bazel gcs upload rule directly"
bazel run //:ci-artifacts -- "gs://kubernetes-release-dev/bazel/${version}" && rc=$? || rc=$?
fi
fi
fi

Expand Down
13 changes: 5 additions & 8 deletions prow/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ presubmits:
- master
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:0.11
- image: gcr.io/k8s-testimages/bazelbuild:0.12
args:
- "--pull=$(PULL_REFS)"
- "--upload=gs://kubernetes-jenkins/pr-logs"
- "--git-cache=/root/.cache/git"
- "--clean"
Expand Down Expand Up @@ -214,9 +213,8 @@ presubmits:
- master
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:0.11
- image: gcr.io/k8s-testimages/bazelbuild:0.12
args:
- "--pull=$(PULL_REFS)"
- "--upload=gs://kubernetes-jenkins/pr-logs"
- "--git-cache=/root/.cache/git"
- "--clean"
Expand Down Expand Up @@ -469,9 +467,9 @@ postsubmits:
- master
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:0.11
- image: gcr.io/k8s-testimages/bazelbuild:0.12
args:
- "--branch=$(PULL_REFS)"
- "--repo=k8s.io/release=master"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, my other comment obviously missed this subtle line.

- "--upload=gs://kubernetes-jenkins/logs"
- "--git-cache=/root/.cache/git"
- "--clean"
Expand All @@ -498,9 +496,8 @@ postsubmits:
- name: ci-kubernetes-bazel-test
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:0.11
- image: gcr.io/k8s-testimages/bazelbuild:0.12
args:
- "--branch=$(PULL_REFS)"
- "--upload=gs://kubernetes-jenkins/logs"
- "--git-cache=/root/.cache/git"
- "--clean"
Expand Down