From fe48580efdba92ae7cfa5f923ee96797b0bf170b Mon Sep 17 00:00:00 2001 From: Gabriel Nagy Date: Thu, 11 Mar 2021 16:59:21 +0200 Subject: [PATCH] (MODULES-10953) Update metadata.json and pdk version To avoid having to update this everytime we release a new agent platform, it should be enough to specify the supported OS, without specific versions. It is assumed that for each OS in metadata.json, the versions supported are the same as what the agent itself supports. Note: Puppet does not 'oficially' support ZFS on Linux (meaning we do not test against Linux configurations and we don't commit to solve and issues related to ZoL), so remove Linux platforms from metadata.json. However, we happily accept community contributions that do not break any Solaris functionality. --- Gemfile | 2 +- metadata.json | 43 ++----------------------------------------- 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/Gemfile b/Gemfile index 5f131ee..5c87918 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,7 @@ end group :release do gem "puppet-blacksmith", '~> 3.4', require: false - gem "pdk", platforms: [:ruby] + gem "pdk", '~> 2.0', platforms: [:ruby] end puppet_version = ENV['PUPPET_GEM_VERSION'] diff --git a/metadata.json b/metadata.json index 285d485..e469480 100644 --- a/metadata.json +++ b/metadata.json @@ -12,52 +12,13 @@ ], "operatingsystem_support": [ { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "OracleLinux", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "8" - ] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ - "16.04" - ] - }, - { - "operatingsystem": "Solaris", - "operatingsystemrelease": [ - "11" - ] + "operatingsystem": "Solaris" } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.0.0 < 7.0.0" + "version_requirement": ">= 6.0.0 < 8.0.0" } ], "pdk-version": "1.14.0",