[katello-devel] ATTN: Codebase Split-up Post Mortem

Mike McCune mmccune at redhat.com
Mon Apr 29 18:08:22 UTC 2013


if anyone needs git-1.8 on F17 which contains git-subtree you can find 
it here:


# curl 
http://mmccune.fedorapeople.org/repos/git-1.8/mmccune-git18-rebuild.repo 
 > /etc/yum.repos.d/mmccune-git18-rebuild.repo

# yum -y update git


On 04/28/2013 06:23 AM, Eric D Helms wrote:
> Over the weekend of April 27/28, the code base was split into a couple
> of new repositories. The notes taken during the process and actions
> after this report can be found here -
> https://pad-katello.rhcloud.com/p/codebase-split-plan
>
> Notes
>
>   - the mainline katello.git repository was maintained in order to keep
> issues and history of those issues in tact.
>   -  a copy of the repository just before splitting was pushed to a
> 'pre-split' branch on katello.git.
>   - all tags were pushed to each new repository
>
>
> New Repositories
>
> The following repositories were created using 'git subtree split'.
>
> katello - https://github.com/Katello/katello
>    This repository houses just the Rails application.
>    pre-split directories - src/
>                                  rel-eng/
> katello-installer - https://github.com/Katello/katello-installer
>    This repository contains code related to installing and managing an
> install of Katello.
>    pre-split directories - katello-configure/
>
> katello-selinux - https://github.com/Katello/katello-selinux
>    Contains the SELinux policy.
>    pre-split directories - selinux/katello-selinux/
>
> katello-cli - https://github.com/Katello/katello-cli
>    Contains the CLI and system tests.
>    pre-split directories - cli/
>                                   scripts/system-test/
>
> katello-agent - https://github.com/Katello/katello-agent
>    Contains the agent code.
>    pre-split directories - agent/
>
> katello-misc - https://github.com/Katello/katello
> <https://github.com/Katello/katello-cli>-misc
>    Container for small chunks of tooling.
>    pre-split directories - katello-utils/
>                                   repos/
>                                   scripts/
>                                   certs-tools/
>
>
> Builds
>
> - All new repositories were updated with rel-eng directories and built
> in Koji
> - The previous rel-eng/ directory was moved to Katello proper
> - Wherever Katello nightly is built needs updating
>
>
> Continuous Integration
>
> - CLI and Katello master have been updated with Travis configs and
> scripts and are Green
> - Jenkins unit and build jobs are being worked on
>
>
> Developer Guide
>
> If you have out-standing code, or an outstanding pull request that you
> need to get prepared based on the new repository structure.
>
> For this example workflow, let's assume you had a pull request that
> affected both the Rails app that lived under src/ and the cli under cli/
>
> 1. In your current local repository, based off of the old repository
> structure, checkout the branch your work lives in
> 2. Fork katello-cli and katello
> 3. git add remote <your_github_account>-cli <your_fork_of_the_cli>
> 4. git add remote <your_github_account>-katello <your_fork_of_katello>
> 5. cd to the top level
> 6. git subtree split --prefix cli/ --branch cli
> 7. git subtree split --prefix src/ --branch katello
> 8. git checkout cli
> 9. git push <your_github_account>-cli cli:<pull-request-branch-name>
> 10. git checkout katello
> 11. git push <your_github_account>-katello
> katello:<pull-request-branch-name>
> 12. open pull requests on the CLI and Katello from your fork for your
> pull request branches
>
> An example of an updated PR - https://github.com/Katello/katello/pull/2100
>
>
> Please address all issues and questions here.
>
> Thanks,
> Eric
>
>
> _______________________________________________
> katello-devel mailing list
> katello-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/katello-devel

-- 
Mike McCune
mmccune AT redhat.com
Red Hat Engineering       | Portland, OR
Systems Management        | 650-254-4248




More information about the katello-devel mailing list