Skip to content

Commit

Permalink
ci: Merge pull request #1172 from svinota/ci-no-root
Browse files Browse the repository at this point in the history
* fix unprivileged runs for ci
* fix linux nox sessions
  • Loading branch information
svinota authored Feb 9, 2024
2 parents 8f7c1b9 + abf8278 commit 8421f5b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ jobs:
steps:
- run: sudo chown -R $USER:$USER $GITHUB_WORKSPACE
- uses: actions/checkout@v4
- run: sudo make nox session=linux-3.6
- run: sudo make nox session=linux-3.8
- run: sudo make nox session=linux-3.10
- run: sudo make nox session=linux-3.12
- run: sudo make nox session=linux-python3.6
- run: sudo make nox session=linux-python3.8
- run: sudo make nox session=linux-python3.10
- run: sudo make nox session=linux-python3.12
linux-ubuntu-22:
runs-on: linux-ubuntu-22
steps:
- run: sudo chown -R $USER:$USER $GITHUB_WORKSPACE
- uses: actions/checkout@v4
- run: sudo make nox session=linux-3.6
- run: sudo make nox session=linux-3.10
- run: sudo make nox session=linux-python3.6
- run: sudo make nox session=linux-python3.10
openbsd:
runs-on: OpenBSD
steps:
Expand Down
10 changes: 5 additions & 5 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
'lab',
'neutron',
'integration',
'linux-3.6',
'linux-3.8',
'linux-3.10',
'linux-3.12',
'linux-python3.6',
'linux-python3.8',
'linux-python3.10',
'linux-python3.12',
'minimal',
]

Expand Down Expand Up @@ -245,7 +245,7 @@ def integration(session, config):
session.run(*options('test_integration', config))


@nox.session(python=['3.6', '3.8', '3.10', '3.12'])
@nox.session(python=['python3.6', 'python3.8', 'python3.10', 'python3.12'])
@add_session_config
def linux(session, config):
'''Run Linux functional tests. Requires root to run all the tests.'''
Expand Down
3 changes: 3 additions & 0 deletions tests/test_linux/test_ipr/test_config.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import pytest
from pr2test.marks import require_root

from pyroute2 import IPRoute

pytestmark = [require_root()]


@pytest.mark.parametrize('nlm_echo', (True, False))
def test_echo_route(context, nlm_echo):
Expand Down

0 comments on commit 8421f5b

Please sign in to comment.