From 4cb1c51f6237900ae905ca50d9552bda8ebd95ea Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Thu, 25 Apr 2024 10:46:38 +0200
Subject: [PATCH 1/2] 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
---
 README.md                             |  2 +-
 metadata.json                         |  2 --
 spec/classes/gitlab_ci_runner_spec.rb | 37 ++++++++++++---------------
 spec/setup_acceptance_node.pp         |  9 -------
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 11341bd..7ff1c53 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ Changing these after registration has no affect.
 The Gitlab CI runner installation is at the moment only tested on:
 * CentOS 7/8
 * Debian 10/11
-* Ubuntu 18.04/20.04/22.04
+* Ubuntu 20.04/22.04
 
 For the current list of tested and support operating systems, please checkout the metadata.json file.
 
diff --git a/metadata.json b/metadata.json
index dc14797..612be94 100644
--- 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
index ddd778c..6be5b81 100644
--- 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
index 8294fa5..5ae1312 100644
--- 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"

From 8d7cfbb85d5bf3a36601c1610ec88f67476725cf Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Wed, 1 May 2024 11:26:38 +0200
Subject: [PATCH 2/2] Remove explicit OS support naming from README

The readme already references the metadata.json file so rely on that.
---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 7ff1c53..ffa30c1 100644
--- a/README.md
+++ b/README.md
@@ -121,11 +121,6 @@ Changing these after registration has no affect.
 
 ## Limitations
 
-The Gitlab CI runner installation is at the moment only tested on:
-* CentOS 7/8
-* Debian 10/11
-* Ubuntu 20.04/22.04
-
 For the current list of tested and support operating systems, please checkout the metadata.json file.
 
 It is currently not possible to alter registration specific configuration settings after a runner is registered.