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.

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

stop using deprecated alias for push-build #2867

Merged
merged 1 commit into from
Jun 8, 2017

Conversation

mikedanese
Copy link
Member

No description provided.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 26, 2017
@@ -34,7 +34,7 @@ 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=$?
bazel run //:push-build -- "gs://kubernetes-release-dev/bazel/${version}" && rc=$? || rc=$?
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we cherry-picked this to 1.6 (yet). I meant to, though.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll not change 1-6.sh for now. I don't think it's a big deal if we don't cherrypick.

@@ -39,7 +39,7 @@ if [[ "${rc}" == 0 ]]; then
rc=1
else
version="${PULL_NUMBER:-batch}/${PULL_REFS:-}"
bazel run //:ci-artifacts -- "gs://kubernetes-release-dev/bazel/${version}" && rc=$? || rc=$?
Copy link
Member

Choose a reason for hiding this comment

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

we might need to special-case for the release-1.6 branch though?

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

yup

@ixdy
Copy link
Member

ixdy commented Jun 7, 2017

it should be safe to merge this now.

Copy link
Contributor

@fejta fejta left a comment

Choose a reason for hiding this comment

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

Will you please migrate these to a scenario instead? We should not have any jobs/*.sh files

I'm going to yank this logic out of bootstrap in the very near future.

@fejta
Copy link
Contributor

fejta commented Jun 7, 2017

Also IMO it makes more sense to use kubetest --build=bazel --stage=FOO to do this

@ixdy
Copy link
Member

ixdy commented Jun 7, 2017

@fejta that is out of scope for this PR. this PR is simply switching to the non-deprecated target (see https://github.com/kubernetes/kubernetes/blob/d3b740bf28743b3fb781e2f75ebdc5b201c60877/build/root/BUILD.root#L22-L34) and has no other functional changes.

#2732 is a more reasonable place to direct this feedback.

@mikedanese mikedanese merged commit 1d45483 into kubernetes:master Jun 8, 2017
@mikedanese mikedanese deleted the deprecate branch June 8, 2017 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants