From: Jo Zzsi Date: Tue, 19 Nov 2024 19:50:08 +0000 (-0500) Subject: ci: reenable test 70 (only on openSUSE) X-Git-Tag: 106~150 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa194671663dfc320b6cbdbb39da103a8a244929;p=thirdparty%2Fdracut-ng.git ci: reenable test 70 (only on openSUSE) My gut feeling is that this test is most stable on openSUSE with network-legacy. --- diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 5f0de0321..d18aa4cd8 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -214,38 +214,30 @@ jobs: uses: actions/checkout@v4 - name: "${{ matrix.container }} TEST-${{ matrix.test }}" run: USE_NETWORK=${{ matrix.network }} ./test/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }} -# network-advanced: -# name: ${{ matrix.test }} on ${{ matrix.container }} -# runs-on: ubuntu-latest -# timeout-minutes: 20 -# concurrency: -# group: network-iscsi-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}-${{ matrix.network }} -# cancel-in-progress: true -# strategy: -# fail-fast: false -# matrix: -# container: -# - arch -# - debian -# - fedora -# - gentoo -# - opensuse -# - ubuntu -# ] -# test: [ "70","71","72" ] -# include: -# - network: "" -# - # on debian run tests with systemd-networkd -# container: "debian" -# network: "systemd-networkd" -# - # on openSUSE run tests with network-legacy -# container: "opensuse" -# network: "network-legacy" -# container: -# image: ghcr.io/dracut-ng/${{ matrix.container }} -# options: '--device=/dev/kvm' -# steps: -# - name: "Checkout Repository" -# uses: actions/checkout@v4 -# - name: "${{ matrix.container }} TEST-${{ matrix.test }}" -# run: USE_NETWORK=${{ matrix.network }} ./test/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }} + network-advanced: + needs: basic + name: ${{ matrix.test }} on ${{ matrix.container }} + runs-on: ubuntu-latest + timeout-minutes: 20 + concurrency: + group: network-iscsi-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}-${{ matrix.network }} + cancel-in-progress: true + strategy: + fail-fast: false + matrix: + container: + - opensuse + test: + - "70" + include: + - # on openSUSE run tests with network-legacy + container: "opensuse" + network: "network-legacy" + container: + image: ghcr.io/dracut-ng/${{ matrix.container }} + options: '--device=/dev/kvm' + steps: + - name: "Checkout Repository" + uses: actions/checkout@v4 + - name: "${{ matrix.container }} TEST-${{ matrix.test }}" + run: USE_NETWORK=${{ matrix.network }} ./test/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}