Drop support for Foreman < 3.4

theforeman · Sep 3, 2024 · 1161d1f · 1161d1f
1 parent 6762c81
commit 1161d1f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/bats/fb-test-foreman-rex.bats b/bats/fb-test-foreman-rex.bats
@@ -8,8 +8,8 @@ load foreman_helper
 
 @test "run 'uptime' via Remote Execution" {
   FOREMAN_VERSION=$(tForemanVersion)
-  if ! tIsVersionNewer "${FOREMAN_VERSION}" 3.3; then
-    job_template='Run Command - SSH Default'
+  if ! tIsVersionNewer "${FOREMAN_VERSION}" 3.7; then
+    skip "Skipping test for versions older than 3.8"
   else
     job_template='Run Command - Script Default'
   fi

diff --git a/bats/foreman_helper.bash b/bats/foreman_helper.bash
@@ -46,10 +46,10 @@ tSkipIfOlderThan43() {
   fi
 }
 
-tSkipIfNewerThan45() {
+tSkipIfNewerThan46() {
   KATELLO_VERSION=$(tKatelloVersion)
-  if tIsVersionNewer "${KATELLO_VERSION}" 4.6; then
-    skip "Skip if Katello is newer than 4.5"
+  if tIsVersionNewer "${KATELLO_VERSION}" 4.7; then
+    skip "Skip if Katello is newer than 4.6"
   fi
 }
 

diff --git a/roles/forklift_versions/molecule/default/verify.yml b/roles/forklift_versions/molecule/default/verify.yml
@@ -66,6 +66,6 @@
     - name: Ensure upgrade steps have been determined correctly
       assert:
         that:
-          - forklift_upgrade_version_start == '4.5'
+          - forklift_upgrade_version_start == '4.6'
           - forklift_upgrade_version_intermediate == '4.7'
           - forklift_upgrade_version_final == '4.9'
diff --git a/vagrant/config/versions.yaml b/vagrant/config/versions.yaml
@@ -1,17 +1,4 @@
 installers:
-  - foreman: '3.3'
-    katello: '4.5'
-    pulpcore: '3.18'
-    puppet: 7
-    boxes:
-      - 'almalinux8'
-      - 'centos7'
-      - 'centos7-fips'
-      - 'centos8'
-      - 'centos8-stream'
-      - 'debian10'
-      - 'debian11'
-      - 'ubuntu2004'
 
   - foreman: '3.4'
     katello: '4.6'