Skip to content

Commit

Permalink
Update repo location
Browse files Browse the repository at this point in the history
The rundeck packages seems to have been relocated.  Update this location
to unbreak CI.
  • Loading branch information
smortex committed Aug 2, 2021
1 parent 7f35356 commit 32ac781
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
9 changes: 4 additions & 5 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
case $facts['os']['family'] {
'RedHat': {
if $manage_repo {
yumrepo { 'bintray-rundeck':
yumrepo { 'rundeck':
baseurl => $repo_yum_source,
descr => 'bintray rundeck repo',
descr => 'rundeck repo',
enabled => '1',
gpgcheck => '1',
gpgkey => $repo_yum_gpgkey,
Expand All @@ -73,10 +73,9 @@
'Debian': {
if $manage_repo {
include apt
apt::source { 'bintray-rundeck':
apt::source { 'rundeck':
location => $repo_apt_source,
release => '/',
repos => '',
repos => 'main',
key => {
id => $repo_apt_key_id,
server => $repo_apt_keyserver,
Expand Down
8 changes: 4 additions & 4 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
$package_ensure = 'installed'
$service_name = 'rundeckd'
$manage_repo = true
$repo_yum_source = 'http://dl.bintray.com/rundeck/rundeck-rpm/'
$repo_yum_gpgkey = 'https://bintray.com/user/downloadSubjectPublicKey?username=rundeck'
$repo_apt_source = 'https://dl.bintray.com/rundeck/rundeck-deb'
$repo_apt_key_id = '8756C4F765C9AC3CB6B85D62379CE192D401AB61'
$repo_yum_source = "https://packagecloud.io/pagerduty/rundeck/el/${fact('os.release.major')}/\$basearch"
$repo_yum_gpgkey = 'https://packagecloud.io/pagerduty/rundeck/gpgkey'
$repo_apt_source = 'https://packagecloud.io/pagerduty/rundeck'
$repo_apt_key_id = '0DDD2FA79B15D736ECEA32B89B5206167C5C34C0'
$repo_apt_keyserver = 'keyserver.ubuntu.com'

case $facts['os']['family'] {
Expand Down
8 changes: 4 additions & 4 deletions spec/classes/install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
case facts[:os]['family']
when 'RedHat'
it do
is_expected.to contain_yumrepo('bintray-rundeck').with(
baseurl: 'http://dl.bintray.com/rundeck/rundeck-rpm/',
is_expected.to contain_yumrepo('rundeck').with(
baseurl: "https://packagecloud.io/pagerduty/rundeck/el/#{facts[:os]['release']['major']}/$basearch",
gpgcheck: 1,
gpgkey: 'https://bintray.com/user/downloadSubjectPublicKey?username=rundeck'
gpgkey: 'https://packagecloud.io/pagerduty/rundeck/gpgkey'
).that_comes_before('Package[rundeck]')
end
when 'Debian'
it { is_expected.to contain_apt__source('bintray-rundeck').with_location('https://dl.bintray.com/rundeck/rundeck-deb') }
it { is_expected.to contain_apt__source('rundeck').with_location('https://packagecloud.io/pagerduty/rundeck') }
it { is_expected.to contain_package('rundeck').that_notifies('Class[rundeck::service]') }
it { is_expected.to contain_package('rundeck').that_requires('Class[apt::update]') }
end
Expand Down

0 comments on commit 32ac781

Please sign in to comment.