Skip to content

Commit e95d129

Browse files
truthbktruthbk
authored
Transition to 2.0 dropping legacy + EOL compatibility fixes (DataDog#387)
* Transition to 2.0 dropping legacy + EOL compatibility fixes * fixing multiple lint issues * [agent6] tags currently unsupported on agent6 Should _patch_ the problem described in DataDog#386. Doesn't provide an alternative for agent6 though. * [agent6] add tagging support for agent6 Also removing gem provider options, should be the same for P4 and P5. * [functions] tag6 return type unavailable on 4.6 * [spec] fixing spec tests to accomodate for refactor chagnges, improve coverage * [skip ci] updating gitignore * [apt] address beta repo management * [apt] remove agent according to facts * [reports] attempt switch to tkishel/system_gem provider for reporting * [apt] set correct uri for keyserver * Revert "[reports] attempt switch to tkishel/system_gem provider for reporting" This reverts commit 9008acc. * [ubuntu] default repo must be stable * [rhel] set right repo for agent5/6 * [yum] allow overriding repo from init * [rhel] fix downgrades/upgrades across repos * [spec] fixing apm-related tests * [yum] remove package on downgrade * [yum] fix legacy, agent6 repo facts * [apt] enable repo uri location override in main manifest * [apt] actually pass location(repo) to ubuntu manifests * [apt] allow configuring apt release * [agent6] enabled process and apm configuration + extra options for agents. * [agent6] single hash for additional options for all things agent6 * [lint] fix multiple linter issues * [puppet][2.x] updating docs - skip ci
1 parent da2bd75 commit e95d129

120 files changed

Lines changed: 1088 additions & 828 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.fixtures.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@ fixtures:
22
repositories:
33
stdlib:
44
repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
5-
ref: "4.12.0"
5+
ref: "4.24.0"
66
concat:
77
repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
8-
ref: "2.2.0"
8+
ref: "4.1.1"
9+
apt:
10+
repo: "git://github.com/puppetlabs/puppetlabs-apt.git"
11+
ref: "4.5.0"
12+
puppetserver_gem:
13+
repo: "git://github.com/puppetlabs/puppetlabs-puppetserver_gem.git"
14+
ref: "1.0.0"
915
ruby: "git://github.com/puppetlabs/puppetlabs-ruby.git"
10-
remote_file: "git://github.com/lwf/puppet-remote_file.git"
1116
symlinks:
1217
custom_datadog: "#{source_dir}/spec/custom_fixtures/custom_datadog"
1318
datadog_agent: "#{source_dir}"

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ spec/fixtures
44
.bundle
55
vendor
66
Gemfile.lock
7+
8+
.rbenv-gemsets
9+
.ruby-version

‎.travis.yml‎

Lines changed: 3 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,13 @@ sudo: false
44
bundler_args: --full-index
55
cache: bundler
66
rvm:
7-
- 2.0.0
8-
- 2.1.1
7+
- 2.1.9
98
- 2.2.3
9+
- 2.3.6
10+
- 2.4.3
1011
script:
1112
- bundle exec rake test
1213
env:
13-
- PUPPET_VERSION="~> 2.7.0"
14-
- PUPPET_VERSION="~> 3.2.0"
15-
- PUPPET_VERSION="~> 3.3.0"
16-
- PUPPET_VERSION="~> 3.4.0"
17-
- PUPPET_VERSION="~> 3.5.0" STRICT_VARIABLES=yes
18-
- PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=yes
19-
- PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes
20-
- PUPPET_VERSION="~> 3.7.5" STRICT_VARIABLES=yes
21-
- PUPPET_VERSION="~> 3.8.1" STRICT_VARIABLES=yes
22-
- PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=yes
23-
- PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=yes
24-
- PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=yes
25-
- PUPPET_VERSION="~> 4.2.1" STRICT_VARIABLES=yes
26-
- PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
2714
- PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
2815
- PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
2916
- PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
@@ -33,80 +20,3 @@ env:
3320
- PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
3421
- PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
3522
- PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
36-
matrix:
37-
exclude:
38-
# Ruby 2.0.0
39-
- rvm: 2.0.0
40-
env: PUPPET_VERSION="~> 2.7.0"
41-
- rvm: 2.0.0
42-
env: PUPPET_VERSION="~> 4.1.0"
43-
- rvm: 2.0.0
44-
env: PUPPET_VERSION="~> 4.2.0"
45-
- rvm: 2.0.0
46-
env: PUPPET_VERSION="~> 4.2.1"
47-
- rvm: 2.0.0
48-
env: PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
49-
- rvm: 2.0.0
50-
env: PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
51-
- rvm: 2.0.0
52-
env: PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
53-
- rvm: 2.0.0
54-
env: PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
55-
- rvm: 2.0.0
56-
env: PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
57-
- rvm: 2.0.0
58-
env: PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
59-
- rvm: 2.0.0
60-
env: PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
61-
- rvm: 2.0.0
62-
env: PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
63-
- rvm: 2.0.0
64-
env: PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
65-
- rvm: 2.0.0
66-
env: PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
67-
68-
# Ruby 2.1.1
69-
- rvm: 2.1.1
70-
env: PUPPET_VERSION="~> 2.7.0"
71-
- rvm: 2.1.1
72-
env: PUPPET_VERSION="~> 3.2.0"
73-
- rvm: 2.1.1
74-
env: PUPPET_VERSION="~> 3.3.0"
75-
- rvm: 2.1.1
76-
env: PUPPET_VERSION="~> 3.4.0"
77-
- rvm: 2.1.1
78-
env: PUPPET_VERSION="~> 4.1.0"
79-
- rvm: 2.1.1
80-
env: PUPPET_VERSION="~> 4.2.0"
81-
- rvm: 2.1.1
82-
env: PUPPET_VERSION="~> 4.2.1"
83-
- rvm: 2.1.1
84-
env: PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
85-
- rvm: 2.1.1
86-
env: PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
87-
- rvm: 2.1.1
88-
env: PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
89-
- rvm: 2.1.1
90-
env: PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
91-
- rvm: 2.1.1
92-
env: PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
93-
- rvm: 2.1.1
94-
env: PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
95-
- rvm: 2.1.1
96-
env: PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
97-
- rvm: 2.1.1
98-
env: PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
99-
- rvm: 2.1.1
100-
env: PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
101-
- rvm: 2.1.1
102-
env: PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
103-
104-
# Ruby 2.2.3
105-
- rvm: 2.2.3
106-
env: PUPPET_VERSION="~> 2.7.0"
107-
- rvm: 2.2.3
108-
env: PUPPET_VERSION="~> 3.2.0"
109-
- rvm: 2.2.3
110-
env: PUPPET_VERSION="~> 3.3.0"
111-
- rvm: 2.2.3
112-
env: PUPPET_VERSION="~> 3.4.0"

‎Gemfile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
source "https://rubygems.org"
22

33
group :test do
4-
gem "syck"
5-
gem "public_suffix", "~> 2.0.5"
6-
gem "safe_yaml", "~> 1.0.4"
7-
gem "hiera-eyaml", "~> 2.1.0"
4+
gem "public_suffix", "~> 3.0.0"
85
gem "listen", "~> 3.0.0"
96
gem "puppet", ENV['PUPPET_VERSION'] || '~> 4.2.0'
107
gem "puppet-lint"
118
gem "puppet-syntax"
129
gem "puppetlabs_spec_helper"
1310
gem "jwt", "~> 1.5.6"
1411
gem "rake"
15-
gem "rspec-puppet", '2.3.2'
12+
gem "rspec-puppet", '2.6.9'
13+
gem 'rspec-puppet-facts', '~> 1.7', :require => false
1614
end
1715

1816
group :development do
1917
gem "beaker-rspec"
20-
gem "beaker", '2.51.0'
18+
gem "beaker", '3.31.0'
2119
gem "guard-rake"
22-
gem "nokogiri", "~> 1.6.0"
20+
gem "nokogiri", "~> 1.8.2"
2321
gem "puppet-blacksmith"
2422
gem "xmlrpc" if RUBY_VERSION >= '2.3'
2523
end

0 commit comments

Comments
 (0)
⚡