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

Clone kubernetes/release into something other than /release due to conflict with /release. #29892

Merged
merged 1 commit into from
Aug 2, 2016
Merged

Clone kubernetes/release into something other than /release due to conflict with /release. #29892

merged 1 commit into from
Aug 2, 2016
+8 −7

Conversation

david-mcmahon
Copy link
Contributor

It looks like $WORKSPACE is the root of the kubernetes clone. I think ideally we'd move that down a level and allow subdirectories of different repos. I think this may become the norm as we split things up further as well. What do you think and how should we proceed here? @ixdy @spxtr

@david-mcmahon david-mcmahon added area/test-infra area/release-eng Issues or PRs related to the Release Engineering subproject release-note-none Denotes a PR that doesn't merit a release note. labels Aug 2, 2016
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 2, 2016
@spxtr
Copy link
Contributor

spxtr commented Aug 2, 2016

I'm fine with moving the kubernetes clone down a level. I think the only reason we do it this way is because that's the default Jenkins behavior.

@david-mcmahon
Copy link
Contributor Author

@spxtr Where is WORKSPACE defined and where does the initial kubernetes/kubernetes clone occur? I don't see it in the logs or in the hack/jenkins/* scripts.

@spxtr
Copy link
Contributor

spxtr commented Aug 2, 2016

WORKSPACE is set by Jenkins. The clone happens into there, so $WORKSPACE/build/common.sh exists, for example.

@david-mcmahon
Copy link
Contributor Author

So if we want to change where kubernetes/kubernetes is cloned into where do we do that?

@spxtr
Copy link
Contributor

spxtr commented Aug 2, 2016

Looks fine. My only worry is that this will cause the build to get marked as dirty, but maybe not?

@david-mcmahon
Copy link
Contributor Author

Oh you are probably right.

@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 Aug 2, 2016
@ixdy
Copy link
Member

ixdy commented Aug 2, 2016

The node e2e builds check out to ${WORKSPACE}/go/src/k8s.io/kubernetes - https://github.com/kubernetes/test-infra/blob/master/jenkins/job-configs/kubernetes-jenkins/node-e2e.yaml#L39

We could probably do something similar with the rest of the builds, though it won't have a huge effect, since most of the builds run inside docker anyway.

@spxtr
Copy link
Contributor

spxtr commented Aug 2, 2016

LGTM. Note that this only works if we only run one job at a time per Jenkins agent, which we currently do.

@david-mcmahon
Copy link
Contributor Author

Good point. @ixdy suggested piggybacking on an existing .gitignore, _tmp. PTAL.

@spxtr
Copy link
Contributor

spxtr commented Aug 2, 2016

LGTM

@david-mcmahon david-mcmahon added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 2, 2016
@david-mcmahon david-mcmahon added this to the next-candidate milestone Aug 2, 2016
@david-mcmahon david-mcmahon added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Aug 2, 2016
@k8s-bot
Copy link

k8s-bot commented Aug 2, 2016

GCE e2e build/test passed for commit eceef16.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 31ff5d4 into kubernetes:master Aug 2, 2016
This was referenced Oct 24, 2016
Merged
Merged
roberthbailey added a commit that referenced this pull request Oct 25, 2016
@roberthbailey
Merge pull request #35459 from ixdy/automated-cherry-pick-of-#28922-#…
3d5d1aa 
…29892-#30182-#31025-#32013-#32235-#34359-#35233-upstream-release-1.2

Automated cherry pick of #28922 #29892 #30182 #31025 #32013 #32235 #34359 #35233
ixdy added a commit that referenced this pull request Oct 25, 2016
@ixdy
Merge pull request #35458 from ixdy/automated-cherry-pick-of-#28922-#…
9e735dd 
…29892-#30182-#31025-#32013-#32235-#34359-#35233-upstream-release-1.3

Automated cherry pick of #28922 #29892 #30182 #31025 #32013 #32235 #34359 #35233
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@ixdy
Merge pull request kubernetes#35458 from ixdy/automated-cherry-pick-o…
015cbf0 
…f-#28922-kubernetes#29892-kubernetes#30182-kubernetes#31025-kubernetes#32013-kubernetes#32235-kubernetes#34359-kubernetes#35233-upstream-release-1.3

Automated cherry pick of kubernetes#28922 kubernetes#29892 kubernetes#30182 kubernetes#31025 kubernetes#32013 kubernetes#32235 kubernetes#34359 kubernetes#35233
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@spxtr spxtr

@ixdy ixdy

Labels
area/release-eng Issues or PRs related to the Release Engineering subproject area/test-infra lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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
next-candidate
Development

Successfully merging this pull request may close these issues.
6 participants
@david-mcmahon @spxtr @ixdy @k8s-bot @k8s-github-robot @googlebot