From 6e3e922a709067ab244f76cc82c8f76e46de5898 Mon Sep 17 00:00:00 2001 From: Gabriel Nagy Date: Thu, 11 Mar 2021 18:17:55 +0200 Subject: (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. --- Gemfile | 2 +- metadata.json | 52 +++++++++++----------------------------------------- 2 files changed, 12 insertions(+), 42 deletions(-) diff --git a/Gemfile b/Gemfile index 894c449..4a4a661 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 812b12d..690dada 100644 --- a/metadata.json +++ b/metadata.json @@ -12,70 +12,40 @@ ], "operatingsystem_support": [ { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "7" - ] + "operatingsystem": "CentOS" }, { - "operatingsystem": "OracleLinux", - "operatingsystemrelease": [ - "7" - ] + "operatingsystem": "OracleLinux" }, { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "7" - ] + "operatingsystem": "RedHat" }, { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "7" - ] + "operatingsystem": "Scientific" }, { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "8" - ] + "operatingsystem": "Debian" }, { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ - "16.04" - ] + "operatingsystem": "Ubuntu" }, { - "operatingsystem": "Fedora", - "operatingsystemrelease": [ - "25" - ] + "operatingsystem": "Fedora" }, { - "operatingsystem": "Darwin", - "operatingsystemrelease": [ - "16" - ] + "operatingsystem": "Darwin" }, { - "operatingsystem": "SLES", - "operatingsystemrelease": [ - "12" - ] + "operatingsystem": "SLES" }, { - "operatingsystem": "Solaris", - "operatingsystemrelease": [ - "11" - ] + "operatingsystem": "Solaris" } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.10.0 < 7.0.0" + "version_requirement": ">= 6.0.0 < 8.0.0" } ], "pdk-version": "1.16.0", -- cgit v1.2.3