Drop support for Foreman < 3.8, retain 3.5 version

theforeman · Sep 4, 2024 · 2a3cba2 · 2a3cba2
1 parent a19ad17
commit 2a3cba2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 52 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() {
+tSkipIfNewerThan410() {
   KATELLO_VERSION=$(tKatelloVersion)
-  if tIsVersionNewer "${KATELLO_VERSION}" 4.6; then
-    skip "Skip if Katello is newer than 4.5"
+  if tIsVersionNewer "${KATELLO_VERSION}" 4.11; then
+    skip "Skip if Katello is newer than 4.10"
   fi
 }
 

diff --git a/roles/forklift_versions/molecule/default/verify.yml b/roles/forklift_versions/molecule/default/verify.yml
@@ -60,12 +60,12 @@
       vars:
         scenario: "{{ pipeline_type }}"
         scenario_os: "almalinux8"
-        scenario_version: "4.9"
+        scenario_version: "4.13"
         upgrade: True
         upgrade_step: 2
     - name: Ensure upgrade steps have been determined correctly
       assert:
         that:
-          - forklift_upgrade_version_start == '4.5'
-          - forklift_upgrade_version_intermediate == '4.7'
-          - forklift_upgrade_version_final == '4.9'
+          - forklift_upgrade_version_start == '4.9'
+          - forklift_upgrade_version_intermediate == '4.11'
+          - forklift_upgrade_version_final == '4.13'
diff --git a/vagrant/config/versions.yaml b/vagrant/config/versions.yaml
@@ -1,57 +1,14 @@
 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'
-    pulpcore: '3.18'
-    puppet: 7
-    boxes:
-      - 'almalinux8'
-      - 'centos8-stream'
-      - 'debian11'
-      - 'ubuntu2004'
 
   - foreman: '3.5'
     katello: '4.7'
     pulpcore: '3.21'
     puppet: 7
     boxes:
       - 'almalinux8'
-      - 'centos8-stream'
       - 'debian11'
       - 'ubuntu2004'
 
-  - foreman: '3.6'
-    katello: '4.8'
-    pulpcore: '3.22'
-    puppet: 7
-    boxes:
-      - 'almalinux8'
-      - 'centos8-stream'
-      - 'debian11'
-      - 'ubuntu2004'
-
-  - foreman: '3.7'
-    katello: '4.9'
-    pulpcore: '3.22'
-    puppet: 7
-    boxes:
-      - 'almalinux8'
-      - 'centos8-stream'
-      - 'debian11'
-      - 'ubuntu2004'
   - foreman: '3.8'
     katello: '4.10'
     pulpcore: '3.28'