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

Fix e2e-kubeadm release-1.6 job. #2765

Merged
merged 1 commit into from
May 16, 2017
Merged

Conversation

pipejakob
Copy link
Contributor

Recent changes to kubernetes/master moved where bazel .deb files get pushed. The kubernetes_e2e.py scenario was updated to accommodate this change, but the kubernetes/release-1.6 branch still pushes these .debs to the old location. Since we only support ci/periodic jobs for release-1.6, and we expect to use the new location from now on, consider this a special case for now and we can remove this code when we no longer support the 1.6.x series.

@pipejakob pipejakob requested review from krzyzacy and ixdy May 15, 2017 23:36
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 15, 2017
@krzyzacy
Copy link
Member

add it to the unit-test?

@pipejakob
Copy link
Contributor Author

Good call. New test added.

@krzyzacy
Copy link
Member

Or is there something we can cherry-pick into 1.6 to make it upload to the right place?

@pipejakob
Copy link
Contributor Author

I thought about it, but with the already-murky situation with the 1.6.3 regression, I didn't want to push for cherry-picking even more into the 1.6 branch. I'll let @ixdy chime in, since he was the proponent of moving the .deb location in the first place.

@krzyzacy
Copy link
Member

sgtm, he'll be back Friday :-)

Recent changes to kubernetes/master moved where bazel .deb files get
pushed. The kubernetes_e2e.py scenario was updated to accommodate this
change, but the kubernetes/release-1.6 branch still pushes these .debs
to the old location. Since we only support ci/periodic jobs for
release-1.6, and we expect to use the new location from now on, consider
this a special case for now and we can remove this code when we no
longer support the 1.6.x series.
@pipejakob
Copy link
Contributor Author

Oh, Friday might be on the late side, since these release-1.6 blocking tests are broken now, and the team is trying to get 1.6.4 out the door. How do you feel about getting this fix in now in order to fix the tests, and we can revisit whether we want to cherry-pick the .deb move commits (and revert this one) when @ixdy is back?

@pipejakob
Copy link
Contributor Author

Also the bazel failure this PR just started hitting (bazel test //triage:script_test) seems to be broken on upstream/master, too.

@krzyzacy
Copy link
Member

#2775, it's pretty flaky now..

@k8s-bot bazel test this

Copy link
Member

@krzyzacy krzyzacy left a comment

Choose a reason for hiding this comment

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

/lgtm

@rmmh
Copy link
Contributor

rmmh commented May 16, 2017

@k8s-bot bazel test this

@pipejakob pipejakob merged commit 31e873f into kubernetes:master May 16, 2017
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