Support repo change between invocations

[sed-i]

Following the thick hint offered by @thockin in #497, this PR replaces the hard-coded literal "origin" with the --repo value.
This way cleanup takes place even if --repo value changes between invocations.

Fixes #497

[linux-foundation-easycla]

The committers are authorized under a signed CLA.

• ✅ Leon (62fa46b)

[k8s-ci-robot]

Welcome @sed-i!

It looks like this is your first PR to kubernetes/git-sync 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/git-sync has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[sed-i]

/assign @thockin

[thockin]

Thanks! But no good deed goes unpunished.

I try not to use the global flag vars outside of main() - can you see about passing the repo around as an argument, so we can use it in these places? In the v4 (dev) branch, I made a gitRepo type to carry the repo, branch, etc. Not asking you to port all that, but just so you get the point.

Also, can you add a test to test_e2e.sh?

And finally, if you feel industrious, you can also port to v4 (master) branch. Or I can do that if you prefer.

[sed-i]

I added a test, but it fails with repo2 does not appear to be a git repository:

"msg"="too many failures, aborting" "error"="Run(git ls-remote -q file:///tmp/git-sync-e2e.1377722101/repo2 refs/heads/e2e-branch): exit status 128: { stdout: "", stderr: "fatal: '/tmp/git-sync-e2e.1377722101/repo2' does not appear to be a git repository\nfatal: Could not read from remote repository.\n\nPlease make sure you have the correct access rights\nand the repository exists.\n" }" "failCount"=0

When I re-ran manually the test steps, it worked without error. Any idea what could be the reason?

[sed-i]

... missing a volume mount, that's why!

        -v "$ROOT":"$ROOT":rw \
        -v "$REPO":"$REPO":ro \
        -v "$WORK":"$WORK":ro \

Will fix shortly.

[sed-i]

Sure, porting to v4 seems straightforward. I can submit a PR against master after we're happy with this one.

[sed-i]

@thockin Is this ok now?

[thockin]

Thanks!

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sed-i, thockin

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

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [thockin]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment