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 .git rsync filter for prow #55530

Merged
merged 1 commit into from
Nov 12, 2017
Merged

Conversation

cblecker
Copy link
Member

What this PR does / why we need it:
The prow bootstrap job uses the --separate-git-dir flag when cloning the target repo. This leaves a text file named ./.git containing the path to the git dir instead of the typical ./.git/ directory right in the working tree.

This modifies the rsync filter to filter out this file or directory, so that jobs that use the build container system aren't tripped up by a text file that points to a directory that doesn't exist in the build container system.

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 11, 2017
@cblecker
Copy link
Member Author

This will need to be picked back to at least 1.8, but and possibly manually applied to 1.7/1.6.

@cblecker
Copy link
Member Author

/approve no-issue
/cc @BenTheElder

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 11, 2017
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

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

/lgtm

Thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 12, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, cblecker

Associated issue requirement bypassed by: cblecker

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@cblecker
Copy link
Member Author

/retest

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit bfe581d into kubernetes:master Nov 12, 2017
@cblecker cblecker deleted the git-rsync branch November 12, 2017 22:28
@ixdy
Copy link
Member

ixdy commented Nov 13, 2017

Nice sleuthing, @cblecker. (Also, this is terrible. 🙃)

k8s-github-robot pushed a commit that referenced this pull request Nov 14, 2017
…30-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #55530

Cherry pick of #55530 on release-1.8.

#55530: Fix .git rsync filter
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants