Drop support for Foreman < 3.8, retain 3.5 version

theforeman · Sep 4, 2024 · 7e6fd50 · 7e6fd50
1 parent a19ad17
commit 7e6fd50
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 81 deletions.
diff --git a/bats/fb-katello-content.bats b/bats/fb-katello-content.bats
@@ -252,18 +252,6 @@ setup() {
     --name="${ACTIVATION_KEY}" --auto-attach=false
 }
 
-@test "add subscription to activation key" {
-  tSkipIfNewerThan45
-
-  sleep 10
-  activation_key_id=$(hammer --csv --no-headers activation-key info --organization="${ORGANIZATION}" \
-    --name="${ACTIVATION_KEY}" | cut -d, -f2)
-  subscription_id=$(hammer --csv --no-headers subscription list --organization="${ORGANIZATION}" \
-    | grep "${PRODUCT}" | cut -d, -f1)
-  hammer activation-key add-subscription --id=$activation_key_id \
-    --subscription-id=$subscription_id | grep -q "Subscription added to activation key"
-}
-
 @test "promote first content view again" {
   hammer content-view version promote  --organization="${ORGANIZATION}" \
     --content-view="${CONTENT_VIEW}" --to-lifecycle-environment="${LIFECYCLE_ENVIRONMENT}" --from-lifecycle-environment="Library"

diff --git a/bats/fb-test-foreman-rex.bats b/bats/fb-test-foreman-rex.bats
@@ -7,12 +7,7 @@ load os_helper
 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'
-  else
-    job_template='Run Command - Script Default'
-  fi
+  job_template='Run Command - Script Default'
 
   SMART_PROXY_NAME=$(hostname -f)
 

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

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.14"
         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.10'
+          - forklift_upgrade_version_intermediate == '4.12'
+          - forklift_upgrade_version_final == '4.14'
diff --git a/vagrant/config/versions.yaml b/vagrant/config/versions.yaml
@@ -1,57 +1,5 @@
 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'