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

rdopkg clone: "gerrit" remote is missing #63

Closed
apevec opened this issue May 6, 2016 · 6 comments
Closed

rdopkg clone: "gerrit" remote is missing #63

apevec opened this issue May 6, 2016 · 6 comments

Comments

@apevec
Copy link
Contributor

apevec commented May 6, 2016

After rdopkg clone openstack-manila we get following git remotes created:

[user@host openstack-manila]$ git remote -v
origin  http://review.rdoproject.org/r/p/openstack/manila-distgit.git (fetch)
origin  http://review.rdoproject.org/r/p/openstack/manila-distgit.git (push)
patches http://review.rdoproject.org/r/p/openstack/manila.git (fetch)
patches http://review.rdoproject.org/r/p/openstack/manila.git (push)
review-origin   ssh://apevec@review.rdoproject.org:29418/openstack/manila-distgit.git (fetch)
review-origin   ssh://apevec@review.rdoproject.org:29418/openstack/manila-distgit.git (push)
review-patches  ssh://apevec@review.rdoproject.org:29418/openstack/manila.git (fetch)
review-patches  ssh://apevec@review.rdoproject.org:29418/openstack/manila.git (push)
upstream    git://git.openstack.org/openstack/manila (fetch)
upstream    git://git.openstack.org/openstack/manila (push)

.gitreview on rpm-master branch is:
[gerrit]
host=review.rdoproject.org
port=29418
project=openstack/manila-distgit
defaultbranch=rpm-master

  1. duplicate remotes to the same things, * vs review-*, we could have one or the other e.g. fedpkg/rpkg uses ssh: by default and --anonymous, -a can be specified to check out a module anonymously
  2. either add defaultremote=review-origin in .gitreview or change remotes created by rdopkg?
    NB "origin" might be required for compatibility with fedpkg/rpkg which expects "origin" remote.
@apevec
Copy link
Contributor Author

apevec commented May 13, 2016

"upstream" remote is also duplicate, "patches" on review.rdoproject.org is kept up to date by Softwarefactory.
Proposal:

@yac @hguemar @morucci @mhuin @cschwede @fredericlepied ^

@apevec
Copy link
Contributor Author

apevec commented May 16, 2016

Now I see "review-origin" is included in rdoinfo but it is localized in package-configs: templates, so shouldn't be a problem to change it.

@yac
Copy link
Contributor

yac commented May 18, 2016

  • rdopkg review-spec uses review-origin
  • rdopkg review-patch uses review-patches

and thus no .gitreview is needed, no extra .gitreview patch on all patches branches.

patches isn't completely redundant as it contains base for patches branch reviews... rdopkg could create those locally from upstream version tags.

remotes can be optimized in the future (reduce number of them) with better conventions but this was easiest to hack into existing code without breaking plain patches branch workflow. Further refinement is very likely :)

@apevec
Copy link
Contributor Author

apevec commented Jun 16, 2016

base for patches branch reviews

This is always upstream release tag and patches themselves stay unmerged, so branch content is equal to the upstream, except .gitreview changes.
And if we give up doing .gitreview changes, patches == upstream which might be more valuable than making "git-review" w/o parameters work out of the box?

@yac
Copy link
Contributor

yac commented Jul 19, 2016

Yes, with review-based workflow, we could drop patches which would also be convenient to tell which patches branch style is used. Either old with patches remote or the new one with review-origin and review-patchesremotes, not mix of both.

@yac yac closed this as completed Nov 8, 2016
@apevec
Copy link
Contributor Author

apevec commented Jul 7, 2017

I would like to reopen this, for simplified RDO on-boarding [1] git review w/o parameters should work on each branch and if defaultremote is not specified in .gitreview "gerrit" remote will be created which would conflict with upstream if you later also submit upstream changes in the same checkout.

[1] https://www.rdoproject.org/documentation/onboarding/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants