Update Platform tests that have hard coded content host versions #14317

Griffin-Sullivan · 2024-03-08T14:41:24Z

Problem Statement

PIT isn't running some of Platform's tests because they are hard coded to older rhel versions (7 or 8).

Solution

Update tests to be future-proof and run on whatever the test suite decides (ie: use settings file).

Related Issues

Griffin-Sullivan · 2024-03-08T14:43:11Z

trigger: test-robottelo
pytest: tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check

Satellite-QE · 2024-03-08T15:55:37Z

PRT Result

Build Number: 6000
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check --external-logging
Test Result : ============ 2 failed, 172 warnings, 1 error in 3839.20s (1:03:59) =============

Griffin-Sullivan · 2024-03-08T19:22:47Z

trigger: test-robottelo
pytest: tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check

Satellite-QE · 2024-03-08T20:35:47Z

PRT Result

Build Number: 6004
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check --external-logging
Test Result : ============ 2 passed, 163 warnings, 1 error in 3824.93s (1:03:44) =============

Griffin-Sullivan · 2024-03-08T20:58:13Z

trigger: test-robottelo
pytest: tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check

Satellite-QE · 2024-03-08T22:41:04Z

PRT Result

Build Number: 6005
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check --external-logging
Test Result : ============ 2 passed, 167 warnings, 1 error in 5645.72s (1:34:05) =============

Griffin-Sullivan · 2024-03-11T18:31:59Z

trigger: test-robottelo
pytest: tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check

devendra104 · 2024-03-13T05:15:44Z

trigger: test-robottelo
pytest: tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check

Griffin-Sullivan · 2024-03-13T16:08:16Z

trigger: test-robottelo
pytest: tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check

Satellite-QE · 2024-03-13T18:12:49Z

PRT Result

Build Number: 6057
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check --external-logging
Test Result : ================= 3 passed, 152 warnings in 6932.54s (1:55:32) =================

pytest_fixtures/core/contenthosts.py

lhellebr · 2024-03-19T13:27:38Z

pytest_fixtures/core/contenthosts.py

-    deploy_args['deploy_rhel_version'] = deploy_args.get('deploy_rhel_version', '8')
+    # if 'deploy_rhel_version' is not set, let's default to what's in server.yaml
+    deploy_args['deploy_rhel_version'] = deploy_args.get(
+        'deploy_rhel_version', settings.server.version.rhel_version


Why server version? Why not version from conf/content_host.yaml? Is it because it's for PIT?

I guess this is not obvious from the description but this host becomes a Satellite so I opt to use the Satellite os version from the settings file and not content host.

Since this custom_host fixture can be whatever you want let's do your change here and default to content_host.yaml and in my test we'll keep the server.yaml

lhellebr · 2024-03-19T13:28:17Z

robottelo/host_helpers/cli_factory.py

@@ -638,7 +638,7 @@ def setup_org_for_a_custom_repo(self, options=None):
        lce_promoted = cv_info['lifecycle-environments']
        # Promote version to next env
        try:
-            if env_id not in [int(lce['id']) for lce in lce_promoted]:
+            if (env_id not in [int(lce['id']) for lce in lce_promoted]) or multi_repo:


Explain in # comment please

It's not clear, what is multi_repo arg here could you elaborate? and when multi_repo is True, then shouldn't we check that first then the other check?

Can someone from the Phoenix-content group chime in and provide feedback on it?
@vsedmik @ColeHiggins2 @sambible @vijaysawant

Eh, it seems that @Griffin-Sullivan is trying to bypass @vijaysawant's bypass.

Looking at the first bypass PR, my guess is that it was trying to resolve the CVV Sorting Issue, which was later fixed on line 638.

Anyway, reading the docstring I don't think this helper was meant to be called in a loop, not for adding repos. It was for wrapping a repo into a product and shipping it via CV and AK.
If we need to create more custom repos in one custom product, we could extend the helper and pass the repo urls as a list and add them inside the helper.

Also, wouldn't it be easier for you @Griffin-Sullivan use this instead?

robottelo/robottelo/host_helpers/api_factory.py

Line 144 in db19610

def enable_sync_redhat_repo(self, rh_repo, org_id, timeout=1500):

I mean baseos and appstream are not custom repos, you could sync them as RH repos (just use module_sca_manifest_org instead of module_org) and ship them through the CV/LCE/AK used in your content_for_client fixture?

I was just trying to get around the issue that I explain in the comment. I was trying to make as minimal changes as possible for the test since I'm just trying to convert to using newer rhel versions. I guess in this case I can revert the change and use a different helper like enable_sync_redhat_repo

lhellebr · 2024-03-19T13:29:28Z

tests/foreman/destructive/test_capsule_loadbalancer.py

-        }
-    )
+    rhel_ver = settings.content_host.default_rhel_version
+    baseos = eval(f'settings.repos.RHEL{rhel_ver}_OS.baseos')


How about versions < 8 which don't have baseos and upstream?

My thought process was to keep this simple and not support RHEL 7 but I guess a good question would be how long do we need to support rhel 7? Especially in this one scenario that affects only this test.

I think it's up to you, I just pointed it out.

lhellebr · 2024-03-19T13:30:04Z

tests/foreman/maintain/test_upgrade.py

-        {'deploy_rhel_version': '8', 'deploy_flavor': 'satqe-ssd.disk.xxxl'},
-        {'deploy_rhel_version': '8', 'deploy_flavor': 'satqe-ssd.standard.std'},
+        {
+            'deploy_rhel_version': settings.server.version.rhel_version,


Again, consider using conf/content_host.yaml here and in the following code (I'm not commenting on everything separately)

Griffin-Sullivan · 2024-03-25T15:27:06Z

trigger: test-robottelo
pytest: tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check

Satellite-QE · 2024-03-25T16:48:34Z

PRT Result

Build Number: 6187
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check --external-logging
Test Result : ============ 2 passed, 149 warnings, 1 error in 4646.23s (1:17:26) =============

Satellite-QE · 2024-03-25T16:53:20Z

PRT Result

Build Number: 6189
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package tests/foreman/maintain/test_upgrade.py::test_negative_pre_upgrade_tuning_profile_check --external-logging
Test Result : ============ 2 passed, 150 warnings, 1 error in 4638.46s (1:17:18) =============

Griffin-Sullivan · 2024-03-27T15:57:16Z

trigger: test-robottelo
pytest: tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package

Satellite-QE · 2024-03-27T17:38:03Z

PRT Result

Build Number: 6225
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/destructive/test_capsule_loadbalancer.py::test_loadbalancer_install_package --external-logging
Test Result : ================== 1 passed, 5 warnings in 5498.90s (1:31:38) ==================

vsedmik

One final non-blocking nitpick, otherwise looks pretty good! 👍

vsedmik · 2024-03-27T18:52:57Z

tests/foreman/destructive/test_capsule_loadbalancer.py

    haproxy.install_katello_ca(module_target_sat)
    haproxy.register_contenthost(module_org.label, haproxy_ak.name)


I would just recommend to use global registration

Suggested change

haproxy.install_katello_ca(module_target_sat)

haproxy.register_contenthost(module_org.label, haproxy_ak.name)

haproxy.register(module_org, None, haproxy_ak.name, module_target_sat)

I'd say this is outside of the scope of the PR, but if other reviewers agree to change it now I'll update it.

Gauravtalreja1 · 2024-04-03T15:12:49Z

tests/foreman/maintain/test_upgrade.py

+    custom_host.execute(
+        f'dnf -y module enable satellite:el{rhel_major} && dnf -y install satellite'
+    )


Can we add a check here and split this module enable part as this is only for EL8?

lhellebr

My comments have been addressed

) (cherry picked from commit de6fc12)

…elliteQE#14317)

Griffin-Sullivan requested review from a team as code owners March 8, 2024 14:41

github-actions bot assigned Griffin-Sullivan Mar 8, 2024

Satellite-QE added the PRT-Failed Indicates that latest PRT run is failed for the PR label Mar 8, 2024

Griffin-Sullivan marked this pull request as draft March 8, 2024 17:39

Griffin-Sullivan force-pushed the platform-hosts branch from 00951fb to d05812d Compare March 8, 2024 19:22

Griffin-Sullivan force-pushed the platform-hosts branch from d05812d to e9d6de2 Compare March 8, 2024 20:57

Griffin-Sullivan force-pushed the platform-hosts branch from e9d6de2 to c342257 Compare March 11, 2024 18:31

Satellite-QE added PRT-Passed Indicates that latest PRT run is passed for the PR and removed PRT-Failed Indicates that latest PRT run is failed for the PR labels Mar 13, 2024

Griffin-Sullivan marked this pull request as ready for review March 14, 2024 15:22

lhellebr requested changes Mar 19, 2024

View reviewed changes

Griffin-Sullivan force-pushed the platform-hosts branch 2 times, most recently from 89b43c9 to dd1a20b Compare March 19, 2024 15:14

Griffin-Sullivan requested a review from ogajduse March 19, 2024 15:14

Griffin-Sullivan force-pushed the platform-hosts branch from dd1a20b to 6c24115 Compare March 25, 2024 15:26

Satellite-QE removed the PRT-Passed Indicates that latest PRT run is passed for the PR label Mar 25, 2024

Satellite-QE added the PRT-Failed Indicates that latest PRT run is failed for the PR label Mar 25, 2024

Griffin-Sullivan marked this pull request as draft March 25, 2024 17:18

Update Platform tests that have hard coded content host versions

bd8a91e

Griffin-Sullivan force-pushed the platform-hosts branch from 6c24115 to bd8a91e Compare March 27, 2024 15:56

Satellite-QE removed the PRT-Failed Indicates that latest PRT run is failed for the PR label Mar 27, 2024

Satellite-QE added the PRT-Passed Indicates that latest PRT run is passed for the PR label Mar 27, 2024

Griffin-Sullivan marked this pull request as ready for review March 27, 2024 17:38

Griffin-Sullivan requested review from vsedmik, Gauravtalreja1, ogajduse and lhellebr March 27, 2024 17:38

vsedmik approved these changes Mar 27, 2024

View reviewed changes

Gauravtalreja1 reviewed Apr 3, 2024

View reviewed changes

lhellebr approved these changes Apr 3, 2024

View reviewed changes

ogajduse approved these changes Apr 3, 2024

View reviewed changes

ogajduse merged commit de6fc12 into SatelliteQE:master Apr 3, 2024
11 checks passed

github-actions bot pushed a commit that referenced this pull request Apr 3, 2024

Update Platform tests that have hard coded content host versions (#14317

49ff0ab

) (cherry picked from commit de6fc12)

This was referenced Apr 3, 2024

[6.15.z] Update Platform tests that have hard coded content host versions #14616

Merged

[6.13.z] Update Platform tests that have hard coded content host versions #14617

Merged

shweta83 pushed a commit to shweta83/robottelo that referenced this pull request Apr 10, 2024

Update Platform tests that have hard coded content host versions (Sat…

a150c7a

…elliteQE#14317)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Platform tests that have hard coded content host versions #14317

Update Platform tests that have hard coded content host versions #14317

Griffin-Sullivan commented Mar 8, 2024

Griffin-Sullivan commented Mar 8, 2024

Satellite-QE commented Mar 8, 2024

Griffin-Sullivan commented Mar 8, 2024

Satellite-QE commented Mar 8, 2024

Griffin-Sullivan commented Mar 8, 2024

Satellite-QE commented Mar 8, 2024

Griffin-Sullivan commented Mar 11, 2024

devendra104 commented Mar 13, 2024

Griffin-Sullivan commented Mar 13, 2024

Satellite-QE commented Mar 13, 2024

lhellebr Mar 19, 2024 •

edited

Loading

Griffin-Sullivan Mar 19, 2024

Griffin-Sullivan Mar 19, 2024

lhellebr Mar 19, 2024

Gauravtalreja1 Mar 20, 2024

ogajduse Mar 22, 2024

vsedmik Mar 22, 2024

Griffin-Sullivan Mar 25, 2024

lhellebr Mar 19, 2024

Griffin-Sullivan Mar 19, 2024

lhellebr Apr 3, 2024

lhellebr Mar 19, 2024

Griffin-Sullivan Mar 19, 2024

Griffin-Sullivan commented Mar 25, 2024

Satellite-QE commented Mar 25, 2024

Satellite-QE commented Mar 25, 2024

Griffin-Sullivan commented Mar 27, 2024

Satellite-QE commented Mar 27, 2024

vsedmik left a comment

vsedmik Mar 27, 2024

Griffin-Sullivan Mar 29, 2024

Gauravtalreja1 Apr 3, 2024

lhellebr left a comment

		haproxy.install_katello_ca(module_target_sat)
		haproxy.register_contenthost(module_org.label, haproxy_ak.name)

	haproxy.install_katello_ca(module_target_sat)
	haproxy.register_contenthost(module_org.label, haproxy_ak.name)
	haproxy.register(module_org, None, haproxy_ak.name, module_target_sat)

Update Platform tests that have hard coded content host versions #14317

Update Platform tests that have hard coded content host versions #14317

Conversation

Griffin-Sullivan commented Mar 8, 2024

Problem Statement

Solution

Related Issues

Griffin-Sullivan commented Mar 8, 2024

Satellite-QE commented Mar 8, 2024

Griffin-Sullivan commented Mar 8, 2024

Satellite-QE commented Mar 8, 2024

Griffin-Sullivan commented Mar 8, 2024

Satellite-QE commented Mar 8, 2024

Griffin-Sullivan commented Mar 11, 2024

devendra104 commented Mar 13, 2024

Griffin-Sullivan commented Mar 13, 2024

Satellite-QE commented Mar 13, 2024

lhellebr Mar 19, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Griffin-Sullivan commented Mar 25, 2024

Satellite-QE commented Mar 25, 2024

Satellite-QE commented Mar 25, 2024

Griffin-Sullivan commented Mar 27, 2024

Satellite-QE commented Mar 27, 2024

vsedmik left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lhellebr left a comment

Choose a reason for hiding this comment

lhellebr Mar 19, 2024 •

edited

Loading