diff --git a/.travis.yml b/.travis.yml index 74880f7..6fb5263 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,38 +1,36 @@ # linter: http://lint.travis-ci.org/ language: ruby sudo: false bundler_args: --without development cache: bundler: true directories: - $HOME/librarian-puppet script: - RAKE_ENV=ci bundle exec puppet --version - RAKE_ENV=ci bundle exec rake validate - RAKE_ENV=ci bundle exec rake spec - RAKE_ENV=ci bundle exec rake lint rvm: - - 2.3.7 - 2.4.4 - - 2.5.5 + - 2.5.3 env: global: - LIBRARIAN_PUPPET_TMP="$HOME/librarian-puppet" matrix: - - PUPPET_VERSION="~> 4.10.0" STRICT_VARIABLES=yes - - PUPPET_VERSION="~> 5.5.0" STRICT_VARIABLES=yes + - PUPPET_VERSION="~> 5.0" STRICT_VARIABLES=yes - PUPPET_VERSION="~> 6.0" STRICT_VARIABLES=yes matrix: include: - - rvm: 2.4.0 + - rvm: 2.4.4 dist: trusty env: RAKE_ENV=ci BEAKER_debug=true BEAKER_set=default script: bundle exec rake acceptance services: docker sudo: required - - rvm: 2.4.0 + - rvm: 2.4.4 dist: trusty env: RAKE_ENV=ci BEAKER_debug=true BEAKER_set=debian9-6.3 script: bundle exec rake acceptance services: docker sudo: required diff --git a/Gemfile b/Gemfile index 80a7f1b..e092eb4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,43 +1,43 @@ source 'https://rubygems.org' group :tests do - puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 4.10.0', '< 7.0'] + puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 5.5.8', '< 7.0'] gem 'puppet', puppetversion gem 'rake' gem 'puppet-lint' gem 'puppetlabs_spec_helper' gem 'librarian-puppet', '>= 2.0' gem 'highline' gem 'simplecov' gem 'simplecov-console' gem 'rspec-puppet-facts' gem 'rspec', '>= 3.0.0' gem 'rspec-puppet', '>= 2.3.0' gem 'metadata-json-lint', require: false end # xmlrpc used to be bundled with Ruby until 2.4 if RUBY_VERSION >= '2.4.0' gem 'xmlrpc' end group :development do gem 'rubocop', '>= 0.49.0' gem 'puppet-blacksmith', git: 'https://github.com/deric/puppet-blacksmith', branch: 'tag-order' end group :system_tests do # beaker-rspec will require beaker gem if RUBY_VERSION >= '2.2.5' gem 'beaker' else gem 'beaker', '< 3' end gem 'pry' gem 'beaker-rspec' gem 'beaker-docker' gem 'serverspec' gem 'beaker-hostgenerator' gem 'beaker-puppet_install_helper' gem 'master_manipulator' end diff --git a/metadata.json b/metadata.json index 7b90738..3a45b1e 100644 --- a/metadata.json +++ b/metadata.json @@ -1,66 +1,66 @@ { "name": "deric-zookeeper", "version": "0.9.0-UNRELEASED", "author": "Tomas Barton", "summary": "Module for managing Apache Zookeeper", "license": "Apache-2.0", "source": "https://github.com/deric/puppet-zookeeper", "project_page": "https://github.com/deric/puppet-zookeeper", "issues_url": "https://github.com/deric/puppet-zookeeper/issues", "description": "ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.", "dependencies": [ { "name": "puppetlabs/stdlib", "version_requirement": ">= 2.3.3 < 7.0.0" }, { "name": "puppet/archive", "version_requirement": ">= 0.4.4 < 5.0.0" }, { "name": "puppet/cron", "version_requirement": ">= 1.3.1" }, { "name": "puppetlabs/yumrepo_core", "version_requirement": ">= 1.0.3" } ], "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ "8", "9", "10" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "16.04", "18.04" ] } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.10.0 < 7.0.0" + "version_requirement": ">= 5.5.8 < 7.0.0" } ] }