diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 28638f283c..99dd533544 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -16,12 +16,8 @@ jobs: fail-fast: false matrix: include: - - name: "CentOS Stream 9" - image: "quay.io/centos/centos:stream9" - pytest_args: '' - name: "CentOS Stream 8" image: "quay.io/centos/centos:stream8" - pytest_args: '' runs-on: ubuntu-latest container: @@ -33,6 +29,10 @@ jobs: - name: "Checkout repository" uses: actions/checkout@v3 + - name: "Use CentOS Vault" + run: | + sed -i 's|#baseurl=http://mirror|baseurl=http://vault|' /etc/yum.repos.d/CentOS-Stream-*.repo + - name: "Run container-pre-test.sh" run: | bash scripts/container-pre-test.sh @@ -46,15 +46,14 @@ jobs: --cov-report 'xml:/tmp/coverage.xml' --junitxml '/tmp/pytest.xml'" run: | dbus-run-session \ - python3 -m pytest ${{ matrix.pytest_args }} + python3 -m pytest - name: "Publish coverage" uses: MishaKav/pytest-coverage-comment@main if: | github.event.pull_request.head.repo.full_name == github.repository - && matrix.name == 'CentOS Stream 9' with: - title: "Coverage (computed on ${{ matrix.name }})" + title: "Coverage" report-only-changed-files: true pytest-xml-coverage-path: /tmp/coverage.xml junitxml-path: /tmp/pytest.xml diff --git a/scripts/container-pre-test.sh b/scripts/container-pre-test.sh index e410076224..4c52e6d277 100644 --- a/scripts/container-pre-test.sh +++ b/scripts/container-pre-test.sh @@ -11,9 +11,6 @@ source /etc/os-release if [[ $ID == "centos" && $VERSION == "8" ]]; then dnf config-manager --enable powertools fi -if [[ $ID == "centos" && $VERSION == "9" ]]; then - dnf config-manager --enable crb -fi # Install system, build and runtime packages dnf --setopt install_weak_deps=False install -y \