Skip to content

Commit

Permalink
Drop support for Foreman < 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
archanaserver committed Sep 4, 2024
1 parent a19ad17 commit d0bdd41
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 22 deletions.
4 changes: 2 additions & 2 deletions bats/fb-test-foreman-rex.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions bats/foreman_helper.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
8 changes: 4 additions & 4 deletions roles/forklift_versions/molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
13 changes: 0 additions & 13 deletions vagrant/config/versions.yaml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down

0 comments on commit d0bdd41

Please sign in to comment.