Skip to content

Commit 7e473ad

Browse files
Merge pull request #323 from puppetlabs/pdksync_IAC-890
pdksync - (IAC-890) - Implement CentOS 8 travis tests
2 parents 1956231 + 3aa5ef6 commit 7e473ad

File tree

5 files changed

+28
-4
lines changed

5 files changed

+28
-4
lines changed

.sync.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
- travis_deb
2020
- travis_el6
2121
- travis_el7
22+
- travis_el8
2223
complex:
2324
- collection:
2425
puppet_collection:

.travis.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,17 @@ jobs:
8282
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
8383
services: docker
8484
stage: acceptance
85+
-
86+
before_script:
87+
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
88+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
89+
- "bundle exec rake litmus:install_module"
90+
bundler_args:
91+
env: PLATFORMS=travis_el8_puppet5
92+
rvm: 2.5.7
93+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
94+
services: docker
95+
stage: acceptance
8596
-
8697
before_script:
8798
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
@@ -115,6 +126,17 @@ jobs:
115126
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
116127
services: docker
117128
stage: acceptance
129+
-
130+
before_script:
131+
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
132+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
133+
- "bundle exec rake litmus:install_module"
134+
bundler_args:
135+
env: PLATFORMS=travis_el8_puppet6
136+
rvm: 2.5.7
137+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
138+
services: docker
139+
stage: acceptance
118140
-
119141
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
120142
stage: static

Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ group :development do
3030
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3131
gem "ruby-pwsh", 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')
33-
gem 'ed25519', '>= 1.2', '< 2.0'
34-
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
3533
end
3634
group :system_tests do
3735
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,6 @@
104104
],
105105
"description": "Uses a combination of keytool and Ruby openssl library to manage entries in a Java keystore.",
106106
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
107-
"template-ref": "heads/master-0-g88b05c7",
108-
"pdk-version": "1.17.0"
107+
"template-ref": "heads/master-0-g9c14433",
108+
"pdk-version": "1.18.0"
109109
}

provision.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ travis_el6:
2020
travis_el7:
2121
provisioner: docker
2222
images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
23+
travis_el8:
24+
provisioner: docker
25+
images: ['litmusimage/centos:8']
2326
release_checks_5:
2427
provisioner: abs
2528
images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-12-x86_64', 'sles-15-x86_64', 'win-2012r2-x86_64', 'win-2016-x86_64', 'win-10-pro-x86_64']

0 commit comments

Comments
 (0)