Skip to content

Commit 6f0e17c

Browse files
author
carabasdaniel
authored
Merge pull request #1277 from puppetlabs/pdksync_pdksync-honeycombsetup
(IAC-365) updating tokens and dataset for honeycomb
2 parents 658aae3 + 31ae617 commit 6f0e17c

File tree

7 files changed

+29
-17
lines changed

7 files changed

+29
-17
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ on:
77

88
jobs:
99
LitmusAcceptance:
10-
10+
env:
11+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
12+
HONEYCOMB_DATASET: litmus tests
1113
runs-on: self-hosted
1214

1315
strategy:

.sync.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
- rubocop-i18n
99
- rubocop-rspec
1010
".travis.yml":
11+
global_env:
12+
- HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
1113
deploy_to_forge:
1214
enabled: false
1315
branches:
@@ -67,10 +69,10 @@
6769
stage: acceptance
6870
- bundler_args:
6971
dist: trusty
70-
env: PLATFORMS=el7_puppet5
72+
env: PLATFORMS=el6_puppet5
7173
rvm: 2.5.3
7274
before_script:
73-
- bundle exec rake 'litmus:provision_list[travis_el7]'
75+
- bundle exec rake 'litmus:provision_list[travis_el6]'
7476
- bundle exec rake 'litmus:install_agent[puppet5]'
7577
- bundle exec rake litmus:install_module
7678
script:
@@ -80,10 +82,10 @@
8082
stage: acceptance
8183
- bundler_args:
8284
dist: trusty
83-
env: PLATFORM=el7_puppet6
85+
env: PLATFORM=el6_puppet6
8486
rvm: 2.5.3
8587
before_script:
86-
- bundle exec rake 'litmus:provision_list[travis_el7]'
88+
- bundle exec rake 'litmus:provision_list[travis_el6]'
8789
- bundle exec rake 'litmus:install_agent[puppet6]'
8890
- bundle exec rake litmus:install_module
8991
script:
@@ -93,10 +95,10 @@
9395
stage: acceptance
9496
- bundler_args:
9597
dist: trusty
96-
env: PLATFORMS=el6_puppet5
98+
env: PLATFORMS=el7_puppet5
9799
rvm: 2.5.3
98100
before_script:
99-
- bundle exec rake 'litmus:provision_list[travis_el6]'
101+
- bundle exec rake 'litmus:provision_list[travis_el7]'
100102
- bundle exec rake 'litmus:install_agent[puppet5]'
101103
- bundle exec rake litmus:install_module
102104
script:
@@ -106,10 +108,10 @@
106108
stage: acceptance
107109
- bundler_args:
108110
dist: trusty
109-
env: PLATFORMS=el6_puppet6
111+
env: PLATFORMS=el7_puppet6
110112
rvm: 2.5.3
111113
before_script:
112-
- bundle exec rake 'litmus:provision_list[travis_el6]'
114+
- bundle exec rake 'litmus:provision_list[travis_el7]'
113115
- bundle exec rake 'litmus:install_agent[puppet6]'
114116
- bundle exec rake litmus:install_module
115117
script:

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@ before_install:
77
- rm -f Gemfile.lock
88
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
99
- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
10-
- '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
10+
- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
11+
- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
1112
- gem --version
1213
- bundle -v
1314
script:
1415
- 'SIMPLECOV=yes bundle exec rake $CHECK'
1516
bundler_args: --without system_tests
1617
rvm:
1718
- 2.5.3
19+
env:
20+
global:
21+
- HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
1822
stages:
1923
- static
2024
- spec
@@ -107,7 +111,7 @@ matrix:
107111
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
108112
bundler_args:
109113
dist: trusty
110-
env: PLATFORM=el7_puppet6
114+
env: PLATFORMS=el7_puppet6
111115
rvm: 2.5.3
112116
script: ["bundle exec rake litmus:acceptance:parallel"]
113117
services: docker

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ group :development do
2424
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2525
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))
2626
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
28-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
29-
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
30-
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27+
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
28+
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
29+
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
30+
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3131
gem "puppet-lint-i18n", require: false
3232
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')
3333
end

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
24
require 'puppetlabs_spec_helper/rake_tasks'
35
require 'puppet-syntax/tasks/puppet-syntax'

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@
8484
],
8585
"description": "MySQL module",
8686
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
87-
"template-ref": "heads/master-0-gcaed9d7",
88-
"pdk-version": "1.15.0"
87+
"template-ref": "heads/master-0-g5d52853",
88+
"pdk-version": "1.16.0"
8989
}

spec/spec_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'puppetlabs_spec_helper/module_spec_helper'
24
require 'rspec-puppet-facts'
35

0 commit comments

Comments
 (0)