diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index bf8b786d3..7bd92c66a 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -30,53 +30,26 @@ jobs: name: testrun_package path: testrun*.deb - install_package_22: + install_package: permissions: {} needs: create_package - name: Install on Ubuntu 22.04 - runs-on: ubuntu-22.04 + name: Install on Ubuntu ${{ matrix.os }} + runs-on: ${{ matrix.os }} timeout-minutes: 15 + strategy: + matrix: + os: [ubuntu-22.04, ubuntu-24.04, ubuntu-26.04] + fail-fast: false steps: - name: Checkout source uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - - name: Download package + - name: Download package & scripts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: name: testrun_package - - name: Install dependencies - shell: bash {0} - run: sudo cmd/prepare - - name: Install package - shell: bash {0} - run: sudo -E DEBIAN_FRONTEND=noninteractive apt install ./testrun*.deb - - name: Start testrun + - name: Make prepare script executable shell: bash {0} - run: sudo testrun > >(tee testrun_output.log) 2>&1 & - - name: Verify testrun started - shell: bash {0} - run: | - sleep 5 - if grep -q "API waiting for requests" testrun_output.log; then - echo "Testrun started successfully." - else - echo "Testrun did not start correctly." - cat testrun_output.log - exit 1 - fi - - install_package_24: - permissions: {} - needs: create_package - name: Install on Ubuntu 24.04 - runs-on: ubuntu-24.04 - timeout-minutes: 15 - steps: - - name: Checkout source - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - - name: Download package - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 - with: - name: testrun_package + run: chmod +x cmd/prepare - name: Install dependencies shell: bash {0} run: sudo cmd/prepare @@ -96,4 +69,4 @@ jobs: echo "Testrun did not start correctly." cat testrun_output.log exit 1 - fi + fi \ No newline at end of file diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 160a5115d..2c6f721f6 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -9,10 +9,18 @@ on: jobs: testrun_tests: permissions: {} - name: Tests - runs-on: ubuntu-22.04 + name: Tests (Ubuntu ${{ matrix.os }}) + runs-on: ${{ matrix.os }} timeout-minutes: 60 + strategy: + matrix: + os: [ubuntu-22.04, ubuntu-24.04, ubuntu-26.04] + fail-fast: false steps: + - name: Set up Python + uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # 7.1.0 + with: + python-version: '3.13' - name: Checkout source uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Install dependencies @@ -28,10 +36,18 @@ jobs: testrun_baseline: permissions: {} - name: Baseline - runs-on: ubuntu-22.04 + name: Baseline (Ubuntu ${{ matrix.os }}) + runs-on: ${{ matrix.os }} timeout-minutes: 20 + strategy: + matrix: + os: [ubuntu-22.04, ubuntu-24.04, ubuntu-26.04] + fail-fast: false steps: + - name: Set up Python + uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # 7.1.0 + with: + python-version: '3.13' - name: Checkout source uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Install dependencies @@ -44,7 +60,7 @@ jobs: - name: Run baseline tests shell: bash {0} run: testing/baseline/test_baseline - + testrun_api: permissions: {} name: API diff --git a/framework/requirements.txt b/framework/requirements.txt index fe8dda06c..404b921b3 100644 --- a/framework/requirements.txt +++ b/framework/requirements.txt @@ -17,7 +17,7 @@ fastapi==0.115.0 psutil==5.9.8 uvicorn==0.27.0 python-multipart==0.0.32 -pydantic==2.10.0 +pydantic==2.14.3 # Requirements for testing pytest==9.0.3 diff --git a/modules/network/radius/python/requirements.txt b/modules/network/radius/python/requirements.txt index 1396b73f3..aaea5fb92 100644 --- a/modules/network/radius/python/requirements.txt +++ b/modules/network/radius/python/requirements.txt @@ -1,7 +1,7 @@ # Dependencies to user defined packages # Package dependencies should always be defined before the user defined # packages to prevent auto-upgrades of stable dependencies -dnspython==2.9.0 +dnspython==2.9.2 greenlet==3.0.3 six==1.16.0