From e475d7a545a2403e1ff7460bc849341838b79dd3 Mon Sep 17 00:00:00 2001 From: Tom Hromatka Date: Wed, 30 Oct 2024 10:40:07 -0600 Subject: [PATCH] github: Use default runners Now that github actions have an image that defaults to cgroup v2, we can utilize that image rather than hosting our own github actions runners. Use ubuntu-latest as our cgroup v2 test runner, and delete the jobs that use self-hosted runners. Signed-off-by: Tom Hromatka Signed-off-by: Kamalesh Babulal --- .github/workflows/continuous-integration.yml | 136 +++++-------------- 1 file changed, 35 insertions(+), 101 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5d539cff..2b03e78c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -149,6 +149,27 @@ jobs: run: | cat libcgroup-*/_build/sub/tests/ftests/ftests-wrapper.sh.log + distcheckv2: + name: Cgroup v2 Dist Check + runs-on: ubuntu-latest + + steps: + - name: Install container dependencies + run: | + sudo apt-get update + sudo apt-get install lxc lxd-installer + - uses: actions/checkout@v4 + with: + submodules: false + - name: Initialize the directory + uses: ./.github/actions/setup-libcgroup + - name: Run make distcheck + run: make distcheck + - name: Display test logs + if: ${{ failure() }} + run: | + cat libcgroup-*/_build/sub/tests/ftests/ftests-wrapper.sh.log + buildtests: name: Build tests runs-on: ubuntu-20.04 @@ -351,99 +372,15 @@ jobs: name: Cgroup v1v2 Code Coverage path: lcov.* - functionaltestsv2_legacy: - name: Cgroup v2 Functional Tests - legacy - runs-on: cgroup-legacy - - steps: - - uses: actions/checkout@v4 - with: - submodules: false - - name: Initialize the directory - uses: ./.github/actions/setup-libcgroup - - name: Run functional tests - run: | - pushd src/python/build/lib.* - export PYTHONPATH=$PYTHONPATH:$(pwd) - popd - pushd tests/ftests - make check - popd - - name: Display test logs - if: ${{ always() }} - run: | - cat tests/ftests/ftests-wrapper.sh.log - - name: Archive test logs - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Cgroup v2 test logs - legacy - path: tests/ftests/*.log - - name: Collate code coverage results - uses: ./.github/actions/code-coverage - - name: Upload code coverage results - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: ./lcov.total - flag-name: "Cgroup v2 Functional Tests - legacy" - parallel: True - - name: Archive code coverage results - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Cgroup v2 Code Coverage - legacy - path: lcov.* - - functionaltestsv2_hybrid: - name: Cgroup v2 Functional Tests - hybrid - runs-on: cgroup-hybrid + functionaltestsv2: + name: Cgroup v2 Functional Tests + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - submodules: false - - name: Initialize the directory - uses: ./.github/actions/setup-libcgroup - - name: Run functional tests - run: | - pushd src/python/build/lib.* - export PYTHONPATH=$PYTHONPATH:$(pwd) - popd - pushd tests/ftests - make check - popd - - name: Display test logs - if: ${{ always() }} + - name: Install container dependencies run: | - cat tests/ftests/ftests-wrapper.sh.log - - name: Archive test logs - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Cgroup v2 test logs - hybrid - path: tests/ftests/*.log - - name: Collate code coverage results - uses: ./.github/actions/code-coverage - - name: Upload code coverage results - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: ./lcov.total - flag-name: "Cgroup v2 Functional Tests - hybrid" - parallel: True - - name: Archive code coverage results - if: ${{ always() }} - uses: actions/upload-artifact@v4 - with: - name: Cgroup v2 Code Coverage - hybrid - path: lcov.* - - functionaltestsv2_unified: - name: Cgroup v2 Functional Tests - unified - runs-on: cgroup-unified - - steps: + sudo apt-get update + sudo apt-get install lxc lxd-installer - uses: actions/checkout@v4 with: submodules: false @@ -455,18 +392,15 @@ jobs: export PYTHONPATH=$PYTHONPATH:$(pwd) popd pushd tests/ftests - make check + ./ftests.py -l 10 -L ftests.log + ./ftests.py -l 10 -L ftests-nocontainer.log --no-container popd - - name: Display test logs - if: ${{ always() }} - run: | - cat tests/ftests/ftests-wrapper.sh.log - name: Archive test logs if: ${{ always() }} uses: actions/upload-artifact@v4 with: - name: Cgroup v2 test logs - unified - path: tests/ftests/*.log + name: Cgroup v2 test logs + path: ./*.log - name: Collate code coverage results uses: ./.github/actions/code-coverage - name: Upload code coverage results @@ -474,20 +408,20 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: ./lcov.total - flag-name: "Cgroup v2 Functional Tests - unified" + flag-name: "Cgroup v2 Functional Tests" parallel: True - name: Archive code coverage results if: ${{ always() }} uses: actions/upload-artifact@v4 with: - name: Cgroup v2 Code Coverage - unified + name: Cgroup v2 Code Coverage path: lcov.* finalize: name: Finalize the test run if: ${{ always() }} - needs: [unittests, functionaltestsv1, functionaltestsv1v2, functionaltestsv2_legacy, - functionaltestsv2_hybrid, functionaltestsv2_unified, nosystemd] + needs: [unittests, functionaltestsv1, functionaltestsv1v2, functionaltestsv2, + nosystemd] runs-on: ubuntu-latest steps: - name: Finalize code coverage results -- 2.47.3