Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2e72a1e

Browse filesBrowse files
author
David Swan
committed
(IAC-215) - Pdk Update
1 parent 8465470 commit 2e72a1e
Copy full SHA for 2e72a1e

2 files changed

+64-43Lines changed: 64 additions & 43 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.travis.yml‎

Copy file name to clipboardExpand all lines: .travis.yml
+63-42Lines changed: 63 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
os: linux
23
dist: xenial
34
language: ruby
45
cache: bundler
@@ -23,96 +24,116 @@ stages:
2324
- static
2425
- spec
2526
- acceptance
26-
matrix:
27+
jobs:
2728
fast_finish: true
2829
include:
2930
-
30-
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
31-
stage: static
32-
-
33-
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
34-
rvm: 2.4.5
35-
stage: spec
36-
-
37-
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
38-
rvm: 2.5.3
39-
stage: spec
40-
-
41-
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"]
31+
before_script:
32+
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
33+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
34+
- "bundle exec rake litmus:install_module"
4235
bundler_args:
4336
dist: trusty
44-
env: PLATFORMS=deb_puppet5
45-
rvm: 2.5.1
37+
env: PLATFORMS=travis_deb_puppet5
38+
rvm: 2.5.3
4639
script: ["bundle exec rake litmus:acceptance:parallel"]
4740
services: docker
4841
stage: acceptance
49-
sudo: required
5042
-
51-
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"]
43+
before_script:
44+
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
45+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
46+
- "bundle exec rake litmus:install_module"
5247
bundler_args:
5348
dist: trusty
54-
env: PLATFORMS=deb_puppet6
55-
rvm: 2.5.1
49+
env: PLATFORMS=travis_ub_puppet5
50+
rvm: 2.5.3
5651
script: ["bundle exec rake litmus:acceptance:parallel"]
5752
services: docker
53+
stage: acceptance
5854
-
59-
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"]
55+
before_script:
56+
- "bundle exec rake 'litmus:provision_list[travis_el6]'"
57+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
58+
- "bundle exec rake litmus:install_module"
6059
bundler_args:
6160
dist: trusty
62-
env: PLATFORMS=ub_puppet5
63-
rvm: 2.5.1
61+
env: PLATFORMS=travis_el6_puppet5
62+
rvm: 2.5.3
6463
script: ["bundle exec rake litmus:acceptance:parallel"]
6564
services: docker
6665
stage: acceptance
67-
sudo: required
6866
-
69-
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[puppet6]'", "bundle exec rake litmus:install_module"]
67+
before_script:
68+
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
69+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
70+
- "bundle exec rake litmus:install_module"
7071
bundler_args:
7172
dist: trusty
72-
env: PLATFORMS=ub_puppet6
73-
rvm: 2.5.1
73+
env: PLATFORMS=travis_el7_puppet5
74+
rvm: 2.5.3
7475
script: ["bundle exec rake litmus:acceptance:parallel"]
7576
services: docker
77+
stage: acceptance
7678
-
77-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
79+
before_script:
80+
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
81+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
82+
- "bundle exec rake litmus:install_module"
7883
bundler_args:
7984
dist: trusty
80-
env: PLATFORMS=el6_puppet5
81-
rvm: 2.5.1
85+
env: PLATFORMS=travis_deb_puppet6
86+
rvm: 2.5.3
8287
script: ["bundle exec rake litmus:acceptance:parallel"]
8388
services: docker
8489
stage: acceptance
85-
sudo: required
8690
-
87-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
91+
before_script:
92+
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
93+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
94+
- "bundle exec rake litmus:install_module"
8895
bundler_args:
8996
dist: trusty
90-
env: PLATFORMS=el6_puppet6
91-
rvm: 2.5.1
97+
env: PLATFORMS=travis_ub_puppet6
98+
rvm: 2.5.3
9299
script: ["bundle exec rake litmus:acceptance:parallel"]
93100
services: docker
94101
stage: acceptance
95-
sudo: required
96102
-
97-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
103+
before_script:
104+
- "bundle exec rake 'litmus:provision_list[travis_el6]'"
105+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
106+
- "bundle exec rake litmus:install_module"
98107
bundler_args:
99108
dist: trusty
100-
env: PLATFORMS=el7_puppet5
101-
rvm: 2.5.1
109+
env: PLATFORMS=travis_el6_puppet6
110+
rvm: 2.5.3
102111
script: ["bundle exec rake litmus:acceptance:parallel"]
103112
services: docker
104113
stage: acceptance
105-
sudo: required
106114
-
107-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
115+
before_script:
116+
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
117+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
118+
- "bundle exec rake litmus:install_module"
108119
bundler_args:
109120
dist: trusty
110-
env: PLATFORMS=el7_puppet6
111-
rvm: 2.5.1
121+
env: PLATFORMS=travis_el7_puppet6
122+
rvm: 2.5.3
112123
script: ["bundle exec rake litmus:acceptance:parallel"]
113124
services: docker
114125
stage: acceptance
115-
sudo: required
126+
-
127+
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
128+
stage: static
129+
-
130+
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
131+
rvm: 2.4.5
132+
stage: spec
133+
-
134+
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
135+
rvm: 2.5.3
136+
stage: spec
116137
branches:
117138
only:
118139
- master
Collapse file

‎metadata.json‎

Copy file name to clipboardExpand all lines: metadata.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@
8181
}
8282
],
8383
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
84-
"template-ref": "heads/master-0-g5d52853",
84+
"template-ref": "heads/master-0-g88c96ab",
8585
"pdk-version": "1.16.0"
8686
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.