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

Jump to bottom

Up to go 1.6.2 for build and test. #24266

Merged
merged 1 commit into from
May 2, 2016
Merged

Up to go 1.6.2 for build and test. #24266

merged 1 commit into from
May 2, 2016
+6 −6

Conversation

spxtr
Copy link
Contributor

@spxtr spxtr commented Apr 14, 2016 •
edited
Loading

1.6.1 contains some security fixes. 1.6.2 should be out soon. 1.6.2 is out :D

Images aren't pushed yet.

@spxtr spxtr added the release-note-none Denotes a PR that doesn't merit a release note. label Apr 14, 2016
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 14, 2016
@ixdy
Copy link
Member

ixdy commented Apr 14, 2016

Should we also update references to kubekins-test to use :0.11?

@spxtr
Copy link
Contributor Author

spxtr commented Apr 14, 2016

Yes, thank you. Also upped travis version.

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 14, 2016
@ixdy
Copy link
Member

ixdy commented Apr 14, 2016

Note #23931 is also updating kube-cross. Not sure which of these PRs should take priority.

cc @luxas

@luxas
Copy link
Member

luxas commented Apr 14, 2016

@spxtr Please don't push images before lgtm on the PR to avoid conflicts
You'll have to repush v1.6.1-1 after #23931
I was actually wondering earlier if I should bump to go1.6.1 in #23931, but came to the conclusion that it should be made in separate PRs

@luxas
Copy link
Member

luxas commented Apr 14, 2016

@spxtr Please move all: push to the top of the build/build-image/cross/Makefile, which makes make == make push
ref: #23931 (comment)

@ixdy
Copy link
Member

ixdy commented Apr 14, 2016

Should probably update hack/jenkins/dockerized-e2e-runner.sh too.

@spxtr
Copy link
Contributor Author

spxtr commented Apr 14, 2016

Should probably update hack/jenkins/dockerized-e2e-runner.sh too.

It might be worth using a VERSION file that all these places read from like the cross image does.

@ixdy
Copy link
Member

ixdy commented Apr 14, 2016

#23931 won the race, so this needs to be rebased.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 14, 2016
@spxtr
Copy link
Contributor Author

spxtr commented Apr 18, 2016

@ixdy PTAL. I'll need to repush the build image since some changes went in to the dockerfile.

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 18, 2016
@ixdy
Copy link
Member

ixdy commented Apr 19, 2016

Still don't see an update to hack/jenkins/dockerized-e2e-runner.sh. Using a VERSION file would be fine, too.

@spxtr
Copy link
Contributor Author

spxtr commented Apr 20, 2016

Added dockerized-e2e-runner. We don't actually have the source handy when we curl that down on Jenkins, so a VERSION file would also have to be curled down which I'm not a huge fan of.

@luxas
Copy link
Member

luxas commented Apr 20, 2016

fyi, go1.6.2 is out already

@spxtr
Copy link
Contributor Author

spxtr commented Apr 20, 2016

Hmm, they haven't pushed the 1.6.2 docker image yet...

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 22, 2016
@ixdy
Copy link
Member

ixdy commented Apr 22, 2016

Looks like the golang:1.6.2 image exists now.

@spxtr
Copy link
Contributor Author

spxtr commented Apr 22, 2016

Yay, alright I'll take care of that.

@spxtr spxtr changed the title Up to go 1.6.1 for build and test. Up to go 1.6.2 for build and test. Apr 22, 2016
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 22, 2016
ixdy
ixdy reviewed Apr 22, 2016
View reviewed changes
hack/jenkins/test-image/Makefile
@@ -14,7 +14,7 @@

all: push

TAG = 0.9
TAG = 0.11
Copy link
Member

Choose a reason for hiding this comment

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

I assume you force-pushed a new version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes.

@spxtr
Copy link
Contributor Author

spxtr commented Apr 28, 2016 •
edited
Loading

@ixdy ping

@ixdy ixdy added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 28, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 30, 2016

GCE e2e build/test passed for commit 009ea19.

@luxas luxas mentioned this pull request May 1, 2016
Closed
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented May 2, 2016

GCE e2e build/test passed for commit 009ea19.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit c6157a2 into kubernetes:master May 2, 2016
@spxtr spxtr deleted the 1.6.1 branch June 22, 2016 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ixdy ixdy

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@spxtr @ixdy @luxas @k8s-bot @k8s-github-robot @k8s-teamcity-mesosphere @googlebot