← Back to team overview

fuel-dev team mailing list archive

Re: Custom ISOs with pull instead of cherry-pick

 

That's option #2

--
Best regards,
Sergii Golovatiuk,
Skype #golserge
IRC #holser

On Wed, Oct 22, 2014 at 8:02 PM, Dmitry Borodaenko <dborodaenko@xxxxxxxxxxxx
> wrote:

> [we're deprecating fuel-dev@, lets move this to openstack-dev@]
>
> What about keeping cherry-pick (so that, as Matt pointed out, we can
> combine more than one change in a single iso), but using something
> like "git cherry-pick ${NAILGUN_COMMIT}..${NAILGUN_GERRIT_COMMIT}", so
> that every commit we specify is cherry-picked with all its
> dependencies?
>
> On Wed, Oct 22, 2014 at 8:20 AM, Aleksandr Didenko
> <adidenko@xxxxxxxxxxxx> wrote:
> > Hi,
> >
> > my 2 cents. So right now if you want to build a custom ISO with changes
> that
> > have dependencies, you need to list all of them including dependencies in
> > correct order, for example:
> >
> > fuellib_gerrit_commit = refs/changes/68/127268/7 refs/changes/89/127589/6
> > refs/changes/07/86007/14 refs/changes/08/86008/18
> >
> > If we change "cherry-pick" to "pull"
> > (https://review.openstack.org/#/c/130233/2/repos.mk) then you don't
> have to
> > list dependencies for your gerrit commits, since pull will fetch them for
> > you:
> >
> > fuellib_gerrit_commit = refs/changes/89/127589/6 refs/changes/08/86008/18
> >
> > It seems to me that "cherry-pick" is more "granular" and provides more
> > flexibility since you can pick exact patches you want. From the other
> hand,
> > with "pull" you don't have to worry about dependencies which is quite
> handy
> > sometimes.
> >
> > So, if you build a custom ISO
> > (
> http://jenkins-product.srt.mirantis.net:8080/view/custom_iso/job/custom_6_0_iso/
> )
> > and you set fuelmain_gerrit_commit = "refs/changes/33/130233/2", then you
> > change "cherry-pick" to "pull" for this particular ISO build and you can
> > test how it works with "pull" (you don't need to list dependencies).
> >
> > P.S. We can make this configurable, i.e. add an option (env variable)
> that
> > will determine what exactly we use, "cherry-pick" or "pull".
> >
> > --
> > Regards,
> > Alex
> >
> >
> > On Wed, Oct 22, 2014 at 6:03 PM, Sergii Golovatiuk
> > <sgolovatiuk@xxxxxxxxxxxx> wrote:
> >>
> >> Hi,
> >>
> >> Discussing the issues with BVT, we concluded that BVT fails when tested
> >> feature has a dependency (or several dependencies). You can easily check
> >> this behavior getting 'cherry-pick' link from gerrit of any commits with
> >> dependencies. I am proposing to replace 'cherry-pick' with 'pull'. In
> this
> >> case all dependencies will be put to iso for BVT. Before making change
> live
> >> I am asking you to build custom ISO with  refs/changes/33/130233/2 in
> >> fuelmain_gerrit_commit for all commits with dependencies.
> >>
> >> Thank you in advance!
> >>
> >> --
> >> Best regards,
> >> Sergii Golovatiuk,
> >> Skype #golserge
> >> IRC #holser
> >>
> >> --
> >> Mailing list: https://launchpad.net/~fuel-dev
> >> Post to     : fuel-dev@xxxxxxxxxxxxxxxxxxx
> >> Unsubscribe : https://launchpad.net/~fuel-dev
> >> More help   : https://help.launchpad.net/ListHelp
> >>
> >
> >
> > --
> > Mailing list: https://launchpad.net/~fuel-dev
> > Post to     : fuel-dev@xxxxxxxxxxxxxxxxxxx
> > Unsubscribe : https://launchpad.net/~fuel-dev
> > More help   : https://help.launchpad.net/ListHelp
> >
>
>
>
> --
> Dmitry Borodaenko
>

References