*** dave-mccowan has quit IRC | 02:45 | |
*** dave-mccowan has joined #openstack-sahara | 02:48 | |
*** dave-mccowan has quit IRC | 04:48 | |
*** pcaruana has joined #openstack-sahara | 06:23 | |
*** Bhujay has joined #openstack-sahara | 06:25 | |
*** Bhujay has quit IRC | 06:26 | |
*** Bhujay has joined #openstack-sahara | 06:26 | |
*** rcernin has quit IRC | 07:04 | |
*** tosky has joined #openstack-sahara | 07:40 | |
*** Bhujay has quit IRC | 08:30 | |
*** Bhujay has joined #openstack-sahara | 08:35 | |
*** pcaruana has quit IRC | 08:50 | |
openstackgerrit | wangqi proposed openstack/openstack-ansible-os_sahara master: Trivial: Fix the pep8 warning https://review.openstack.org/589057 | 09:45 |
---|---|---|
*** pcaruana has joined #openstack-sahara | 09:58 | |
*** zigo has joined #openstack-sahara | 10:03 | |
openstackgerrit | Luigi Toscano proposed openstack/sahara-tests master: DNM very rough test for the S3 integration https://review.openstack.org/590055 | 10:26 |
*** zigo has quit IRC | 11:45 | |
*** dave-mccowan has joined #openstack-sahara | 11:47 | |
tellesnobrega | tosky, \o/ now I have 0 failing tests on the sahara-plugins side | 13:24 |
tosky | oooh | 13:27 |
tosky | now, rebase and cleanup of the patches | 13:27 |
tosky | because you probably have tons of unclean commits :P | 13:27 |
tosky | maybe it's better to rebase first and then test scenario tests | 13:27 |
tellesnobrega | yes | 13:30 |
tellesnobrega | there is a lot of rebase to be done | 13:30 |
tellesnobrega | I actually did a first run | 13:30 |
tellesnobrega | not sure if I'm doing properly | 13:30 |
tellesnobrega | what I did was to get the plugins folder from current sahara code and bring to the new repo as a reference branch | 13:31 |
tellesnobrega | and do a diff | 13:31 |
tellesnobrega | updating where needed | 13:31 |
tellesnobrega | do you have a better approach? | 13:31 |
tosky | rebase your changes | 13:31 |
tosky | technically the new repository will be extracted from the old one, either with a copy and removal of core parts, or using git filter-branch | 13:32 |
tosky | so the starting point will be the old repository and its history | 13:32 |
tosky | all your changes will be on top of that | 13:32 |
tosky | no mixed changes and updates from master | 13:32 |
tellesnobrega | let me see if I understand | 13:33 |
tellesnobrega | so I'm supposed to write the code into the current sahara code and request the split? | 13:34 |
tellesnobrega | because I'm working on a separated github project (my github for now) | 13:34 |
tosky | no, it's fine to work on your own git repository | 13:36 |
tosky | but I would personally treat that repository as it was the final repository to be imported on openstack.org | 13:36 |
tellesnobrega | yes | 13:36 |
tosky | which means: rebase the changes on top of upstream master | 13:36 |
tellesnobrega | that is the plan | 13:36 |
tellesnobrega | makes sense | 13:37 |
tellesnobrega | thanks | 13:37 |
tosky | if you start to manually merge the change, it will be more complicated for you to distinguish between your changes and the changes from the official repository, because they will be interleaved | 13:37 |
tosky | git rebase may be able to help, but still | 13:37 |
tellesnobrega | can I do a rebase between two projects? | 13:38 |
tosky | what do you mean? | 13:38 |
tosky | both your sahara.git (core only) and sahara-plugins.git should start from the current sahara.git | 13:39 |
tellesnobrega | or do I need to copy the plugins from master as is and have it as a branch on the new project? | 13:39 |
tosky | the new project (sahara-plugins) should be either the current sahara.git, with an initial commit to remove core stuff, or an extract of sahara.git history with git filter-branch | 13:40 |
tellesnobrega | ok, so I do the split and rebase my changes on top of it | 13:41 |
tellesnobrega | same for sahara itself, correct? | 13:41 |
tosky | yep | 13:41 |
tosky | we will can check it better next week | 13:41 |
tellesnobrega | awesome | 13:41 |
tellesnobrega | thanks :) | 13:41 |
openstackgerrit | Merged openstack/sahara master: Correct repo_id_map for hdp 2.5 https://review.openstack.org/599677 | 14:36 |
openstackgerrit | Luigi Toscano proposed openstack/sahara stable/rocky: Correct repo_id_map for hdp 2.5 https://review.openstack.org/600086 | 14:47 |
*** Bhujay has quit IRC | 15:18 | |
*** pcaruana has quit IRC | 15:25 | |
*** Gaasmann has joined #openstack-sahara | 15:28 | |
*** dave-mccowan has quit IRC | 15:44 | |
*** dave-mccowan has joined #openstack-sahara | 15:56 | |
*** dave-mccowan has quit IRC | 16:06 | |
*** pcaruana has joined #openstack-sahara | 17:52 | |
*** openstackgerrit has quit IRC | 18:00 | |
*** openstackgerrit has joined #openstack-sahara | 19:22 | |
openstackgerrit | Merged openstack/sahara stable/queens: Import the legacy grenade sahara job https://review.openstack.org/599683 | 19:22 |
*** pcaruana has quit IRC | 20:40 | |
*** rcernin has joined #openstack-sahara | 22:43 |
Generated by irclog2html.py 2.15.3 by Marius Gedminas - find it at mg.pov.lt!