Skip to content

Commit

Permalink
PR-54: Update version, supported systems, builds.
Browse files Browse the repository at this point in the history
Establishes basic agent 1.x support according to more modern tooling. Starting
point for agent 2 support.
  • Loading branch information
benpatterson committed Jan 8, 2019
1 parent ba93ea8 commit d6aa866
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 18 deletions.
7 changes: 4 additions & 3 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ provisioner:
platforms:
- name: ubuntu-14.04
- name: ubuntu-16.04
- name: debian-7.8
- name: centos-6.7
- name: centos-7.3
- name: debian-8.11
- name: debian-9.5
- name: centos-6.10
- name: centos-7.5
- name: fedora-25

suites:
Expand Down
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,17 @@ script:
cache: bundler
sudo: required
rvm:
- 2.3
- 2.4
- 2.5
- 2.6
before_install:
- gem update --system 2.6.6
- gem --version
- gem update --system 3.0.2
env:
- CHEF_VERSION="= 12.21.14"
- CHEF_VERSION=">= 0.0.0" # installs latest

matrix:
exclude:
- rvm: 2.3
env: CHEF_VERSION=">= 0.0.0"
- rvm: 2.4
env: CHEF_VERSION="= 12.21.14"

Expand Down
2 changes: 1 addition & 1 deletion Berksfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ DEPENDENCIES
metadata: true

GRAPH
threatstack (2.2.2)
threatstack (3.0.0)
6 changes: 1 addition & 5 deletions attributes/repo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@

case node['platform_family']
when 'debian'
if node['platform'] == 'debian'
default['threatstack']['repo']['dist'] = 'wheezy'
else
default['threatstack']['repo']['dist'] = node['lsb']['codename']
end
default['threatstack']['repo']['dist'] = node['lsb']['codename']
default['threatstack']['repo']['url'] = 'https://pkg.threatstack.com/Ubuntu'
default['threatstack']['repo']['key'] = 'https://app.threatstack.com/APT-GPG-KEY-THREATSTACK'
when 'rhel', 'fedora', 'amazon'
Expand Down
4 changes: 2 additions & 2 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
maintainer 'Threat Stack'
maintainer_email '[email protected]'
license 'Apache-2.0'
description 'Installs/Configures Threat Stack cloudsight components'
description 'Installs/Configures Threat Stack agent components'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '2.2.2'
version '3.0.0'
issues_url 'https://github.com/threatstack/threatstack-chef/issues' if respond_to?(:issues_url)
source_url 'https://github.com/threatstack/threatstack-chef' if respond_to?(:source_url)

Expand Down
4 changes: 2 additions & 2 deletions spec/repo_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

describe 'threatstack::default' do
# Needs update
context 'debian-wheezy' do
context 'debian-jessie' do
let(:chef_run) do
runner = ChefSpec::SoloRunner.new(
platform: 'debian',
Expand All @@ -20,7 +20,7 @@

it 'sets up the apt repository' do
expect(chef_run).to add_apt_repository('threatstack').with(
distribution: 'wheezy'
distribution: 'jessie'
)
end
end
Expand Down

0 comments on commit d6aa866

Please sign in to comment.