Currently the upgrade tests were running against main. However, we
want to ensure that those tests are still working between different
mix of version. Add the following scenarios to ensure that:
- Upgrade from older LTS (24.03) to current LTS (26.03).
- Upgrade from more recent versions between older LTS (25.03, 25.09)
  to current LTS (26.03).
- Upgrade from current LTS (26.03) to versions between it and main
  (26.09).
- Keep the upgrade from LTS (26.03) and after LTS (26.09) to main.

Reported-at: https://redhat.atlassian.net/browse/FDP-4524
Signed-off-by: Ales Musil <[email protected]>
---
v2: Adjust the commit message.
    Add one more stage and that is upgrade from LTS to versions between LTS and 
main.
---
 .github/workflows/ovn-upgrade-tests.yml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ovn-upgrade-tests.yml 
b/.github/workflows/ovn-upgrade-tests.yml
index 9db1c0609..746cab0cc 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,20 @@ 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 from LTS to between LTS and main.
+        - { base_version: "origin/branch-26.03", target_version: 
"branch-26.09", test_range: "-100" }
+        - { base_version: "origin/branch-26.03", target_version: 
"branch-26.09", test_range: "101-200" }
+        - { base_version: "origin/branch-26.03", target_version: 
"branch-26.09", 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 +58,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

Reply via email to