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

.fixtures.yml

@@ -2,12 +2,17 @@ fixtures:
   repositories:
     stdlib:
       repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-      ref: "4.12.0"
+      ref: "4.24.0"
     concat:
       repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
-      ref: "2.2.0"
+      ref: "4.1.1"
+    apt:
+      repo: "git://github.com/puppetlabs/puppetlabs-apt.git"
+      ref: "4.5.0"
+    puppetserver_gem:
+      repo: "git://github.com/puppetlabs/puppetlabs-puppetserver_gem.git"
+      ref: "1.0.0"
     ruby: "git://github.com/puppetlabs/puppetlabs-ruby.git"
-    remote_file: "git://github.com/lwf/puppet-remote_file.git"
   symlinks:
     custom_datadog: "#{source_dir}/spec/custom_fixtures/custom_datadog"
     datadog_agent: "#{source_dir}"

.gitignore

@@ -4,3 +4,6 @@ spec/fixtures
 .bundle
 vendor
 Gemfile.lock
+
+.rbenv-gemsets
+.ruby-version

.travis.yml

@@ -4,26 +4,13 @@ sudo: false
 bundler_args: --full-index
 cache: bundler
 rvm:
-  - 2.0.0
-  - 2.1.1
+  - 2.1.9
   - 2.2.3
+  - 2.3.6
+  - 2.4.3
 script:
   - bundle exec rake test
 env:
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.3.0"
-  - PUPPET_VERSION="~> 3.4.0"
-  - PUPPET_VERSION="~> 3.5.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.7.5" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.8.1" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 4.2.1" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
@@ -33,80 +20,3 @@ env:
   - PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
-matrix:
-  exclude:
-  # Ruby 2.0.0
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.1.0"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.2.0"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.2.1"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
-
-  # Ruby 2.1.1
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 2.7.0"
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 3.2.0"
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 3.3.0"
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 3.4.0"
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 4.1.0"
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 4.2.0"
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 4.2.1"
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
-  - rvm: 2.1.1
-    env: PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
-
-  # Ruby 2.2.3
-  - rvm: 2.2.3
-    env: PUPPET_VERSION="~> 2.7.0"
-  - rvm: 2.2.3
-    env: PUPPET_VERSION="~> 3.2.0"
-  - rvm: 2.2.3
-    env: PUPPET_VERSION="~> 3.3.0"
-  - rvm: 2.2.3
-    env: PUPPET_VERSION="~> 3.4.0"

Gemfile

@@ -1,25 +1,23 @@
 source "https://rubygems.org"
 
 group :test do
-  gem "syck"
-  gem "public_suffix", "~> 2.0.5"
-  gem "safe_yaml", "~> 1.0.4"
-  gem "hiera-eyaml", "~> 2.1.0"
+  gem "public_suffix", "~> 3.0.0"
   gem "listen", "~> 3.0.0"
   gem "puppet", ENV['PUPPET_VERSION'] || '~> 4.2.0'
   gem "puppet-lint"
   gem "puppet-syntax"
   gem "puppetlabs_spec_helper"
   gem "jwt", "~> 1.5.6"
   gem "rake"
-  gem "rspec-puppet", '2.3.2'
+  gem "rspec-puppet", '2.6.9'
+  gem 'rspec-puppet-facts', '~> 1.7', :require => false
 end
 
 group :development do
   gem "beaker-rspec"
-  gem "beaker", '2.51.0'
+  gem "beaker", '3.31.0'
   gem "guard-rake"
-  gem "nokogiri", "~> 1.6.0"
+  gem "nokogiri", "~> 1.8.2"
   gem "puppet-blacksmith"
   gem "xmlrpc" if RUBY_VERSION >= '2.3'
 end