Merge pull request #87 from opus-codium/drop-eol-os

opus-codium · Jan 17, 2025 · cc16676 · cc16676
2 parents 17d59a6 + ff4840b
commit cc16676
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 23 deletions.
diff --git a/manifests/dependencies.pp b/manifests/dependencies.pp
@@ -19,7 +19,7 @@
       case $facts.get('os.name') {
         'debian': {
           case $facts.get('os.release.major') {
-            '10', '11': {
+            '11': {
               $odoo_dependencies = [
                 'python3-qrcode',
                 'python3-phonenumbers',
@@ -49,18 +49,6 @@
         }
         'ubuntu': {
           case $facts.get('os.release.full') {
-            '18.04': {
-              $odoo_dependencies = [
-                'python3-qrcode',
-                'python3-phonenumbers',
-                'python3-pyldap',
-                'python3-vobject',
-              ]
-
-              $odoo_pip_packages = {
-                'num2words' => { ensure => '0.5.10' },
-              }
-            }
             default: {
               warning("Please contribute support for ubuntu ${facts.get('os.release.full')}")
               $odoo_dependencies = []

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -194,14 +194,10 @@
 ) {
   $odoo_supported_versions = {
     'Debian' => {
-      '9'  => ['11.0', '12.0'],
-      '10' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'],
       '11' => ['14.0', '15.0', '16.0', 'system'],
       '12' => ['14.0', '15.0', '16.0', '17.0'],
     },
     'Ubuntu' => {
-      '16.04' => ['10.0', '11.0', '12.0'],
-      '18.04' => ['11.0', '12.0', '13.0'],
       '20.04' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'],
       '22.04' => ['14.0', '15.0', '16.0', '17.0'],
     },

diff --git a/metadata.json b/metadata.json
@@ -29,15 +29,13 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10",
         "11",
         "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04",
         "20.04",
         "22.04"
       ]

diff --git a/spec/acceptance/odoo_spec.rb b/spec/acceptance/odoo_spec.rb
@@ -5,14 +5,10 @@
 def odoo_supported_versions
   {
     'Debian' => {
-      '9'  => ['11.0', '12.0'],
-      '10' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'],
       '11' => ['14.0', '15.0', '16.0', 'system'],
       '12' => ['14.0', '15.0', '16.0', '17.0'],
     },
     'Ubuntu' => {
-      '16.04' => ['10.0', '11.0', '12.0'],
-      '18.04' => ['11.0', '12.0', '13.0'],
       '20.04' => ['11.0', '12.0', '13.0', '14.0', '15.0', '16.0'],
       '22.04' => ['14.0', '15.0', '16.0', '17.0'],
     },