Skip to content

Commit

Permalink
Fix test_negative_pre_upgrade_tuning_profile_check
Browse files Browse the repository at this point in the history
  • Loading branch information
jameerpathan111 authored and Griffin-Sullivan committed Nov 14, 2023
1 parent adf6b7e commit 39c7dec
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
1 change: 1 addition & 0 deletions robottelo/constants/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1738,6 +1738,7 @@ class Colored(Box):
HAMMER_CONFIG = "~/.hammer/cli.modules.d/foreman.yml"
HAMMER_SESSIONS = "~/.hammer/sessions"

INSTALLER_CONFIG_FILE = '/etc/foreman-installer/scenarios.d/satellite.yaml'
SATELLITE_ANSWER_FILE = "/etc/foreman-installer/scenarios.d/satellite-answers.yaml"
CAPSULE_ANSWER_FILE = "/etc/foreman-installer/scenarios.d/capsule-answers.yaml"
MAINTAIN_HAMMER_YML = "/etc/foreman-maintain/foreman-maintain-hammer.yml"
Expand Down
23 changes: 10 additions & 13 deletions tests/foreman/maintain/test_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import pytest

from robottelo.config import settings
from robottelo.constants import SATELLITE_VERSION
from robottelo.constants import INSTALLER_CONFIG_FILE, SATELLITE_VERSION


def last_y_stream_version(release):
Expand Down Expand Up @@ -69,10 +69,6 @@ def test_positive_satellite_maintain_upgrade_list(sat_maintain):


@pytest.mark.include_capsule
@pytest.mark.skipif(
(settings.server.version.release == 'stream'),
reason='Upgrade path is not available for stream yet',
)
def test_positive_repositories_validate(sat_maintain):
"""Test repositories-validate pre-upgrade check is
skipped when system is subscribed using custom activationkey.
Expand Down Expand Up @@ -113,10 +109,6 @@ def test_positive_repositories_validate(sat_maintain):
ids=['default', 'medium'],
indirect=True,
)
@pytest.mark.skipif(
(settings.server.version.release == 'stream'),
reason='Upgrade path is not available for stream yet',
)
def test_negative_pre_upgrade_tuning_profile_check(request, custom_host):
"""Negative test that verifies a satellite with less than
tuning profile hardware requirements fails on pre-upgrade check.
Expand All @@ -140,11 +132,16 @@ def test_negative_pre_upgrade_tuning_profile_check(request, custom_host):
)
custom_host.download_repofile(product='satellite', release=last_y_stream)
custom_host.execute('dnf -y module enable satellite:el8 && dnf -y install satellite')
# Install without system checks to get around installer checks
# Install with development tuning profile to get around installer checks
custom_host.execute(
f'satellite-installer --scenario satellite --disable-system-checks --tuning {profile}',
'satellite-installer --scenario satellite --tuning development',
timeout='30m',
)
# Change to correct tuning profile (default or medium)
custom_host.execute(
f'sed -i "s/tuning: development/tuning: {profile}/g" {INSTALLER_CONFIG_FILE};'
f'satellite-installer'
)
# Get current Satellite version's repofile
custom_host.download_repofile(
product='satellite', release=sat_version, snap=settings.server.version.snap
Expand All @@ -154,10 +151,10 @@ def test_negative_pre_upgrade_tuning_profile_check(request, custom_host):
custom_host.execute('satellite-maintain upgrade list-versions')
# Check that we can upgrade to the new Y stream version
result = custom_host.execute('satellite-maintain upgrade list-versions')
assert sat_version in result.stdout
assert SATELLITE_VERSION in result.stdout
# Check that the upgrade check fails due to system requirements
result = custom_host.execute(
f'satellite-maintain upgrade check --target-version {sat_version}', timeout='5m'
f'satellite-maintain upgrade check --target-version {SATELLITE_VERSION}', timeout='5m'
)
assert (
f'ERROR: The installer is configured to use the {profile} tuning '
Expand Down

0 comments on commit 39c7dec

Please sign in to comment.