make oscap tests run on rhel9 backend #14716

pondrejk · 2024-04-10T11:37:54Z

Problem Statement

Part of the oscap tests were too rhel8 backend specific and didn't run on rhel9 sat

Solution

Making the tests more flexible

Related Issues

Requires satelliteqe-jenkins mr 1300

Results form local rhel9 sat run:

pytest tests/foreman/cli/test_oscap.py 
...
============ 68 passed, 3 deselected, 35 warnings in 971.49s (0:16:11) =============

Griffin-Sullivan

This should also fix our fapolicyd pipeline on RHEL9. Thanks for the quick fix

robottelo/constants/__init__.py

pondrejk · 2024-04-12T09:54:31Z

trigger: test-robottelo
pytest: tests/foreman/cli/test_oscap.py

Satellite-QE · 2024-04-12T10:18:56Z

PRT Result

Build Number: 6483
Build Status: UNSTABLE
PRT Comment: pytest tests/foreman/cli/test_oscap.py --external-logging
Test Result : ==== 42 passed, 3 deselected, 143 warnings, 26 errors in 950.81s (0:15:50) =====

pondrejk · 2024-04-12T11:38:04Z

trigger: test-robottelo
pytest: tests/foreman/cli/test_oscap.py

Satellite-QE · 2024-04-12T12:06:32Z

PRT Result

Build Number: 6485
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/cli/test_oscap.py --external-logging
Test Result : ========= 68 passed, 3 deselected, 187 warnings in 1152.37s (0:19:12) ==========

jameerpathan111 · 2024-04-12T12:43:12Z

pytest_fixtures/component/oscap.py

-def oscap_content_path(session_target_sat):
+def oscap_content_source(session_target_sat):
+    """Get scap content file path"""
+    return f'{settings.oscap.content_dir}/ssg-rhel{session_target_sat.os_distribution_version.split(".")[0]}-ds.xml'


Suggested change

return f'{settings.oscap.content_dir}/ssg-rhel{session_target_sat.os_distribution_version.split(".")[0]}-ds.xml'

return f'{settings.oscap.content_dir}/ssg-rhel{session_target_sat.os_version.major}-ds.xml'

Same suggestion for all the other os_distribution_version occurrences.

Griffin-Sullivan · 2024-04-12T12:49:12Z

When you rerun PRT add deploy_rhel_version: 9

jameerpathan111 · 2024-04-12T12:53:19Z

@pondrejk How about we update oscap.yaml in CI repo based on Satellite RHEL version? It should solve the issues for all the versions.
It should look something like:

OSCAP:
  RHEL_MAJOR_VERSION: "@jinja {{this.server.version.rhel_version | int }}"
  CONTENT_PATH: '@format /usr/share/xml/scap/ssg/content/ssg-rhel{this.oscap.rhel_major_version}-ds.xml'
  # see: robottelo/constants/__init__.py OSCAP_PROFILE
  PROFILE: '@format security{this.oscap.rhel_major_version}'
  CONTENT_DIR: /usr/share/xml/scap/ssg/content

pondrejk · 2024-04-22T08:57:03Z

@pondrejk How about we update oscap.yaml in CI repo based on Satellite RHEL version? It should solve the issues for all the versions. It should look something like:
OSCAP:
  RHEL_MAJOR_VERSION: "@jinja {{this.server.version.rhel_version | int }}"
  CONTENT_PATH: '@format /usr/share/xml/scap/ssg/content/ssg-rhel{this.oscap.rhel_major_version}-ds.xml'
  # see: robottelo/constants/__init__.py OSCAP_PROFILE
  PROFILE: '@format security{this.oscap.rhel_major_version}'
  CONTENT_DIR: /usr/share/xml/scap/ssg/content

ok that seems superior, let me test it out

pondrejk · 2024-04-22T11:59:43Z

@jameerpathan111 @Griffin-Sullivan could you please take a look at satellite-jenkins mr !1316

pondrejk · 2024-04-22T12:01:20Z

Awaits satellite-jenkins config merge for prt run, local results with latest changes look good

pondrejk · 2024-04-23T10:33:47Z

trigger: test-robottelo
pytest: tests/foreman/cli/test_oscap.py

Satellite-QE · 2024-04-23T11:00:30Z

PRT Result

Build Number: 6649
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/cli/test_oscap.py --external-logging
Test Result : ========= 68 passed, 3 deselected, 192 warnings in 1119.44s (0:18:39) ==========

pytest_fixtures/component/oscap.py

Co-authored-by: Ondřej Gajdušek <[email protected]>

pondrejk · 2024-04-23T11:41:59Z

trigger: test-robottelo
pytest: tests/foreman/cli/test_oscap.py

Satellite-QE · 2024-04-23T12:07:34Z

PRT Result

Build Number: 6653
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/cli/test_oscap.py --external-logging
Test Result : ========= 68 passed, 3 deselected, 188 warnings in 1176.13s (0:19:36) ==========

pondrejk · 2024-04-23T13:51:52Z

pre-commit.ci autofix

for more information, see https://pre-commit.ci

Co-authored-by: Ondřej Gajdušek <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

make oscap tests run on rhel9 backend (#14716) Co-authored-by: Ondřej Gajdušek <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Co-authored-by: Ondřej Gajdušek <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

pondrejk added the No-CherryPick PR doesnt need CherryPick to previous branches label Apr 10, 2024

pondrejk self-assigned this Apr 10, 2024

pondrejk requested review from a team as code owners April 10, 2024 11:37

Griffin-Sullivan approved these changes Apr 10, 2024

View reviewed changes

robottelo/constants/__init__.py Outdated Show resolved Hide resolved

synkd approved these changes Apr 10, 2024

View reviewed changes

pondrejk force-pushed the oscap-rhel9 branch from 6cb4c72 to f011255 Compare April 11, 2024 07:24

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

pondrejk force-pushed the oscap-rhel9 branch from f011255 to e729a9c Compare April 12, 2024 11:33

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 Apr 12, 2024

jameerpathan111 requested changes Apr 12, 2024

View reviewed changes

pondrejk marked this pull request as draft April 22, 2024 08:57

make oscap tests run on rhel9 backend

4865d76

pondrejk force-pushed the oscap-rhel9 branch from e729a9c to 4865d76 Compare April 22, 2024 11:53

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

pondrejk marked this pull request as ready for review April 22, 2024 11:59

pondrejk requested a review from jameerpathan111 April 22, 2024 11:59

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

ogajduse reviewed Apr 23, 2024

View reviewed changes

pytest_fixtures/component/oscap.py Outdated Show resolved Hide resolved

Update pytest_fixtures/component/oscap.py

775a094

Co-authored-by: Ondřej Gajdušek <[email protected]>

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

jameerpathan111 approved these changes Apr 23, 2024

View reviewed changes

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

[pre-commit.ci] auto fixes from pre-commit.com hooks

7d31fcc

for more information, see https://pre-commit.ci

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

ogajduse approved these changes Apr 23, 2024

View reviewed changes

ogajduse enabled auto-merge (squash) April 23, 2024 13:55

ogajduse merged commit f9ba93d into SatelliteQE:master Apr 23, 2024
9 checks passed

pondrejk mentioned this pull request May 7, 2024

[6.15.z] added scap constant #14922

Merged

pondrejk mentioned this pull request May 7, 2024

[6.15.z] make oscap tests run on rhel9 backend (#14716) #14983

Merged

pondrejk mentioned this pull request May 7, 2024

[6.14.z] make oscap tests run on rhel9 backend (#14716) #14984

Merged

pondrejk mentioned this pull request May 7, 2024

[6.13.z] make oscap tests run on rhel9 backend (#14716) #14985

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

make oscap tests run on rhel9 backend #14716

make oscap tests run on rhel9 backend #14716

pondrejk commented Apr 10, 2024 •

edited

Loading

Griffin-Sullivan left a comment

pondrejk commented Apr 12, 2024

Satellite-QE commented Apr 12, 2024

pondrejk commented Apr 12, 2024

Satellite-QE commented Apr 12, 2024

jameerpathan111 Apr 12, 2024

Griffin-Sullivan commented Apr 12, 2024

jameerpathan111 commented Apr 12, 2024 •

edited

Loading

pondrejk commented Apr 22, 2024

pondrejk commented Apr 22, 2024

pondrejk commented Apr 22, 2024

pondrejk commented Apr 23, 2024

Satellite-QE commented Apr 23, 2024

pondrejk commented Apr 23, 2024

Satellite-QE commented Apr 23, 2024

pondrejk commented Apr 23, 2024

	return f'{settings.oscap.content_dir}/ssg-rhel{session_target_sat.os_distribution_version.split(".")[0]}-ds.xml'
	return f'{settings.oscap.content_dir}/ssg-rhel{session_target_sat.os_version.major}-ds.xml'

make oscap tests run on rhel9 backend #14716

make oscap tests run on rhel9 backend #14716

Conversation

pondrejk commented Apr 10, 2024 • edited Loading

Problem Statement

Solution

Related Issues

Griffin-Sullivan left a comment

Choose a reason for hiding this comment

pondrejk commented Apr 12, 2024

Satellite-QE commented Apr 12, 2024

pondrejk commented Apr 12, 2024

Satellite-QE commented Apr 12, 2024

jameerpathan111 Apr 12, 2024

Choose a reason for hiding this comment

Griffin-Sullivan commented Apr 12, 2024

jameerpathan111 commented Apr 12, 2024 • edited Loading

pondrejk commented Apr 22, 2024

pondrejk commented Apr 22, 2024

pondrejk commented Apr 22, 2024

pondrejk commented Apr 23, 2024

Satellite-QE commented Apr 23, 2024

pondrejk commented Apr 23, 2024

Satellite-QE commented Apr 23, 2024

pondrejk commented Apr 23, 2024

pondrejk commented Apr 10, 2024 •

edited

Loading

jameerpathan111 commented Apr 12, 2024 •

edited

Loading