Skip to content
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

Adds Collectd CI Package repos #588

Merged
merged 1 commit into from
Dec 19, 2016

Conversation

petems
Copy link
Member

@petems petems commented Nov 29, 2016

  • Allows installation of 5.6 version of Collectd or master release (potential 5.7)
  • Refactor repo management behaviour into it's own classes
  • Add parameter to specify version from bleeding edge repos from CI

Closes #578

@petems petems force-pushed the add_ci_pkg_repos branch 2 times, most recently from 51359d9 to 5147efa Compare November 29, 2016 14:57
Copy link
Contributor

@igalic igalic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

collectd::repo can be drastically simplified.

}
}
}
default: {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this whole class can be simplified to

$os_class = downcase($::operatingsystem)
if defined("::collectd::repo::${os_class}") {
  include "::collectd::repo::$os_class"
} else {
  notify{"You have asked to manage_repo on a ${::osfamily} family that doesn't have a repo specified: ${::operatingsystem}":}
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice idea 👍

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done 👍

@petems petems force-pushed the add_ci_pkg_repos branch 2 times, most recently from 613bd24 to 944eb8e Compare November 29, 2016 19:23
@igalic
Copy link
Contributor

igalic commented Nov 30, 2016

some (related) tests are failing:

    when manage_repo is false
        should not contain Apt::Source[ppa_collectd] (FAILED - 3)

@petems petems force-pushed the add_ci_pkg_repos branch 5 times, most recently from 5e78f51 to 7d5d2c0 Compare December 14, 2016 15:39
@jamtur01
Copy link
Contributor

@petems See updates to your branch for fixes to Rubucop fails and added 5.7 support.

@petems
Copy link
Member Author

petems commented Dec 18, 2016

@jamtur01 Much appreciated! 👍

@jamtur01
Copy link
Contributor

@igalic The test failures seem to be a) network issue and b) deprecation notice from dependency. Not sure either are related to this PR. Any thoughts?

* Allows installation of 5.6 version of Collectd, 5.7 or RC (current master branch)
* Refactor repo management behaviour into it's own classes
* Add parameter to specify version from bleeding edge repos from CI
@petems
Copy link
Member Author

petems commented Dec 19, 2016

@jamtur01 The tests failures were actually issues, the CentOS code broke the EPEL ordering and the Debian code wasn't idempotent. I fixed the EPEL issue and changed the notify to a warning to fix the idempotency, we're good to go 😄

@igalic Tests green, let's merge this sucka! 👍

} else {
if $::operatingsystem == 'Debian' {
warning('Youre trying to use the Ubuntu PPA on a Debian Server, which may cause errors')
warning('We recomend you use the $ci_package_repo parameter if you with to use an upstream repo on Debian')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

" if you with to " sounds like a typo?

@bastelfreak bastelfreak merged commit 6fe738f into voxpupuli:master Dec 19, 2016
@petems petems deleted the add_ci_pkg_repos branch December 19, 2016 19:39
@bastelfreak bastelfreak added the enhancement New feature or request label Feb 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants