Merge pull request #432 from puppetlabs/pdksync_IAC-890

pdksync - (IAC-890) - Implement CentOS 8 travis tests
This commit is contained in:
daianamezdrea
2020-06-18 16:22:37 +03:00
committed by GitHub
5 changed files with 28 additions and 4 deletions

View File

@@ -15,6 +15,7 @@
- travis_deb - travis_deb
- travis_el6 - travis_el6
- travis_el7 - travis_el7
- travis_el8
complex: complex:
- collection: - collection:
puppet_collection: puppet_collection:

View File

@@ -82,6 +82,17 @@ jobs:
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
-
before_script:
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
- "bundle exec rake 'litmus:install_agent[puppet5]'"
- "bundle exec rake litmus:install_module"
bundler_args:
env: PLATFORMS=travis_el8_puppet5
rvm: 2.5.7
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker
stage: acceptance
- -
before_script: before_script:
- "bundle exec rake 'litmus:provision_list[travis_deb]'" - "bundle exec rake 'litmus:provision_list[travis_deb]'"
@@ -115,6 +126,17 @@ jobs:
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
-
before_script:
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
- "bundle exec rake 'litmus:install_agent[puppet6]'"
- "bundle exec rake litmus:install_module"
bundler_args:
env: PLATFORMS=travis_el8_puppet6
rvm: 2.5.7
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker
stage: acceptance
- -
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint" env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
stage: static stage: static

View File

@@ -29,8 +29,6 @@ group :development do
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw] 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 "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') 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')
gem 'ed25519', '>= 1.2', '< 2.0'
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
end end
puppet_version = ENV['PUPPET_GEM_VERSION'] puppet_version = ENV['PUPPET_GEM_VERSION']

View File

@@ -82,6 +82,6 @@
} }
], ],
"template-url": "https://github.com/puppetlabs/pdk-templates#master", "template-url": "https://github.com/puppetlabs/pdk-templates#master",
"template-ref": "heads/master-0-g88b05c7", "template-ref": "heads/master-0-g9c14433",
"pdk-version": "1.17.0" "pdk-version": "1.18.0"
} }

View File

@@ -20,6 +20,9 @@ travis_el6:
travis_el7: travis_el7:
provisioner: docker provisioner: docker
images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7'] images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
travis_el8:
provisioner: docker
images: ['litmusimage/centos:8']
release_checks_5: release_checks_5:
provisioner: abs provisioner: abs
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'] 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']