Skip to content

Commit

Permalink
Add support for Ubuntu 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
smortex committed Jan 27, 2025
1 parent 8c5c008 commit 17d965b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion manifests/dependencies.pp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
# https://www.odoo.com/documentation/13.0/setup/install.html
# Odoo 10.0 depends on the python-xlwt package (old version), so install
# the pip module on Odoo 11 and better.
unless fact('os.name') == 'debian' and versioncmp(fact('os.release.full'), '12.0') >= 0 {
unless fact('os.name') == 'debian' and versioncmp(fact('os.release.full'), '12.0') >= 0 or
fact('os.name') == 'ubuntu' and versioncmp(fact('os.release.full'), '24.04') >= 0 {

Check failure on line 85 in manifests/dependencies.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

two-space soft tabs not used (check: 2sp_soft_tabs)

Check warning on line 85 in manifests/dependencies.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 6 chars and is 13 (check: strict_indent)
package { 'xlwt':
ensure => '1.3.0',
provider => $odoo::pip_provider,
Expand Down
1 change: 1 addition & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
'Ubuntu' => {
'20.04' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'],
'22.04' => ['14.0', '15.0', '16.0', '17.0'],
'24.04' => ['14.0', '15.0', '16.0', '17.0', '18.0'],
},
}

Expand Down
2 changes: 1 addition & 1 deletion manifests/repo.pp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}

Apt::Source['odoo'] -> Class['odoo::package']
Class['apt::update'] -> Class['odoo::package']
Class['apt::update'] -> Class['odoo::dependencies'] -> Class['odoo::package']
}
'redhat': {
yumrepo { 'odoo':
Expand Down
3 changes: 2 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"20.04",
"22.04"
"22.04",
"24.04"
]
}
],
Expand Down
1 change: 1 addition & 0 deletions spec/acceptance/odoo_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ def odoo_supported_versions
'Ubuntu' => {
'20.04' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'],
'22.04' => ['14.0', '15.0', '16.0', '17.0'],
'24.04' => ['17.0', '18.0'],
},
}[fact('os.name')][fact('os.release.major')]
end
Expand Down

0 comments on commit 17d965b

Please sign in to comment.