Skip to content

ci: update ci #9

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

Merged
merged 2 commits into from
May 19, 2025
Merged

ci: update ci #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
579a2ef
ci: update ci
dupondje May 19, 2025
736e1d3
automation: drop python-nose
dupondje May 19, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ jobs:
container: quay.io/ovirt/buildcontainer:${{ matrix.distro }}
strategy:
matrix:
distro: [el8stream, el9stream]
distro: [el9stream, el10stream]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Mark repository as safe
run: git config --global --add safe.directory "$(pwd)"
- name: Check patch
run: ./automation/check-patch.sh
- name: Upload artifacts
uses: ovirt/upload-rpms-action@v1
uses: ovirt/upload-rpms-action@main
with:
directory: ${{ env.EXPORT_DIR }}
distro: ${{ matrix.distro }}
1 change: 0 additions & 1 deletion automation/check-patch.packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ openssh-clients
openssh-server
policycoreutils-python3
python3-devel
python3-nose
selinux-policy-devel
socat
systemd
Expand Down
10 changes: 2 additions & 8 deletions automation/check-patch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,5 @@

automation/build-artifacts.sh

if [ -x /usr/bin/nosetests-3 ]
then
nosetests-3
elif [ -x /usr/bin/nosetests ]
then
nosetests
fi

cd src/
python3 -m unittest discover ../tests "*_test.py"
8 changes: 4 additions & 4 deletions tests/validate_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ def test_reorder_already_ordered(self):
data = dict(self.out)
data['consoles'] = cons
consoles = validate.console_list(data)
self.assertEquals(consoles['consoles'], expected)
self.assertEqual(consoles['consoles'], expected)

def test_reorder_empty(self):
data = dict(self.out)
consoles = validate.console_list(data)
self.assertEquals(consoles, self.out)
self.assertEquals(consoles['consoles'], [])
self.assertEqual(consoles, self.out)
self.assertEqual(consoles['consoles'], [])

def test_reorder_does_not_change_other_keys(self):
cons = [
Expand All @@ -61,7 +61,7 @@ def test_reorder_does_not_change_other_keys(self):
consoles = validate.console_list(data)
del consoles['consoles']
del self.out['consoles']
self.assertEquals(consoles, self.out)
self.assertEqual(consoles, self.out)

def assertInvalid(self):
self.assertRaises(RuntimeError,
Expand Down
Loading