diff --git a/.sync.yml b/.sync.yml index 853ee0e2..934784bd 100644 --- a/.sync.yml +++ b/.sync.yml @@ -48,8 +48,6 @@ appveyor.yml: delete: true spec/acceptance/nodesets/centos-6.yml: delete: true -spec/acceptance/nodesets/centos-8.yml: - image: centos:8.1.1911 spec/acceptance/nodesets/debian-8.yml: delete: true spec/acceptance/nodesets/debian-10.yml: diff --git a/Gemfile b/Gemfile index c62a43e2..3b7e71d8 100644 --- a/Gemfile +++ b/Gemfile @@ -32,8 +32,8 @@ group :development do gem "github_changelog_generator", require: false end group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] - gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-posix-system-r#{minor_version}", '~> 0.5', require: false, platforms: [:ruby] + gem "puppet-module-win-system-r#{minor_version}", '~> 0.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0') gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') gem "beaker-pe", require: false diff --git a/metadata.json b/metadata.json index 6baa5743..74ee73c1 100644 --- a/metadata.json +++ b/metadata.json @@ -81,5 +81,5 @@ ], "pdk-version": "1.17.0", "template-url": "https://github.com/treydock/pdk-templates.git#master", - "template-ref": "heads/master-0-g553c432" + "template-ref": "heads/master-0-gc5e50ff" } diff --git a/spec/acceptance/nodesets/centos-8.yml b/spec/acceptance/nodesets/centos-8.yml index 52f0f9a9..7fb073bd 100644 --- a/spec/acceptance/nodesets/centos-8.yml +++ b/spec/acceptance/nodesets/centos-8.yml @@ -4,14 +4,14 @@ HOSTS: - agent platform: el-8-x86_64 hypervisor: docker - image: centos:8.1.1911 + image: centos:8 docker_preserve_image: true docker_cmd: - '/usr/sbin/init' docker_image_commands: - 'yum install -y dnf-utils' - - 'dnf config-manager --set-enabled PowerTools' - - 'yum install -y wget which cronie iproute initscripts' + - 'dnf config-manager --set-enabled powertools' + - 'yum install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks' docker_container_name: 'keycloak-el8' CONFIG: log_level: debug