Skip to content

Commit

Permalink
Sensu repos are moving (#632)
Browse files Browse the repository at this point in the history
* Update travis config

* Update _linux_spec.rb

* Update default_spec.rb
  • Loading branch information
Duncan Schulze authored and majormoses committed Dec 17, 2019
1 parent 40bd269 commit 1b656b2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

dist: trusty
dist: xenial
sudo: false
addons:
apt:
sources:
- chef-current-trusty
- chef-current-xenial
packages:
- chefdk

Expand All @@ -16,6 +16,7 @@ before_script:
- eval "$(/opt/chefdk/bin/chef shell-init bash)"

script:
- export CHEF_LICENSE="accept-silent"
- /opt/chefdk/embedded/bin/chef --version
- /opt/chefdk/embedded/bin/cookstyle --version
- /opt/chefdk/embedded/bin/foodcritic --version
Expand Down
12 changes: 6 additions & 6 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
default["sensu"]["client_deregister_on_stop"] = false
default["sensu"]["client_deregister_handler"] = nil

default["sensu"]["apt_repo_url"] = "http://repositories.sensuapp.org/apt"
default["sensu"]["yum_repo_url"] = "http://repositories.sensuapp.org"
default['sensu']['msi_repo_url'] = "https://repositories.sensuapp.org/msi"
default["sensu"]["apt_repo_url"] = "http://eol-repositories.sensuapp.org/apt"
default["sensu"]["yum_repo_url"] = "http://eol-repositories.sensuapp.org"
default['sensu']['msi_repo_url'] = "https://eol-repositories.sensuapp.org/msi"
default['sensu']['yum_flush_cache'] = nil
default["sensu"]["aix_package_root_url"] = "https://sensu.global.ssl.fastly.net/aix"
default["sensu"]["aix_package_root_url"] = "https://eol-repositories.sensuapp.org/aix"
default["sensu"]["add_repo"] = true
default['sensu']['apt_key_url'] = 'https://sensu.global.ssl.fastly.net/apt/pubkey.gpg'
default['sensu']['yum_key_url'] = 'https://sensu.global.ssl.fastly.net/yum/pubkey.gpg'
default['sensu']['apt_key_url'] = 'https://eol-repositories.sensuapp.org/apt/pubkey.gpg'
default['sensu']['yum_key_url'] = 'https://eol-repositories.sensuapp.org/yum/pubkey.gpg'

# transport
default["sensu"]["transport"]["reconnect_on_error"] = true
Expand Down
4 changes: 2 additions & 2 deletions spec/sensu-chef/_linux_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
end
end
it 'runs the _linux recipe' do
expect(chef_run).to add_yum_repository('sensu').with(baseurl: 'http://repositories.sensuapp.org/yum/7/$basearch/')
expect(chef_run).to add_yum_repository('sensu').with(baseurl: 'http://eol-repositories.sensuapp.org/yum/7/$basearch/')
expect(chef_run).to install_yum_package('sensu').with(version: '1.2.0-1.el7')
end

Expand Down Expand Up @@ -56,7 +56,7 @@
end
end
it 'runs the _linux recipe' do
expect(chef_run).to add_yum_repository('sensu').with(baseurl: 'http://repositories.sensuapp.org/yum/6/$basearch/')
expect(chef_run).to add_yum_repository('sensu').with(baseurl: 'http://eol-repositories.sensuapp.org/yum/6/$basearch/')
expect(chef_run).to install_yum_package('sensu').with(version: '1.2.0-1.el6')
end
end
Expand Down
4 changes: 2 additions & 2 deletions test/unit/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
end

it "configures the yum repo definition" do
expect(chef_run).to add_yum_repository("sensu").with(:baseurl => "http://repositories.sensuapp.org/yum/$releasever/$basearch/")
expect(chef_run).to add_yum_repository("sensu").with(:baseurl => "http://eol-repositories.sensuapp.org/yum/$releasever/$basearch/")
end

it_behaves_like('sensu default recipe')
Expand All @@ -74,7 +74,7 @@
end

it "configures the yum repo definition with the provided releasever" do
expect(chef_run).to add_yum_repository("sensu").with(:baseurl => "http://repositories.sensuapp.org/yum/dory/$basearch/")
expect(chef_run).to add_yum_repository("sensu").with(:baseurl => "http://eol-repositories.sensuapp.org/yum/dory/$basearch/")
end
end
end
Expand Down

0 comments on commit 1b656b2

Please sign in to comment.