New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #10478 - Add deb_repo type to Katello content #6877

Merged
merged 2 commits into from Dec 22, 2017

Conversation

Projects
None yet
7 participants
@mdellweg
Contributor

mdellweg commented Jul 18, 2017

This PR is part of the work to integrate deb-repositories into Katello.
It depends on the corresponding branches of pulp_deb and runcible:
https://github.com/ATIX-AG/pulp_deb/tree/feature/sync_release_structure
https://github.com/ATIX-AG/runcible/tree/feature/add_deb_type

@theforeman-bot

This comment has been minimized.

Show comment
Hide comment
@theforeman-bot

theforeman-bot Jul 18, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

theforeman-bot commented Jul 18, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Jul 18, 2017

@mdellweg, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jlsherrill, @parthaa and @ehelms to be potential reviewers.

mention-bot commented Jul 18, 2017

@mdellweg, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jlsherrill, @parthaa and @ehelms to be potential reviewers.

@theforeman-bot

This comment has been minimized.

Show comment
Hide comment
@theforeman-bot

theforeman-bot Jul 20, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description
  • a48955dd20b47b056fc9b7a4cb226042aaaa86c2 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

theforeman-bot commented Jul 20, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description
  • a48955dd20b47b056fc9b7a4cb226042aaaa86c2 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

Show outdated Hide outdated app/models/katello/glue/pulp/repo.rb
@@ -214,6 +218,14 @@ def puppet_importer_values(capsule)
config.merge(importer_ssl_options(capsule))
end
def deb_importer_values(capsule)
config = {
feed: self.importer_feed_url(capsule),

This comment has been minimized.

@houndci-bot

houndci-bot Jul 20, 2017

Avoid comma after the last item of a hash.

@houndci-bot

houndci-bot Jul 20, 2017

Avoid comma after the last item of a hash.

@theforeman-bot

This comment has been minimized.

Show comment
Hide comment
@theforeman-bot

theforeman-bot Jul 20, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description
  • a48955dd20b47b056fc9b7a4cb226042aaaa86c2 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

theforeman-bot commented Jul 20, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description
  • a48955dd20b47b056fc9b7a4cb226042aaaa86c2 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@theforeman-bot

This comment has been minimized.

Show comment
Hide comment
@theforeman-bot

theforeman-bot Jul 21, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description
  • a48955dd20b47b056fc9b7a4cb226042aaaa86c2 must be in the format fixes #redmine_number - brief description
  • 07d5fc0ea7db7a6adc58fc598e468ba313034513 must be in the format fixes #redmine_number - brief description
  • d0b23c4cacfe2d8b037657c46f007319fca82066 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

theforeman-bot commented Jul 21, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description
  • a48955dd20b47b056fc9b7a4cb226042aaaa86c2 must be in the format fixes #redmine_number - brief description
  • 07d5fc0ea7db7a6adc58fc598e468ba313034513 must be in the format fixes #redmine_number - brief description
  • d0b23c4cacfe2d8b037657c46f007319fca82066 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@theforeman-bot

This comment has been minimized.

Show comment
Hide comment
@theforeman-bot

theforeman-bot Jul 21, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description
  • a48955dd20b47b056fc9b7a4cb226042aaaa86c2 must be in the format fixes #redmine_number - brief description
  • 07d5fc0ea7db7a6adc58fc598e468ba313034513 must be in the format fixes #redmine_number - brief description
  • d0b23c4cacfe2d8b037657c46f007319fca82066 must be in the format fixes #redmine_number - brief description
  • ef37b0260fa4b7bd1c3944d0495060fc9fab221b must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

theforeman-bot commented Jul 21, 2017

There were the following issues with the commit message:

  • b5844b48a5dc136697590ade029ee2a227e1515d must be in the format fixes #redmine_number - brief description
  • a48955dd20b47b056fc9b7a4cb226042aaaa86c2 must be in the format fixes #redmine_number - brief description
  • 07d5fc0ea7db7a6adc58fc598e468ba313034513 must be in the format fixes #redmine_number - brief description
  • d0b23c4cacfe2d8b037657c46f007319fca82066 must be in the format fixes #redmine_number - brief description
  • ef37b0260fa4b7bd1c3944d0495060fc9fab221b must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@theforeman-bot

This comment has been minimized.

Show comment
Hide comment
@theforeman-bot

theforeman-bot Jul 26, 2017

There were the following issues with the commit message:

  • 2a7c18930f8603c97f4a31b88909add654fc5f4d must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

theforeman-bot commented Jul 26, 2017

There were the following issues with the commit message:

  • 2a7c18930f8603c97f4a31b88909add654fc5f4d must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@jlsherrill

This comment has been minimized.

Show comment
Hide comment
@jlsherrill

jlsherrill Aug 1, 2017

Member

Now that a pulp 2.14 beta has been released I will start testing and reviewing this!

Member

jlsherrill commented Aug 1, 2017

Now that a pulp 2.14 beta has been released I will start testing and reviewing this!

@theforeman-bot

This comment has been minimized.

Show comment
Hide comment
@theforeman-bot

theforeman-bot Aug 3, 2017

There were the following issues with the commit message:

  • 745bc21cf0cf615b7c40f176a497bbba1c2d5368 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

theforeman-bot commented Aug 3, 2017

There were the following issues with the commit message:

  • 745bc21cf0cf615b7c40f176a497bbba1c2d5368 must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@jlsherrill

This comment has been minimized.

Show comment
Hide comment
@jlsherrill

jlsherrill Dec 18, 2017

Member

Seeing one small issue with uploading a debian package through the UI, it uploads fine but does not show up as having been uploaded (the count stays the same). A small patch fixes it:

diff --git a/app/lib/actions/katello/repository/filtered_index_content.rb b/app/lib/actions/katello/repository/filtered_index_content.rb
index ddb12ac9e0..b5d74b998f 100644
--- a/app/lib/actions/katello/repository/filtered_index_content.rb
+++ b/app/lib/actions/katello/repository/filtered_index_content.rb
@@ -19,6 +19,8 @@ module Actions
             ::Katello::DockerManifest.import_for_repository(repo)
           elsif repo.file?
             ::Katello::FileUnit.import_for_repository(repo)
+          elsif repo.deb?
+            ::Katello::Deb.import_all(unit_ids)
           else
             ::Katello::Rpm.import_all(unit_ids)
           end
Member

jlsherrill commented Dec 18, 2017

Seeing one small issue with uploading a debian package through the UI, it uploads fine but does not show up as having been uploaded (the count stays the same). A small patch fixes it:

diff --git a/app/lib/actions/katello/repository/filtered_index_content.rb b/app/lib/actions/katello/repository/filtered_index_content.rb
index ddb12ac9e0..b5d74b998f 100644
--- a/app/lib/actions/katello/repository/filtered_index_content.rb
+++ b/app/lib/actions/katello/repository/filtered_index_content.rb
@@ -19,6 +19,8 @@ module Actions
             ::Katello::DockerManifest.import_for_repository(repo)
           elsif repo.file?
             ::Katello::FileUnit.import_for_repository(repo)
+          elsif repo.deb?
+            ::Katello::Deb.import_all(unit_ids)
           else
             ::Katello::Rpm.import_all(unit_ids)
           end
Show outdated Hide outdated app/models/katello/glue/pulp/repo.rb
Show outdated Hide outdated app/lib/actions/katello/repository/clone_to_version.rb
@jlsherrill

This comment has been minimized.

Show comment
Hide comment
@jlsherrill

jlsherrill Dec 19, 2017

Member

Overall, looking good. Once these last issues are resolved, and everything is squashed, i think we can merge!

Member

jlsherrill commented Dec 19, 2017

Overall, looking good. Once these last issues are resolved, and everything is squashed, i think we can merge!

@mdellweg

This comment has been minimized.

Show comment
Hide comment
@mdellweg

mdellweg Dec 19, 2017

Contributor

@jlsherrill Squashed!
I put the last fix on a separate commit for now, because i think there is no way around rebasing, once #7121 is merged.

Contributor

mdellweg commented Dec 19, 2017

@jlsherrill Squashed!
I put the last fix on a separate commit for now, because i think there is no way around rebasing, once #7121 is merged.

@jlsherrill jlsherrill changed the title from WIP: Add deb_repo type to Katello content to Fixes #10478 - Add deb_repo type to Katello content Dec 19, 2017

@theforeman-bot

This comment has been minimized.

Show comment
Hide comment
@theforeman-bot

theforeman-bot Dec 19, 2017

@mdellweg, this pull request is currently not mergeable. Please rebase against the master branch and push again.

If you have a remote called 'upstream' that points to this repository, you can do this by running:

    $ git pull --rebase upstream master

This message was auto-generated by Foreman's prprocessor

theforeman-bot commented Dec 19, 2017

@mdellweg, this pull request is currently not mergeable. Please rebase against the master branch and push again.

If you have a remote called 'upstream' that points to this repository, you can do this by running:

    $ git pull --rebase upstream master

This message was auto-generated by Foreman's prprocessor

@jlsherrill

This comment has been minimized.

Show comment
Hide comment
@jlsherrill

jlsherrill Dec 20, 2017

Member

@mdellweg it looks like there are ~4 tests failing: http://ci.theforeman.org/job/katello-pr-test/179/

Member

jlsherrill commented Dec 20, 2017

@mdellweg it looks like there are ~4 tests failing: http://ci.theforeman.org/job/katello-pr-test/179/

@jlsherrill

This comment has been minimized.

Show comment
Hide comment
@jlsherrill

jlsherrill Dec 20, 2017

Member

and ignore the 'default' failure, rubocop is failing due to a new version. @parthaa is fixing it here: #7122

Member

jlsherrill commented Dec 20, 2017

and ignore the 'default' failure, rubocop is failing due to a new version. @parthaa is fixing it here: #7122

Show outdated Hide outdated db/migrate/20170714144125_add_deb.rb
@jlsherrill

This comment has been minimized.

Show comment
Hide comment
@jlsherrill

jlsherrill Dec 20, 2017

Member

[test default]

Member

jlsherrill commented Dec 20, 2017

[test default]

Fixes #10478 - Add deb_repo to Katello
migrations, models, views, service, glue and a lot of small stuff

Many thanks to @jlsherrill for reviewing and helping
Show outdated Hide outdated app/controllers/katello/api/v2/repositories_controller.rb
Show outdated Hide outdated app/controllers/katello/api/v2/repositories_controller.rb
@jlsherrill

ACK Great job @mdellweg !!! Thanks for working through the long journey to get this in!

@jlsherrill jlsherrill merged commit de1ddfa into Katello:master Dec 22, 2017

4 checks passed

default Build finished.
Details
hound No violations found. Woof!
prprocessor Commit message style is correct
Details
rails-5 Build finished.
Details
@jlsherrill

This comment has been minimized.

Show comment
Hide comment
@jlsherrill

jlsherrill Dec 22, 2017

Member

There are two things I think that need to be done next:

  1. update puppet-katello to install the debian pulp plugin
  2. update the client docs https://theforeman.org/plugins/katello/nightly/installation/clients.html to cover installing sub on a debian client
Member

jlsherrill commented Dec 22, 2017

There are two things I think that need to be done next:

  1. update puppet-katello to install the debian pulp plugin
  2. update the client docs https://theforeman.org/plugins/katello/nightly/installation/clients.html to cover installing sub on a debian client
@mdellweg

This comment has been minimized.

Show comment
Hide comment
@mdellweg

mdellweg Dec 22, 2017

Contributor

@jlsherrill thank you for helping me along the way.

Contributor

mdellweg commented Dec 22, 2017

@jlsherrill thank you for helping me along the way.

@mdellweg mdellweg deleted the ATIX-AG:feature/add_deb_repository_type branch Dec 24, 2017

mdellweg added a commit to ATIX-AG/puppet-katello that referenced this pull request Jan 3, 2018

ekohl added a commit to theforeman/puppet-katello that referenced this pull request Jan 10, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment