Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Rawhide CI Green #12065

Merged
merged 6 commits into from
Jun 28, 2024
Merged

Make Rawhide CI Green #12065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c3e85e
Use registry.fedoraproject.org/fedora:rawhide for rawhide test
Mab879 Jun 14, 2024
fd588f5
In F41+ it appears that lxml needs libxml2 and libxslt devel packages
Mab879 Jun 14, 2024
859a6b2
Remove compliance-trestle
Mab879 Jun 14, 2024
d90c98a
Convert test_platform_from_text_complex_expression to use features of…
Mab879 Jun 27, 2024
71ff151
Convert test_platform_from_text_complex_expression to use features of…
Mab879 Jun 27, 2024
15e7703
Remove id test from test_platform_from_text_complex_expression
Mab879 Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/automatus-ubuntu2204.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install Deps
run: sudo apt-get update && sudo apt-get install -y cmake ninja-build libopenscap8 python3-yaml python3-jinja2 git python3-deepdiff python3-requests jq python3-pip libxml2-utils
- name: Install deps python
run: pip3 install gitpython xmldiff
run: pip3 install gitpython xmldiff compliance-trestle==2.4.0 lxml lxml-stubs requests
- name: Checkout
uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@ jobs:
name: Build, Test on Fedora Rawhide (Container)
runs-on: ubuntu-latest
container:
image: fedora:rawhide
image: registry.fedoraproject.org/fedora:rawhide
steps:
- name: Run Updates
run: dnf update -y
- name: Install Deps
run: dnf install -y cmake make openscap-utils bats ansible python3-pip ShellCheck git python3-devel gcc-c++
run: dnf install -y cmake make openscap-utils bats ansible python3-pip ShellCheck git python3-devel gcc-c++ libxml2-devel libxslt-devel
- name: Checkout
uses: actions/checkout@v4
- name: Install deps python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gate_fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
image: fedora:latest
steps:
- name: Install Deps
run: dnf install -y cmake make openscap-utils python3-pyyaml bats ansible python3-pip ShellCheck git gcc gcc-c++ python3-devel
run: dnf install -y cmake make openscap-utils python3-pyyaml bats ansible python3-pip ShellCheck git gcc gcc-c++ python3-devel libxml2-devel libxslt-devel
- name: Checkout
uses: actions/checkout@v4
- name: Install deps python
Expand Down
4 changes: 0 additions & 4 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@ xmldiff
pytest
pytest-cov
# used in tests/units/utils/oscal
lxml
lxml-stubs
requests
compliance-trestle==2.4.0
PyGitHub
4 changes: 1 addition & 3 deletions tests/unit/ssg-module/test_build_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,9 @@ def test_platform_from_text_and_empty_conditionals(product_cpes):
def test_platform_from_text_complex_expression(product_cpes):
platform = ssg.build_yaml.Platform.from_text(
"systemd and !yum and (ntp or chrony)", product_cpes)
assert platform.get_remediation_conditional("bash") == "( rpm --quiet -q systemd && ( rpm --quiet -q chrony || rpm --quiet -q ntp ) && ! ( rpm --quiet -q yum ) )"
assert platform.get_remediation_conditional("ansible") == "( \"systemd\" in ansible_facts.packages and ( \"chrony\" in ansible_facts.packages or \"ntp\" in ansible_facts.packages ) and not ( \"yum\" in ansible_facts.packages ) )"
assert platform.test(**{'systemd': True, 'ntp': False, 'chrony': True, 'yum': False})
platform_el = platform.to_xml_element()
assert platform_el.tag == "{%s}platform" % cpe_language_namespace
assert platform_el.get("id") == "systemd_and_chrony_or_ntp_and_not_yum"
logical_tests = platform_el.findall(
"{%s}logical-test" % cpe_language_namespace)
assert len(logical_tests) == 1
Expand Down
Loading