diff --git a/.github/workflows/yum.yml b/.github/workflows/yum.yml index 36302c29..36fd32b3 100644 --- a/.github/workflows/yum.yml +++ b/.github/workflows/yum.yml @@ -406,6 +406,36 @@ jobs: run: | sudo incus admin init --auto - name: Run Test ${{matrix.test}} on ${{ matrix.test-incus-image }} - # There are no released for AlmaLinux 10 x86_64 yet - if: ${{ matrix.label != 'AlmaLinux 10 x86_64' }} run: fluent-release/yum/systemd-test/test.sh ${{ matrix.test-incus-image }} ${{ matrix.test }} + + fluent-lts-release-test: + name: Test ${{ matrix.label }} ${{ matrix.test }} (CGroup V2) + needs: [define-matrix, v2test] + runs-on: ubuntu-latest + timeout-minutes: 15 + strategy: + fail-fast: false + matrix: + label: ${{ fromJSON(needs.define-matrix.outputs.label) }} + test: + - install-from-r2.sh + include: ${{ fromJSON(needs.define-matrix.outputs.matrix).include }} + steps: + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + with: + name: packages-lts-release-${{ matrix.rake-job }} + - name: Install Incus + run: | + sudo apt-get update + sudo apt-get install -y -V incus + - name: Allow egress network traffic flows for Incus + # https://linuxcontainers.org/incus/docs/main/howto/network_bridge_firewalld/#prevent-connectivity-issues-with-incus-and-docker + run: | + sudo iptables -I DOCKER-USER -i incusbr0 -j ACCEPT + sudo iptables -I DOCKER-USER -o incusbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT + - name: Setup Incus + run: | + sudo incus admin init --auto + - name: Run Test ${{matrix.test}} on ${{ matrix.test-incus-image }} + run: fluent-lts-release/yum/systemd-test/test.sh ${{ matrix.test-incus-image }} ${{ matrix.test }} diff --git a/fluent-lts-release/yum/systemd-test/install-from-r2.sh b/fluent-lts-release/yum/systemd-test/install-from-r2.sh index 0c0b47a0..e08d6d6b 100755 --- a/fluent-lts-release/yum/systemd-test/install-from-r2.sh +++ b/fluent-lts-release/yum/systemd-test/install-from-r2.sh @@ -15,9 +15,5 @@ grep fluentd.cdn.cncf.io /etc/yum.repos.d/fluent-package-lts.repo test $($DNF repolist --enabled | grep 'Fluentd Project' | wc -l) -eq 1 test $($DNF repolist --enabled | grep 'Fluentd Project' | cut -d' ' -f1) = fluent-package-v6-lts -# TODO: v6 package was released, remove it and test with v6 -sudo $DNF config-manager --disable fluent-package-v6-lts -sudo $DNF config-manager --enable fluent-package-v5-lts - sudo $DNF update -y sudo $DNF install -y fluent-package diff --git a/fluent-lts-release/yum/systemd-test/test.sh b/fluent-lts-release/yum/systemd-test/test.sh index fee03bd2..6577e730 100755 --- a/fluent-lts-release/yum/systemd-test/test.sh +++ b/fluent-lts-release/yum/systemd-test/test.sh @@ -10,7 +10,7 @@ image=$1 test_file=$2 shift 2 other_args="$@" -dir="/host/fluent-release/yum/systemd-test" +dir="/host/fluent-lts-release/yum/systemd-test" set -eux diff --git a/fluent-release/yum/systemd-test/install-from-r2.sh b/fluent-release/yum/systemd-test/install-from-r2.sh index 7516c21c..ac293750 100755 --- a/fluent-release/yum/systemd-test/install-from-r2.sh +++ b/fluent-release/yum/systemd-test/install-from-r2.sh @@ -15,9 +15,5 @@ grep fluentd.cdn.cncf.io /etc/yum.repos.d/fluent-package.repo test $($DNF repolist --enabled | grep 'Fluentd Project' | wc -l) -eq 1 test $($DNF repolist --enabled | grep 'Fluentd Project' | cut -d' ' -f1) = fluent-package-v6 -# TODO: v6 package was released, remove it and test with v6 -sudo $DNF config-manager --disable fluent-package-v6 -sudo $DNF config-manager --enable fluent-package-v5 - sudo $DNF update -y sudo $DNF install -y fluent-package