[OpenStack-Infra] Advice needed on Kolla's repository split

Clark Boylan cboylan at sapwetik.org
Tue Nov 8 18:27:25 UTC 2016


On Tue, Nov 8, 2016, at 05:23 AM, Steven Dake (stdake) wrote:
> Hey folks,
> 
> Kolla is splitting the Kolla repo into two (as per unanimous vote of the
> core reviewer team several months ago).  Please reference this diagram to
> understand what goes where:
> 
> https://www.gliffy.com/go/share/sg9fc5eg9ktg9binvc89
> 
> We want to ensure branches are left intact with back ports that have been
> made to them.  The approach I was considering was to use a project config
> new project addition using the upstream flag.  Does that copy branches? 
> If it doesn’t, is there some other way the job can be done so we don’t
> have to re-backport all of the maintenance work?  The project creator’s
> guide is unclear if the import imports branches and tags.

If you set the upstream value all branches and tags from that upstream
will be duplicated in Gerrit as part of the initial project setup. This
happens before we update zuul's config so shouldn't trigger any release
jobs or anything like that (though I suppose if it somehow managed to
run out of order that could be a problem).

Feel free to push an update to the project creator docs with ^ info,
otherwise I will try to get around to updating that.
 
> Basically what we want is a complete clone of the kolla repo, but called
> kolla-ansible in addition.  We (being someone with permissions to delete
> tags) will need to delete all the tags (or not carry over the tags) for
> the kolla-ansible repository so new artifacts can be created (1 =
> liberty, 2 = mitaka, 3 = newton in our version scheme).  Artifact
> creation happens automatically as a result of the tagging process in the
> releases repository.  Then we will need to delete the files not relevant
> to the specific deliverables.

If you don't want to reuse the existing tags you should make sure they
are deleted from the repo used as the upstream first, then import won't
include them when pushing into gerrit.

> Note, we aren’t really doing this to benefit Kolla (although we do
> benefit slightly).  The real benefit is for the rest of the OpenStack
> community so others may consume the container images from one repo
> without bringing in the Ansible (or Kubernetes) bits.

FWIW it should be possible to do this with a single repo too :) but
splitting it into multiple repos for organization purposes is fine as
well.

Clark



More information about the OpenStack-Infra mailing list