Drop Debian 10 and Ubuntu 18.04 support

Remove Debian 10 and Ubuntu 18.04 support. Also removes some redundant cases for CentOS 6 and Ubuntu 16.04
voxpupuli · May 1, 2024 · b7b2827 · b7b2827
1 parent b1b3d62
commit b7b2827
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 31 deletions.
diff --git a/metadata.json b/metadata.json
@@ -73,14 +73,12 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10",
         "11"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04",
         "20.04",
         "22.04"
       ]

diff --git a/spec/classes/gitlab_ci_runner_spec.rb b/spec/classes/gitlab_ci_runner_spec.rb
@@ -330,30 +330,27 @@
         end
       end
 
-      # puppetlabs-docker doesn't support CentOS 6 anymore.
-      unless facts[:os]['name'] == 'CentOS' && facts[:os]['release']['major'] == '6'
-        context 'with manage_docker => true' do
-          let(:params) do
-            {
-              manage_docker: true
-            }
-          end
+      context 'with manage_docker => true' do
+        let(:params) do
+          {
+            manage_docker: true
+          }
+        end
 
-          it { is_expected.to compile }
+        it { is_expected.to compile }
 
-          it { is_expected.to contain_class('docker') }
+        it { is_expected.to contain_class('docker') }
 
-          it do
-            is_expected.to contain_class('docker::images').
-              with(
-                images: {
-                  'ubuntu_focal' => {
-                    'image' => 'ubuntu',
-                    'image_tag' => 'focal'
-                  }
+        it do
+          is_expected.to contain_class('docker::images').
+            with(
+              images: {
+                'ubuntu_focal' => {
+                  'image' => 'ubuntu',
+                  'image_tag' => 'focal'
                 }
-              )
-          end
+              }
+            )
         end
       end
 

diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
@@ -9,15 +9,6 @@
   ensure => present,
 }
 
-# https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2229
-# There is no /usr/share/zoneinfo in latest Docker image for ubuntu 16.04
-# Gitlab installer fail without this file
-if $facts['os']['release']['major'] in ['16.04', '18.04'] {
-  package { 'tzdata':
-    ensure => present,
-  }
-}
-
 # Setup Puppet Bolt
 $bolt_config = @("BOLTPROJECT"/L)
 modulepath: "/etc/puppetlabs/code/modules:/etc/puppetlabs/code/environments/production/modules"