From 335031a1284e76c945704ac52fe40dd0668ce64d Mon Sep 17 00:00:00 2001 From: Rehan Mahmood Date: Wed, 7 Dec 2022 09:16:55 -0500 Subject: [PATCH] - Updated os support matrix. - Updated `pdk` templates. --- .devcontainer/README.md | 8 +- .puppet-lint.rc | 3 +- .rubocop.yml | 2 +- .sync.yml | 63 +++++++++++++--- .travis.yml | 74 ++++++++++++++++--- Gemfile | 1 + Rakefile | 2 +- Vagrantfile | 38 ++++++++++ examples/init.pp | 1 - manifests/config.pp | 1 - manifests/init.pp | 5 +- manifests/install.pp | 1 - manifests/retrieve.pp | 8 +- metadata.json | 24 ++---- pdk.yaml | 2 + spec/acceptance/nodesets/default.yml | 10 --- spec/acceptance/nodesets/docker/centos-7.yml | 13 ---- spec/acceptance/nodesets/docker/centos-8.yml | 12 --- spec/acceptance/nodesets/docker/debian-10.yml | 13 ---- spec/acceptance/nodesets/docker/debian-8.yml | 12 --- spec/acceptance/nodesets/docker/debian-9.yml | 13 ---- .../nodesets/docker/opensuse-15.yml | 13 ---- .../nodesets/docker/ubuntu-14.04.yml | 15 ---- .../nodesets/docker/ubuntu-16.04.yml | 13 ---- .../nodesets/docker/ubuntu-18.04.yml | 13 ---- .../nodesets/docker/ubuntu-20.04.yml | 13 ---- 26 files changed, 178 insertions(+), 195 deletions(-) create mode 100644 Vagrantfile create mode 100644 pdk.yaml delete mode 100644 spec/acceptance/nodesets/default.yml delete mode 100644 spec/acceptance/nodesets/docker/centos-7.yml delete mode 100644 spec/acceptance/nodesets/docker/centos-8.yml delete mode 100644 spec/acceptance/nodesets/docker/debian-10.yml delete mode 100644 spec/acceptance/nodesets/docker/debian-8.yml delete mode 100644 spec/acceptance/nodesets/docker/debian-9.yml delete mode 100644 spec/acceptance/nodesets/docker/opensuse-15.yml delete mode 100644 spec/acceptance/nodesets/docker/ubuntu-14.04.yml delete mode 100644 spec/acceptance/nodesets/docker/ubuntu-16.04.yml delete mode 100644 spec/acceptance/nodesets/docker/ubuntu-18.04.yml delete mode 100644 spec/acceptance/nodesets/docker/ubuntu-20.04.yml diff --git a/.devcontainer/README.md b/.devcontainer/README.md index cc4675e..a719361 100644 --- a/.devcontainer/README.md +++ b/.devcontainer/README.md @@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp // Set *default* container specific settings.json values on container create. "settings": { - "terminal.integrated.shell.linux": "/bin/bash" + "terminal.integrated.profiles.linux": { + "bash": { + "path": "bash", + } + } }, // Add the IDs of extensions you want installed when the container is created. "extensions": [ "puppet.puppet-vscode", "rebornix.Ruby" - ] + ], // Use 'forwardPorts' to make a list of ports inside the container available locally. "forwardPorts": [], diff --git a/.puppet-lint.rc b/.puppet-lint.rc index 8772ecd..7d5d95f 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1,3 +1,2 @@ ---fail-on-warnings --relative ---no-140chars-check +--no-documentation-check diff --git a/.rubocop.yml b/.rubocop.yml index 8f782e7..31e8248 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,7 @@ require: - rubocop-rspec AllCops: DisplayCopNames: true - TargetRubyVersion: '2.4' + TargetRubyVersion: '2.5' Include: - "**/*.rb" Exclude: diff --git a/.sync.yml b/.sync.yml index 008cad1..351f2af 100644 --- a/.sync.yml +++ b/.sync.yml @@ -24,18 +24,57 @@ appveyor.yml: user: rehanone secure: "WiS9j4aI93DobVH/O/z6aHKOY8UL2hwn4+fflKuhvZzJPxfsYYfvQsyX43qetpVAIW7DCZLfO1QQlLF1/ywhe8Y9XRy923R6E7WckYPCGtGBpeTdS7p3Biss2H+ikxI9/5UFlewrdFxLxqgKz8lGLCt8zL1r7ggPWjJBfWEBtk2J9mj4BRTTGt6SWTSHwkdqjloQsPu32SXWY4nsU+87p+lO49YTOH2cS+54/DRCpccPl2AL+kXISDGiDZtlMyGdL2c0Z1e8etmOxbHN2X80YyOQY2GiKdGhzVfx5TDPElDXkOO5JkkZWmsz2D6BJYvu+s9awIJ6/pzGFDghZIK2MSgfUjJd9Vwt1lm48kHKsJ3DsSRIOHK+2ft/3nUl8y7j7KKQMcKKVN35/0uy/cXnD4acuxCh84e5bc0pmYy0gxLhLF6C9Ahv8pls7HhA+jaoUBNXIgCb685w6EgrkaeGMx1vz7VfZo56viod/zZ7XCXg8o5s7vthKMtYLnuGIEl2DvBC3KKtGvl4RnzFVUcZcB5lHgLZozskcwuWFtqd/AgqdIVRzKc6KmRWo8TkE/qOV79MaUpKGONmLMQfsz01HMn4m/NAmu4J55kFgFYkrkwy+9c/3Z9Ytce7goOnyxYYd0fFfaSM8vJCl7oe8Zb3znK2atMmpQAfDwYBwUNe1jU=" docker_sets: - - set: docker/ubuntu-20.04 - - set: docker/ubuntu-18.04 - - set: docker/ubuntu-16.04 - - set: docker/ubuntu-14.04 - - set: docker/debian-10 - - set: docker/debian-9 - - set: docker/debian-8 - - set: docker/centos-8 - - set: docker/centos-7 - - set: docker/opensuse-15 + - set: ubuntu2204-64 + collection: puppet7 + - set: ubuntu2204-64 + collection: puppet6 + - set: ubuntu2004-64 + collection: puppet7 + - set: ubuntu2004-64 + collection: puppet6 + - set: ubuntu1804-64 + collection: puppet7 + - set: ubuntu1804-64 + collection: puppet6 + - set: ubuntu1604-64 + collection: puppet7 + - set: ubuntu1604-64 + collection: puppet6 + - set: debian11-64 + collection: puppet7 + - set: debian11-64 + collection: puppet6 + - set: debian10-64 + collection: puppet7 + - set: debian10-64 + collection: puppet6 + - set: debian9-64 + collection: puppet7 + - set: debian9-64 + collection: puppet6 + # - set: almalinux9-64 + # collection: puppet7 + # - set: almalinux9-64 + # collection: puppet6 + - set: almalinux8-64 + collection: puppet7 + - set: almalinux8-64 + collection: puppet6 + # - set: rockylinux9-64 + # collection: puppet7 + # - set: rockylinux9-64 + # collection: puppet6 + # - set: rockylinux8-64 + # collection: puppet7 + # - set: rockylinux8-64 + # collection: puppet6 + # - set: opensuse15-64 + # collection: puppet7 + # - set: opensuse15-64 + # collection: puppet6 docker_defaults: dist: focal + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=@@COLLECTION@@ BEAKER_setfile=@@SET@@ BEAKER_TESTMODE=@@TESTMODE@@ branches: - master remove_branches: @@ -85,7 +124,9 @@ Gemfile: - gem: 'beaker-docker' Rakefile: - linter_fail_on_warnings: true + linter_fail_on_warnings: false + extra_disabled_lint_checks: + - 'documentation' spec/spec_helper.rb: mock_with: ':rspec' diff --git a/.travis.yml b/.travis.yml index 1c699da..faf7b2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-20.04 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu2204-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker @@ -40,7 +40,7 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-18.04 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu2204-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker @@ -49,7 +49,7 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-16.04 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu2004-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker @@ -58,7 +58,7 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu2004-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker @@ -67,7 +67,7 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/debian-10 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu1804-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker @@ -76,7 +76,7 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/debian-9 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1804-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker @@ -85,7 +85,7 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/debian-8 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=ubuntu1604-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker @@ -94,7 +94,7 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-8 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1604-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker @@ -103,7 +103,7 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker @@ -112,7 +112,61 @@ jobs: - bundler_args: --with system_tests dist: focal - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/opensuse-15 BEAKER_TESTMODE=apply + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian11-64 BEAKER_TESTMODE=apply + rvm: 2.5.7 + script: bundle exec rake beaker + services: docker + stage: acceptance + sudo: required + - + bundler_args: --with system_tests + dist: focal + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian10-64 BEAKER_TESTMODE=apply + rvm: 2.5.7 + script: bundle exec rake beaker + services: docker + stage: acceptance + sudo: required + - + bundler_args: --with system_tests + dist: focal + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian10-64 BEAKER_TESTMODE=apply + rvm: 2.5.7 + script: bundle exec rake beaker + services: docker + stage: acceptance + sudo: required + - + bundler_args: --with system_tests + dist: focal + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian9-64 BEAKER_TESTMODE=apply + rvm: 2.5.7 + script: bundle exec rake beaker + services: docker + stage: acceptance + sudo: required + - + bundler_args: --with system_tests + dist: focal + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian9-64 BEAKER_TESTMODE=apply + rvm: 2.5.7 + script: bundle exec rake beaker + services: docker + stage: acceptance + sudo: required + - + bundler_args: --with system_tests + dist: focal + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=almalinux8-64 BEAKER_TESTMODE=apply + rvm: 2.5.7 + script: bundle exec rake beaker + services: docker + stage: acceptance + sudo: required + - + bundler_args: --with system_tests + dist: focal + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_HYPERVISOR=docker BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=almalinux8-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker diff --git a/Gemfile b/Gemfile index 405d33c..a087d1c 100644 --- a/Gemfile +++ b/Gemfile @@ -24,6 +24,7 @@ group :development do gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby] gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false gem "puppet-lint-absolute_template_path", require: false gem "puppet-lint-absolute_classname-check", require: false gem "puppet-lint-alias-check", require: false diff --git a/Rakefile b/Rakefile index a1d96a9..24b54bf 100644 --- a/Rakefile +++ b/Rakefile @@ -42,7 +42,7 @@ def changelog_future_release end PuppetLint.configuration.send('disable_relative') -PuppetLint.configuration.fail_on_warnings = true +PuppetLint.configuration.send('disable_documentation') if Bundler.rubygems.find_name('github_changelog_generator').any? diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..7769a84 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,38 @@ + +VAGRANTFILE_API_VERSION = "2" + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + + config.vm.box = "bento/ubuntu-22.04" + config.vm.box_url = "https://app.vagrantup.com/bento/boxes/ubuntu-22.04" + + config.vm.synced_folder ".", "/etc/puppetlabs/code/environments/production/modules/jq" + + config.vm.provision :shell, inline: <<-EOF + readonly source_file="puppet7-release-jammy.deb" + readonly source_url="https://apt.puppetlabs.com/" + + if [ -f ${source_file} ]; then + echo "File ${source_file} exists." + else + echo "File ${source_file} does not exist." + echo "Downloading it from ${source_url}${source_file}" + apt-get install -y wget + wget ${source_url}${source_file} + dpkg -i ${source_file} + + apt-get update + apt-get install -y puppet-agent + fi + + puppet module install puppetlabs/stdlib + EOF + + config.vm.provision :puppet do |puppet| + puppet.manifests_path = "examples" + puppet.manifest_file = "init.pp" +# puppet.module_path = ["."] +# puppet.options = "../" +# puppet.options = "--verbose --debug" + end +end diff --git a/examples/init.pp b/examples/init.pp index 588292a..2c2fe89 100644 --- a/examples/init.pp +++ b/examples/init.pp @@ -1,5 +1,4 @@ node default { - notify { 'enduser-before': } notify { 'enduser-after': } diff --git a/manifests/config.pp b/manifests/config.pp index 565781c..c4f2f34 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,7 +1,6 @@ # config.pp class wget::config () inherits wget { - assert_private("Use of private class ${name} by ${caller_module_name}") create_resources('wget::retrieve', $wget::retrievals) diff --git a/manifests/init.pp b/manifests/init.pp index 04081aa..7912b44 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,12 +1,11 @@ -# init.pp - +# Class wget +# class wget ( Boolean $package_manage, String $package_ensure, String $package_name, Hash[String, Hash[String, String]] $retrievals = lookup('wget::retrievals', Hash, 'hash', {}), ) { - anchor { "${module_name}::begin": } -> class { "${module_name}::install": } -> class { "${module_name}::config": } diff --git a/manifests/install.pp b/manifests/install.pp index 8399d13..c7ebe4b 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,7 +1,6 @@ # install.pp class wget::install inherits wget { - assert_private("Use of private class ${name} by ${caller_module_name}") if $wget::package_manage { diff --git a/manifests/retrieve.pp b/manifests/retrieve.pp index 533fa7d..c575fdf 100644 --- a/manifests/retrieve.pp +++ b/manifests/retrieve.pp @@ -23,7 +23,6 @@ Optional[Stdlib::Httpurl] $http_proxy = undef, Optional[Stdlib::Httpsurl] $https_proxy = undef, ) { - # Does $destination end in a slash? If so, treat as a directory case $destination { # This is a nasty looking regex but it's simply checking to see if the $destination @@ -40,15 +39,15 @@ $http_proxy_env = $http_proxy ? { undef => [], - default => [ "HTTP_PROXY=${http_proxy}", "http_proxy=${http_proxy}" ], + default => ["HTTP_PROXY=${http_proxy}", "http_proxy=${http_proxy}"], } $https_proxy_env = $https_proxy ? { undef => [], - default => [ "HTTPS_PROXY=${https_proxy}", "https_proxy=${https_proxy}" ], + default => ["HTTPS_PROXY=${https_proxy}", "https_proxy=${https_proxy}"], } $password_env = $user ? { undef => [], - default => [ "WGETRC=${_destination}.wgetrc" ], + default => ["WGETRC=${_destination}.wgetrc"], } # not using stdlib.concat to avoid extra dependency @@ -142,7 +141,6 @@ } } - if !defined('wget') { contain wget } diff --git a/metadata.json b/metadata.json index 1285db0..e1da507 100644 --- a/metadata.json +++ b/metadata.json @@ -46,16 +46,11 @@ "operatingsystem": "AlmaLinux" }, { - "operatingsystem": "SLES", - "operatingsystemrelease": [ - "12", - "15" - ] + "operatingsystem": "SLES" }, { "operatingsystem": "Debian", "operatingsystemrelease": [ - "8", "9", "10", "11" @@ -64,19 +59,14 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "14.04", "16.04", "18.04", - "20.04" + "20.04", + "22.04" ] }, { - "operatingsystem": "FreeBSD", - "operatingsystemrelease": [ - "11", - "12", - "13" - ] + "operatingsystem": "FreeBSD" }, { "operatingsystem": "DragonFly" @@ -97,7 +87,7 @@ "download", "archive" ], - "pdk-version": "2.3.0", - "template-url": "pdk-default#2.3.0", - "template-ref": "tags/2.3.0-0-g8aaceff" + "pdk-version": "2.5.0", + "template-url": "pdk-default#2.5.0", + "template-ref": "tags/2.5.0-0-g369d483" } diff --git a/pdk.yaml b/pdk.yaml new file mode 100644 index 0000000..4bef4bd --- /dev/null +++ b/pdk.yaml @@ -0,0 +1,2 @@ +--- +ignore: [] diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 index dba339c..0000000 --- a/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - roles: - - agent - - default - platform: ubuntu-14.04-amd64 - hypervisor: vagrant - box: puppetlabs/ubuntu-14.04-64-nocm -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/docker/centos-7.yml b/spec/acceptance/nodesets/docker/centos-7.yml deleted file mode 100644 index 5932da9..0000000 --- a/spec/acceptance/nodesets/docker/centos-7.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - centos7-64: - docker_cmd: - - "/sbin/init" - image: centos:7 - platform: el-7-x86_64 - packaging_platform: el-7-x86_64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget - which ss - hypervisor: docker - roles: [] diff --git a/spec/acceptance/nodesets/docker/centos-8.yml b/spec/acceptance/nodesets/docker/centos-8.yml deleted file mode 100644 index 6a25e5d..0000000 --- a/spec/acceptance/nodesets/docker/centos-8.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - centos8-64: - docker_cmd: - - "/sbin/init" - image: centos:8 - platform: el-8-x86_64 - packaging_platform: el-8-x86_64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - dnf install -y crontabs initscripts iproute openssl tar wget - hypervisor: docker - roles: [] diff --git a/spec/acceptance/nodesets/docker/debian-10.yml b/spec/acceptance/nodesets/docker/debian-10.yml deleted file mode 100644 index 82794d7..0000000 --- a/spec/acceptance/nodesets/docker/debian-10.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - debian10-64: - docker_cmd: - - "/sbin/init" - image: debian:10 - platform: debian-10-amd64 - packaging_platform: debian-10-amd64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - rm -f /usr/sbin/policy-rc.d - - apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv - gnupg - hypervisor: docker diff --git a/spec/acceptance/nodesets/docker/debian-8.yml b/spec/acceptance/nodesets/docker/debian-8.yml deleted file mode 100644 index 45b25aa..0000000 --- a/spec/acceptance/nodesets/docker/debian-8.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - debian8-64: - docker_cmd: - - "/sbin/init" - image: debian:8 - platform: debian-8-amd64 - packaging_platform: debian-8-amd64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - rm -f /usr/sbin/policy-rc.d - - apt-get update && apt-get install -y cron locales-all net-tools wget - hypervisor: docker diff --git a/spec/acceptance/nodesets/docker/debian-9.yml b/spec/acceptance/nodesets/docker/debian-9.yml deleted file mode 100644 index f420fe2..0000000 --- a/spec/acceptance/nodesets/docker/debian-9.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - debian9-64: - docker_cmd: - - "/sbin/init" - image: debian:9 - platform: debian-9-amd64 - packaging_platform: debian-9-amd64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - rm -f /usr/sbin/policy-rc.d - - apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv - gnupg - hypervisor: docker diff --git a/spec/acceptance/nodesets/docker/opensuse-15.yml b/spec/acceptance/nodesets/docker/opensuse-15.yml deleted file mode 100644 index 8fcc2ab..0000000 --- a/spec/acceptance/nodesets/docker/opensuse-15.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - opensuse15-64: - docker_cmd: '["/usr/lib/systemd/systemd", "--system"]' - image: opensuse/leap:15 - platform: sles-15-x64 - packaging_platform: sles-15-x64 - docker_image_commands: - - zypper --non-interactive --no-gpg-checks install wget gzip - - wget https://yum.puppet.com/puppet6-release-sles-15.noarch.rpm - - zypper --non-interactive --no-gpg-checks install puppet6-release-sles-15.noarch.rpm - - zypper --non-interactive --no-gpg-checks install puppet-agent - hypervisor: docker - roles: [] diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml deleted file mode 100644 index 51c5935..0000000 --- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml +++ /dev/null @@ -1,15 +0,0 @@ -HOSTS: - ubuntu1404-64: - docker_cmd: - - "/sbin/init" - image: ubuntu:14.04 - platform: ubuntu-14.04-amd64 - packaging_platform: ubuntu-14.04-amd64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - rm /usr/sbin/policy-rc.d - - rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl - - apt-get install -y net-tools wget apt-transport-https - - locale-gen en_US.UTF-8 - - echo LANG=en_US.UTF-8 > /etc/default/locale - hypervisor: docker diff --git a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml b/spec/acceptance/nodesets/docker/ubuntu-16.04.yml deleted file mode 100644 index 1191401..0000000 --- a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - ubuntu1604-64: - docker_cmd: - - "/sbin/init" - image: ubuntu:16.04 - platform: ubuntu-16.04-amd64 - packaging_platform: ubuntu-16.04-amd64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - apt-get install -y net-tools wget locales apt-transport-https - - locale-gen en_US.UTF-8 - - echo LANG=en_US.UTF-8 > /etc/default/locale - hypervisor: docker diff --git a/spec/acceptance/nodesets/docker/ubuntu-18.04.yml b/spec/acceptance/nodesets/docker/ubuntu-18.04.yml deleted file mode 100644 index 33d6aca..0000000 --- a/spec/acceptance/nodesets/docker/ubuntu-18.04.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - ubuntu1804-64: - docker_cmd: - - "/sbin/init" - image: ubuntu:18.04 - platform: ubuntu-18.04-amd64 - packaging_platform: ubuntu-18.04-amd64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - apt-get install -y net-tools wget locales apt-transport-https iproute2 gnupg - - locale-gen en_US.UTF-8 - - echo LANG=en_US.UTF-8 > /etc/default/locale - hypervisor: docker diff --git a/spec/acceptance/nodesets/docker/ubuntu-20.04.yml b/spec/acceptance/nodesets/docker/ubuntu-20.04.yml deleted file mode 100644 index 95f4ed0..0000000 --- a/spec/acceptance/nodesets/docker/ubuntu-20.04.yml +++ /dev/null @@ -1,13 +0,0 @@ -HOSTS: - ubuntu2004-64: - docker_cmd: - - "/sbin/init" - image: ubuntu:20.04 - platform: ubuntu-20.04-amd64 - packaging_platform: ubuntu-20.04-amd64 - docker_image_commands: - - cp /bin/true /sbin/agetty - - apt-get install -y net-tools wget locales apt-transport-https iproute2 gnupg - - locale-gen en_US.UTF-8 - - echo LANG=en_US.UTF-8 > /etc/default/locale - hypervisor: docker