search

redhat-openstack / openstack-puppet-modules

Puppet modules shared between Packstack and TripleO
39 stars 52 forks source link

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

Open apevec opened 8 years ago

apevec commented 8 years ago

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 commented 8 years ago

@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 commented 8 years ago

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

jguiditta commented 8 years ago

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.