From 1aa09dbafb63ab98ac7bc67970d0acac2ebe4f7b Mon Sep 17 00:00:00 2001 From: oloc Date: Thu, 16 Jul 2015 15:47:46 +0200 Subject: [PATCH 1/3] Update Gemfile to convert git into https to avoid RSA Key issue --- .travis.yml | 22 ++++++++++++++++++++-- Gemfile | 4 ++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba588c7..03be2ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 1.8.7 - 1.9.3 - 2.0.0 + - 2.1 before_install: rm Gemfile.lock || true script: - "bundle exec rake lint" @@ -15,6 +16,23 @@ env: - PUPPET_VERSION="~> 3.2.0" - PUPPET_VERSION="~> 3.3.0" - PUPPET_VERSION="~> 3.4.0" + - PUPPET_VERSION="~> 3.5.0" matrix: - allow_failures: - - rvm: 2.0.0 + exclude: + - rvm: 1.9.3 + env: PUPPET_VERSION="~> 2.7.0" + - rvm: 2.0.0 + env: PUPPET_VERSION="~> 2.7.0" + - rvm: 2.0.0 + env: PUPPET_VERSION="~> 3.1.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 2.7.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 3.1.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 3.2.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 3.3.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 3.4.0" + diff --git a/Gemfile b/Gemfile index b768425..e5da386 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,8 @@ source 'https://rubygems.org' puppetversion = ENV['PUPPET_VERSION'] || '~> 3.7.0' gem 'puppet', puppetversion, :require => false -gem 'beaker', :git => 'git@github.com:puppetlabs/beaker.git', :branch => 'master' -gem 'beaker-rspec', :git => 'git@github.com:puppetlabs/beaker-rspec.git', :branch => 'master' +gem 'beaker', :git => 'https://github.com/puppetlabs/beaker.git', :branch => 'master' +gem 'beaker-rspec', :git => 'https://github.com/puppetlabs/beaker-rspec.git', :branch => 'master' gem 'metadata-json-lint', :git => 'https://github.com/nibalizer/metadata-json-lint.git', :branch => 'master' gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git', :branch => 'master' From 9d40004e1c54937005caa296c32646399c285d8e Mon Sep 17 00:00:00 2001 From: oloc Date: Thu, 16 Jul 2015 16:08:33 +0200 Subject: [PATCH 2/3] Update: remove the old Ruby 1.8.7 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 03be2ba..6dcd006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: ruby rvm: - - 1.8.7 - 1.9.3 - 2.0.0 - 2.1 From bb4d10e929a10a01f0c2acc110ebfd17bc048918 Mon Sep 17 00:00:00 2001 From: oloc Date: Mon, 20 Jul 2015 11:25:14 +0200 Subject: [PATCH 3/3] PR #46 - 2a482166dc2ae2357b74e4be44f1751dd3da156e --- manifests/repo.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index d97462b..b75f4f2 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -39,7 +39,7 @@ location => 'http://packages.elasticsearch.org/logstashforwarder/debian', release => 'stable', repos => 'main', - key => 'D88E42B4', + key => '46095ACC8548582C1A2699A9D27D666CD88E42B4', key_source => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch', include_src => false, }