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

stable/* and upstream-* are the same, drop upstream-* #294

Open
apevec opened this issue Jul 3, 2016 · 3 comments
Open

stable/* and upstream-* are the same, drop upstream-* #294

apevec opened this issue Jul 3, 2016 · 3 comments

Comments

@apevec
Copy link
Member

apevec commented Jul 3, 2016

Since Liberty OPM does not carry non-upstream patches, there is not diff between stable/* and upstream-* branches:

$ git diff upstream/stable/mitaka..upstream/upstream-mitaka
$ git diff upstream/stable/liberty..upstream/upstream-liberty

To avoid confusion, please drop upstream-{liberty|mitaka} branches!

@apevec
Copy link
Member Author

apevec commented Jul 3, 2016

@jguiditta @EmilienM
One side-effect of this issue: stable/mitaka diverged unnecessarily (was cherry-pick vs rebase I guess) from upstream-mitaka and tag 8.1.2 is placed on upstream-mitaka, so RDO Trunk Mitaka building from stable/mitaka does not see it and latest builds still have 8.1.1 version:
https://trunk.rdoproject.org/centos7-mitaka/consistent/openstack-puppet-modules-8.1.1-0.20160624091953.fcd07d7.el7.centos.noarch.rpm
So immediate action is to rebase stable/mitaka on upstream-mitaka to get the latest tag.

@apevec
Copy link
Member Author

apevec commented Jul 3, 2016

While at it, stable/liberty is out of sync on gerrithub (still 7.1.1) vs github (7.1.2 == upstream-liberty)

@jguiditta
Copy link
Member

The process I follow for releases is here, and has worked pretty consistently:
https://github.com/redhat-openstack/openstack-puppet-modules/blob/stable/mitaka/BUILDING.md

I think the two releases causing must have been done slightly differently, as I was not the one who did those. I am happy to get gerrit back in sync if you can tell me how. Also, I have no issue with you request to drop upstream-{release} for liberty and mitaka, assuming nobody else does.

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