From 3d1e97f463c5eef98c35b354d364adff2024db62 Mon Sep 17 00:00:00 2001 From: NeatNerdPrime Date: Sun, 13 Oct 2024 23:27:13 +0200 Subject: [PATCH 1/4] OP#119 Ensure puppet_odoo supports odoo18 on debian http://openproject.neatnerds.lan/work_packages/119 First jab at the corrections for odoo version 18 --- manifests/dependencies.pp | 2 +- manifests/init.pp | 6 +++--- manifests/repo.pp | 3 ++- spec/acceptance/odoo_spec.rb | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifests/dependencies.pp b/manifests/dependencies.pp index 8f8230b..a11ba69 100644 --- a/manifests/dependencies.pp +++ b/manifests/dependencies.pp @@ -41,7 +41,7 @@ $odoo_pip_packages = {} } default: { - warning("Please contribute support for ubuntu ${facts.get('os.release.full')}") + warning("Please contribute support for Debian ${facts.get('os.release.full')}") $odoo_dependencies = [] $odoo_pip_packages = {} } diff --git a/manifests/init.pp b/manifests/init.pp index 74dc89d..99b0547 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -80,7 +80,7 @@ # @param limit_time_real_cron Maximum allowed Real time per cron job # @param limit_request Maximum number of request to be processed per worker class odoo ( - Enum['10.0', '11.0', '12.0', '13.0', '14.0', '15.0', '16.0', '17.0', 'system'] $version = undef, + Enum['10.0', '11.0', '12.0', '13.0', '14.0', '15.0', '16.0', '17.0', '18.0', 'system'] $version = undef, String[1] $wkhtmltox_version = undef, Optional[Enum['wkhtmltox']] $wkhtmltopdf = undef, @@ -194,8 +194,8 @@ ) { $odoo_supported_versions = { 'Debian' => { - '11' => ['14.0', '15.0', '16.0', 'system'], - '12' => ['14.0', '15.0', '16.0', '17.0'], + '11' => ['14.0', '15.0', '16.0', '17.0', '18.0', 'system'], + '12' => ['14.0', '15.0', '16.0', '17.0', '18.0'], }, 'Ubuntu' => { '20.04' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'], diff --git a/manifests/repo.pp b/manifests/repo.pp index a977067..0d7cdf3 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -12,7 +12,8 @@ release => '', repos => './', key => { - id => '5D134C924CB06330DCEFE2A1DEF2A2198183CBB5', + name => 'odoo-archive-keyring.gpg', + source => 'https://nightly.odoo.com/odoo.key', }, include => { src => false, diff --git a/spec/acceptance/odoo_spec.rb b/spec/acceptance/odoo_spec.rb index fb3a5b8..3f52df8 100644 --- a/spec/acceptance/odoo_spec.rb +++ b/spec/acceptance/odoo_spec.rb @@ -5,8 +5,8 @@ def odoo_supported_versions { 'Debian' => { - '11' => ['14.0', '15.0', '16.0', 'system'], - '12' => ['14.0', '15.0', '16.0', '17.0'], + '11' => ['14.0', '15.0', '16.0', '17.0', '18.0', 'system'], + '12' => ['14.0', '15.0', '16.0', '17.0', '18.0'], }, 'Ubuntu' => { '20.04' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'], From 3c0d93f4577937889d1fcc11ca552e3b0614d0d0 Mon Sep 17 00:00:00 2001 From: NeatNerdPrime Date: Mon, 14 Oct 2024 00:34:49 +0200 Subject: [PATCH 2/4] OP#119 Ensure puppet_odoo supports odoo18 on debian http://openproject.neatnerds.lan/work_packages/119 * update repositories config --- manifests/repo.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 0d7cdf3..39d26b9 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -8,11 +8,11 @@ case $facts.get('os.family') { 'debian': { apt::source { 'odoo': - location => "http://nightly.odoo.com/${odoo::version}/nightly/deb/", + location => "https://nightly.odoo.com/${odoo::version}/nightly/deb/", release => '', repos => './', key => { - name => 'odoo-archive-keyring.gpg', + name => 'odoo.key', source => 'https://nightly.odoo.com/odoo.key', }, include => { From 815375bb9173375292f62aae541d4966ee335f76 Mon Sep 17 00:00:00 2001 From: NeatNerdPrime Date: Mon, 14 Oct 2024 00:46:27 +0200 Subject: [PATCH 3/4] OP#119 Ensure puppet_odoo supports odoo18 on debian http://openproject.neatnerds.lan/work_packages/119 Limit supported version for debian 10 and 11 to 17 due to a debian dpkg bug * https://unix.stackexchange.com/questions/669004/zst-compression-not-supported-by-apt-dpkg * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=892664 Forcing a dpkg version from backports is not a solution. --- REFERENCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REFERENCE.md b/REFERENCE.md index afef4d5..e6cfde2 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -116,7 +116,7 @@ The following parameters are available in the `odoo` class: ##### `version` -Data type: `Enum['10.0', '11.0', '12.0', '13.0', '14.0', '15.0', '16.0', '17.0', 'system']` +Data type: `Enum['10.0', '11.0', '12.0', '13.0', '14.0', '15.0', '16.0', '17.0', '18.0', 'system']` The version of odoo to install From a0698841d294683a3438ca0d698e0cfd8cc039e4 Mon Sep 17 00:00:00 2001 From: NeatNerdPrime Date: Sun, 26 Jan 2025 22:44:04 +0100 Subject: [PATCH 4/4] Add odoo 18 support https://github.com/opus-codium/puppet-odoo/pull/88 * Odoo 18 support * Apt repo: use name + source for key management in favor of deprecated key ID * Apt repo: use HTTPS in favor of http repo * Small correction in default case warning targetting Debian * Make the CI happy. This PR Follows https://github.com/opus-codium/puppet-odoo/pull/85#issuecomment-2597240952 --- manifests/init.pp | 2 +- spec/acceptance/odoo_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 99b0547..b5cdb30 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -194,7 +194,7 @@ ) { $odoo_supported_versions = { 'Debian' => { - '11' => ['14.0', '15.0', '16.0', '17.0', '18.0', 'system'], + '11' => ['14.0', '15.0', '16.0', 'system'], '12' => ['14.0', '15.0', '16.0', '17.0', '18.0'], }, 'Ubuntu' => { diff --git a/spec/acceptance/odoo_spec.rb b/spec/acceptance/odoo_spec.rb index 3f52df8..14fb598 100644 --- a/spec/acceptance/odoo_spec.rb +++ b/spec/acceptance/odoo_spec.rb @@ -5,7 +5,7 @@ def odoo_supported_versions { 'Debian' => { - '11' => ['14.0', '15.0', '16.0', '17.0', '18.0', 'system'], + '11' => ['14.0', '15.0', '16.0', 'system'], '12' => ['14.0', '15.0', '16.0', '17.0', '18.0'], }, 'Ubuntu' => {