We were covering only upgrades against main, however we also should ensure that older branches are still upgradable to the latest LTS. Add coverage for them.
Reported-at: https://redhat.atlassian.net/browse/FDP-4524 Signed-off-by: Ales Musil <[email protected]> --- .github/workflows/ovn-upgrade-tests.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ovn-upgrade-tests.yml b/.github/workflows/ovn-upgrade-tests.yml index 9db1c0609..2574492fe 100644 --- a/.github/workflows/ovn-upgrade-tests.yml +++ b/.github/workflows/ovn-upgrade-tests.yml @@ -12,7 +12,7 @@ concurrency: jobs: upgrade-tests: - name: upgrade-test ${{ matrix.cfg.base_version }} ${{ matrix.cfg.test_range }} + name: upgrade-test ${{ matrix.cfg.base_version }} ${{ matrix.cfg.test_range }} -> ${{ matrix.cfg.target_version || github.ref_name }} if: (github.repository_owner == 'ovn-org' && github.event_name == 'schedule' && github.ref_name == 'main') || github.event_name == 'workflow_dispatch' runs-on: ubuntu-26.04 timeout-minutes: 120 @@ -21,12 +21,16 @@ jobs: fail-fast: false matrix: cfg: - - { base_version: "origin/branch-25.09", test_range: "-100"} - - { base_version: "origin/branch-25.09", test_range: "101-200"} - - { base_version: "origin/branch-25.09", test_range: "201-", unstable: unstable} - - { base_version: "origin/branch-25.03", test_range: "-100"} - - { base_version: "origin/branch-25.03", test_range: "101-200"} - - { base_version: "origin/branch-25.03", test_range: "201-", unstable: unstable} + # Upgrade against latest LTS. + - { base_version: "origin/branch-24.03", target_version: "branch-26.03", test_range: "-100" } + - { base_version: "origin/branch-24.03", target_version: "branch-26.03", test_range: "101-", unstable: unstable } + - { base_version: "origin/branch-25.03", target_version: "branch-26.03", test_range: "-100" } + - { base_version: "origin/branch-25.03", target_version: "branch-26.03", test_range: "101-200" } + - { base_version: "origin/branch-25.03", target_version: "branch-26.03", test_range: "201-", unstable: unstable } + - { base_version: "origin/branch-25.09", target_version: "branch-26.03", test_range: "-100"} + - { base_version: "origin/branch-25.09", target_version: "branch-26.03", test_range: "101-200"} + - { base_version: "origin/branch-25.09", target_version: "branch-26.03", test_range: "201-", unstable: unstable} + # Upgrade against latest branch ref. - { base_version: "origin/branch-26.03", test_range: "-100" } - { base_version: "origin/branch-26.03", test_range: "101-200" } - { base_version: "origin/branch-26.03", test_range: "201-", unstable: unstable } @@ -50,6 +54,7 @@ jobs: - name: checkout uses: actions/checkout@v6 with: + ref: ${{ matrix.cfg.target_version || github.ref }} submodules: recursive - name: Fix /etc/hosts file -- 2.55.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
