Skip to content

Commit 34e16bc

Browse files
author
carabasdaniel
authored
Merge pull request puppetlabs#136 from puppetlabs/pdksync_pdksync-honeycombsetup
(IAC-365) updating tokens and dataset for honeycomb and fix .sync.yml file
2 parents 1cbff4b + de96a78 commit 34e16bc

File tree

8 files changed

+51
-22
lines changed

8 files changed

+51
-22
lines changed

‎.github/workflows/release.yml

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77

88
jobs:
99
LitmusAcceptance:
10+
env:
11+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
12+
HONEYCOMB_DATASET: litmus tests
1013
runs-on: self-hosted
1114
strategy:
1215
matrix:

‎.sync.yml

+21-8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
".gitlab-ci.yml":
33
delete: true
44
".travis.yml":
5+
global_env:
6+
- HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
57
deploy_to_forge:
68
enabled: false
79
user: puppet
@@ -10,6 +12,7 @@
1012
- release
1113
includes:
1214
- bundler_args:
15+
dist: trusty
1316
env: PLATFORMS=deb_puppet5
1417
rvm: 2.5.1
1518
before_script:
@@ -18,11 +21,12 @@
1821
- bundle exec rake 'litmus:install_agent[puppet5]'
1922
- bundle exec rake litmus:install_module
2023
script:
21-
- bundle exec rake litmus:acceptance:serial
24+
- bundle exec rake litmus:acceptance:parallel
2225
services: docker
2326
sudo: required
2427
stage: acceptance
2528
- bundler_args:
29+
dist: trusty
2630
env: PLATFORMS=deb_puppet6
2731
rvm: 2.5.1
2832
before_script:
@@ -31,11 +35,12 @@
3135
- bundle exec rake 'litmus:install_agent[puppet6]'
3236
- bundle exec rake litmus:install_module
3337
script:
34-
- bundle exec rake litmus:acceptance:serial
38+
- bundle exec rake litmus:acceptance:parallel
3539
services: docker
3640
sudo: required
3741
stage: acceptance
3842
- bundler_args:
43+
dist: trusty
3944
env: PLATFORMS=ub_puppet5
4045
rvm: 2.5.1
4146
before_script:
@@ -44,11 +49,12 @@
4449
- bundle exec rake 'litmus:install_agent[puppet5]'
4550
- bundle exec rake litmus:install_module
4651
script:
47-
- bundle exec rake litmus:acceptance:serial
52+
- bundle exec rake litmus:acceptance:parallel
4853
services: docker
4954
sudo: required
5055
stage: acceptance
5156
- bundler_args:
57+
dist: trusty
5258
env: PLATFORMS=ub_puppet6
5359
rvm: 2.5.1
5460
before_script:
@@ -57,55 +63,59 @@
5763
- bundle exec rake 'litmus:install_agent[puppet6]'
5864
- bundle exec rake litmus:install_module
5965
script:
60-
- bundle exec rake litmus:acceptance:serial
66+
- bundle exec rake litmus:acceptance:parallel
6167
services: docker
6268
sudo: required
6369
stage: acceptance
6470
- bundler_args:
71+
dist: trusty
6572
env: PLATFORMS=el6_puppet5
6673
rvm: 2.5.1
6774
before_script:
6875
- bundle exec rake 'litmus:provision_list[travis_el6]'
6976
- bundle exec rake 'litmus:install_agent[puppet5]'
7077
- bundle exec rake litmus:install_module
7178
script:
72-
- bundle exec rake litmus:acceptance:serial
79+
- bundle exec rake litmus:acceptance:parallel
7380
services: docker
7481
sudo: required
7582
stage: acceptance
7683
- bundler_args:
84+
dist: trusty
7785
env: PLATFORMS=el6_puppet6
7886
rvm: 2.5.1
7987
before_script:
8088
- bundle exec rake 'litmus:provision_list[travis_el6]'
8189
- bundle exec rake 'litmus:install_agent[puppet6]'
8290
- bundle exec rake litmus:install_module
8391
script:
84-
- bundle exec rake litmus:acceptance:serial
92+
- bundle exec rake litmus:acceptance:parallel
8593
services: docker
8694
sudo: required
8795
stage: acceptance
8896
- bundler_args:
97+
dist: trusty
8998
env: PLATFORMS=el7_puppet5
9099
rvm: 2.5.1
91100
before_script:
92101
- bundle exec rake 'litmus:provision_list[travis_el7]'
93102
- bundle exec rake 'litmus:install_agent[puppet5]'
94103
- bundle exec rake litmus:install_module
95104
script:
96-
- bundle exec rake litmus:acceptance:serial
105+
- bundle exec rake litmus:acceptance:parallel
97106
services: docker
98107
sudo: required
99108
stage: acceptance
100109
- bundler_args:
110+
dist: trusty
101111
env: PLATFORMS=el7_puppet6
102112
rvm: 2.5.1
103113
before_script:
104114
- bundle exec rake 'litmus:provision_list[travis_el7]'
105115
- bundle exec rake 'litmus:install_agent[puppet6]'
106116
- bundle exec rake litmus:install_module
107117
script:
108-
- bundle exec rake litmus:acceptance:serial
118+
- bundle exec rake litmus:acceptance:parallel
109119
services: docker
110120
sudo: required
111121
stage: acceptance
@@ -115,6 +125,9 @@
115125
secure: >-
116126
EtyvcUX7n4eFSO5B2h5nH0PJXRJv4FpuJ2SjHuMjALlsHiYrNL2JA+t/PXF6xPLvWNs+pH2rWwBAXDzgR4Ltj3eiaN4UuM8Dvt+KmQ1h0ez2eATpmN47aZ4TueiMkSiUVzWT9aSZa85lS1nr9VcRuFLmTLVU1FH01Uu//5uiZkbcU5kODlkFYsT1/oUXEAA2U6MQdANRKYD2RFHb/M21RoV0rIjLy16cwOuHiXMvIb0tzWQOfauKI9byofK/oq+uryLmbAHeT3IYGCqggvrMVf7D6IsQgit83BRWR7hXKd6HNZUbdZvUEdRMtFhu3jH86BVrObNKZ/6aO5/e49yzsaZMXIvNjvQBs3na7TP7GuaDpDAasjaRUgNyGX3v+ALATFScL7RmdBngmLOVCyjPQ3BS5xtiiq7lnbNBPHD+pWaX+0KLcLtwFWUIz15XkLVTfWZ3LafuwSGiOtA5FK3NiuXxtHr6sLJIw5GMj4K0skUsGUR4P7V+fk4iS+nJtqd4wrZRgCEHUFhkPUfkR3c8LYfqqpe5EdFAK2ZBwqy5z3o7jtSLf4Q786OfMp+v9KcqDREMCkIy+zKafpVmSKV77zYZUdJ+F7rNikqWwqIXU9YFNyeWvIKoikc/YfLY0kXFOVU4yIcWS2lmtzS/tSGy0QS1E0PrbvqJ2Ubrk6djJEY=
117127
appveyor.yml:
128+
environment:
129+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
130+
HONEYCOMB_DATASET: litmus tests
118131
use_litmus: true
119132
matrix_extras:
120133
- RUBY_VERSION: 25-x64

‎.travis.yml

+17-10
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
@@ -36,27 +40,30 @@ matrix:
3640
-
3741
before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
3842
bundler_args:
43+
dist: trusty
3944
env: PLATFORMS=deb_puppet5
4045
rvm: 2.5.1
41-
script: ["bundle exec rake litmus:acceptance:serial"]
46+
script: ["bundle exec rake litmus:acceptance:parallel"]
4247
services: docker
4348
stage: acceptance
4449
sudo: required
4550
-
4651
before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
4752
bundler_args:
53+
dist: trusty
4854
env: PLATFORMS=deb_puppet6
4955
rvm: 2.5.1
50-
script: ["bundle exec rake litmus:acceptance:serial"]
56+
script: ["bundle exec rake litmus:acceptance:parallel"]
5157
services: docker
5258
stage: acceptance
5359
sudo: required
5460
-
5561
before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
5662
bundler_args:
57-
env: PLATFORMS=ul_puppet5
63+
dist: trusty
64+
env: PLATFORMS=ub_puppet5
5865
rvm: 2.5.1
59-
script: ["bundle exec rake litmus:acceptance:serial"]
66+
script: ["bundle exec rake litmus:acceptance:parallel"]
6067
services: docker
6168
stage: acceptance
6269
sudo: required
@@ -66,7 +73,7 @@ matrix:
6673
dist: trusty
6774
env: PLATFORMS=ub_puppet6
6875
rvm: 2.5.1
69-
script: ["bundle exec rake litmus:acceptance:serial"]
76+
script: ["bundle exec rake litmus:acceptance:parallel"]
7077
services: docker
7178
stage: acceptance
7279
sudo: required
@@ -76,7 +83,7 @@ matrix:
7683
dist: trusty
7784
env: PLATFORMS=el6_puppet5
7885
rvm: 2.5.1
79-
script: ["bundle exec rake litmus:acceptance:serial"]
86+
script: ["bundle exec rake litmus:acceptance:parallel"]
8087
services: docker
8188
stage: acceptance
8289
sudo: required
@@ -86,7 +93,7 @@ matrix:
8693
dist: trusty
8794
env: PLATFORMS=el6_puppet6
8895
rvm: 2.5.1
89-
script: ["bundle exec rake litmus:acceptance:serial"]
96+
script: ["bundle exec rake litmus:acceptance:parallel"]
9097
services: docker
9198
stage: acceptance
9299
sudo: required
@@ -96,7 +103,7 @@ matrix:
96103
dist: trusty
97104
env: PLATFORMS=el7_puppet5
98105
rvm: 2.5.1
99-
script: ["bundle exec rake litmus:acceptance:serial"]
106+
script: ["bundle exec rake litmus:acceptance:parallel"]
100107
services: docker
101108
stage: acceptance
102109
sudo: required
@@ -106,7 +113,7 @@ matrix:
106113
dist: trusty
107114
env: PLATFORMS=el7_puppet6
108115
rvm: 2.5.1
109-
script: ["bundle exec rake litmus:acceptance:serial"]
116+
script: ["bundle exec rake litmus:acceptance:parallel"]
110117
services: docker
111118
stage: acceptance
112119
sudo: required

‎Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ 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]
27+
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
2828
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
29-
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
29+
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3030
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3131
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')
3232
end

‎Rakefile

+2
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'

‎appveyor.yml

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ init:
1414
- 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0'
1515
- 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0'
1616
environment:
17+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
18+
HONEYCOMB_DATASET: litmus tests
1719
SIMPLECOV: yes
1820
matrix:
1921
-

‎metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
}
6969
],
7070
"description": "Tasks that manipulate a service",
71-
"pdk-version": "1.15.0",
71+
"pdk-version": "1.16.0",
7272
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
73-
"template-ref": "heads/master-0-gcaed9d7"
73+
"template-ref": "heads/master-0-g5d52853"
7474
}

‎spec/spec_helper.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
RSpec.configure do |c|
24
c.mock_with :rspec
35
end

0 commit comments

Comments
 (0)