On Wed, Jun 24, 2026 at 2:19 PM Dumitru Ceara <[email protected]> wrote:

> We were supposed to test with 26.03, the new LTS but commit
> 5adc25e8bb45 ("ci: Stop testing upgrade from 24.03.") missed a few
> instances.
>
> Fixes: 5adc25e8bb45 ("ci: Stop testing upgrade from 24.03.")
> Signed-off-by: Dumitru Ceara <[email protected]>
> ---
>  .ci/ovn_upgrade_test.py                        | 2 +-
>  .github/workflows/ovn-fake-multinode-tests.yml | 8 ++++----
>  tests/automake.mk                              | 4 ++--
>  3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/.ci/ovn_upgrade_test.py b/.ci/ovn_upgrade_test.py
> index 07d2ee767a..44afd7e2d3 100755
> --- a/.ci/ovn_upgrade_test.py
> +++ b/.ci/ovn_upgrade_test.py
> @@ -19,7 +19,7 @@ from ovn_upgrade_utils import (
>      UpgradeConfig
>  )
>
> -DEFAULT_BASE_BRANCH = 'branch-24.03'
> +DEFAULT_BASE_BRANCH = 'branch-26.03'
>
>
>  def run_tests(config):
> diff --git a/.github/workflows/ovn-fake-multinode-tests.yml
> b/.github/workflows/ovn-fake-multinode-tests.yml
> index 1d825a72dd..0294d89699 100644
> --- a/.github/workflows/ovn-fake-multinode-tests.yml
> +++ b/.github/workflows/ovn-fake-multinode-tests.yml
> @@ -19,7 +19,7 @@ jobs:
>        matrix:
>          cfg:
>          - { repo: "${{ github.repository }}", branch: "${{
> github.ref_name }}" }
> -        - { repo: ovn-org/ovn, branch: "branch-24.03" }
> +        - { repo: ovn-org/ovn, branch: "branch-26.03" }
>      env:
>        RUNC_CMD: podman
>        OS_IMAGE: "fedora:42"
> @@ -91,7 +91,7 @@ jobs:
>        matrix:
>          cfg:
>          - { branch: "${{ github.ref_name }}", testsuiteflags: ""}
> -        - { branch: "branch-24.03", testsuiteflags: "-k 'basic test'" }
> +        - { branch: "branch-26.03", testsuiteflags: "-k 'basic test'" }
>      name: multinode tests ${{ join(matrix.cfg.*, ' ') }}
>      env:
>        RUNC_CMD: podman
> @@ -148,12 +148,12 @@ jobs:
>
>      - uses: actions/download-artifact@v8
>        with:
> -        name: test-branch-24.03-image
> +        name: test-branch-26.03-image
>
>      - name: Load podman image
>        run: |
>          sudo podman load --input ovn_${{ github.ref_name }}_image.tar
> -        sudo podman load --input ovn_branch-24.03_image.tar
> +        sudo podman load --input ovn_branch-26.03_image.tar
>
>      - name: Check out ovn-fake-multi-node
>        uses: actions/checkout@v6
> diff --git a/tests/automake.mk b/tests/automake.mk
> index fd3e2ccae7..8084357b57 100644
> --- a/tests/automake.mk
> +++ b/tests/automake.mk
> @@ -382,8 +382,8 @@ clean-pki:
>  endif
>
>  # Upgrade test support
> -# Run via: make check-upgrade BASE_VERSION=branch-24.03
> TESTSUITEFLAGS="1-100"
> -BASE_VERSION ?= branch-24.03
> +# Run via: make check-upgrade BASE_VERSION=branch-26.03
> TESTSUITEFLAGS="1-100"
> +BASE_VERSION ?= branch-26.03
>
>  check-upgrade: all
>         @mkdir -p upgrade-testsuite.dir
> --
> 2.54.0
>
>
Sorry about that!

Acked-by: Ales Musil <[email protected]>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to