From 6ac876c4e1b2fb7dce60790d72c3adfde0139bad Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 2 May 2023 19:20:09 +0200
Subject: [PATCH] Refs #36345 - Drop Puppet 6 support

---
 .../release/source/foreman-installer.groovy     |  8 +-------
 .../pipelines/test/foreman-installer.groovy     | 17 +++--------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/theforeman.org/pipelines/release/source/foreman-installer.groovy b/theforeman.org/pipelines/release/source/foreman-installer.groovy
index c6163192..18113ea1 100644
--- a/theforeman.org/pipelines/release/source/foreman-installer.groovy
+++ b/theforeman.org/pipelines/release/source/foreman-installer.groovy
@@ -17,11 +17,6 @@ pipeline {
                 }
             }
         }
-        stage("test ruby 2.5 & puppet 6") {
-            steps {
-                run_test(ruby: '2.5', puppet: '6.3')
-            }
-        }
         stage("test ruby 2.7 & puppet 7") {
             steps {
                 run_test(ruby: '2.7', puppet: '7')
@@ -63,8 +58,7 @@ def run_test(args) {
     def gemset = "ruby-${ruby}-puppet-${puppet}"
 
     try {
-        // Bundler 2.4 dropped Ruby 2.5 support
-        configureRVM(ruby, gemset, '< 2.4')
+        configureRVM(ruby, gemset)
         withRVM(["PUPPET_VERSION='${puppet}' bundle install --without=development --jobs=5 --retry=5"], ruby, gemset)
         archiveArtifacts(artifacts: 'Gemfile.lock')
         withRVM(["PUPPET_VERSION='${puppet}' bundle exec rake spec"], ruby, gemset)
diff --git a/theforeman.org/pipelines/test/foreman-installer.groovy b/theforeman.org/pipelines/test/foreman-installer.groovy
index 8df27c23..a1908266 100644
--- a/theforeman.org/pipelines/test/foreman-installer.groovy
+++ b/theforeman.org/pipelines/test/foreman-installer.groovy
@@ -12,24 +12,14 @@ pipeline {
                 axes {
                     axis {
                         name 'ruby'
-                        values '2.5', '2.7'
+                        values '2.7'
                     }
                     axis {
                         name 'PUPPET_VERSION'
-                        values '6.0', '7.0'
+                        values '7.0'
                     }
                 }
                 excludes {
-                    exclude {
-                        axis {
-                            name 'ruby'
-                            notValues '2.5'
-                        }
-                        axis {
-                            name 'PUPPET_VERSION'
-                            values '6.0'
-                        }
-                    }
                     exclude {
                         axis {
                             name 'ruby'
@@ -50,8 +40,7 @@ pipeline {
                     }
                     stage("Setup RVM") {
                         steps {
-                            // Bundler 2.4 dropped support for Ruby 2.5
-                            configureRVM(ruby, "${ruby}-${PUPPET_VERSION}", '< 2.4')
+                            configureRVM(ruby, "${ruby}-${PUPPET_VERSION}")
                         }
                     }
                     stage('Install dependencies') {