]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
(IAC-365) updating tokens and dataset for honeycomb pdksync_pdksync-honeycombsetup
authorsheena <sheena@puppet.com>
Wed, 5 Feb 2020 11:13:14 +0000 (11:13 +0000)
committersheena <sheena@puppet.com>
Thu, 6 Feb 2020 13:36:10 +0000 (13:36 +0000)
.github/workflows/release.yml
.sync.yml
.travis.yml
Gemfile
Rakefile
metadata.json
spec/spec_helper.rb

index dacc2ff7aa7b89ce7e0e5938339b29b0c9b0ea7e..0311717bb32113cb422da5d9633ed89d12d78ca4 100644 (file)
@@ -7,6 +7,9 @@ on:
 
 jobs:
   LitmusAcceptance:
+    env:
+      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+      HONEYCOMB_DATASET: litmus tests
     runs-on: self-hosted
     strategy:
       matrix:
index 4ff3516700f71f97899172dd13d87c4f78313b17..1f330a320e454134893bcc03db13a6f1d80fbc6c 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -2,6 +2,8 @@
 ".gitlab-ci.yml":
   delete: true
 ".travis.yml":
+  global_env: 
+    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
   deploy_to_forge:
     enabled: false
   branches:
index 52956a4705fa835ccea8ca17517abfa0a793b2d5..46e38309e97329e028edf569a885ef1f3a3f5dbe 100644 (file)
@@ -7,7 +7,8 @@ before_install:
   - rm -f Gemfile.lock
   - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
   - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
-  - '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
+  - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
+  - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
   - gem --version
   - bundle -v
 script:
@@ -15,6 +16,9 @@ script:
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
+env:
+  global:
+    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
 stages:
   - static
   - spec
diff --git a/Gemfile b/Gemfile
index 0e395e7ecbf02b49b6256e46126da8eac57527e3..4f6e33b02da9fa39c2b829963894287d9b4f96f4 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -24,10 +24,10 @@ group :development do
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 0.3',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end
 
index 395df547d4f278b6354fb15a14b32781e75a4e46..cb7ed0cc8fb24562a94cd918d90a50dc559bb00c 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
index 20d82a0d04e33c4adb1b04c9ce25cc23ef40c5ac..b4f16615165e7edc95d3bc92f82a1c5e334e45ce 100644 (file)
@@ -78,6 +78,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-gcaed9d7",
-  "pdk-version": "1.15.0"
+  "template-ref": "heads/master-0-g5d52853",
+  "pdk-version": "1.16.0"
 }
index c09e0024da88e5dc36642b80f75efdc9887a6065..bc023f51affdd6ac272aeb1b58ae847fd8213304 100644 (file)
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |c|
   c.mock_with :rspec
 end